* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.42 2003/06/14 15:43:39 gbazin Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Gildas Bazin <gbazin@netcourrier.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-
#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
#include <vlc/decoder.h>
-#include <vlc/input.h>
-
-#include <string.h>
-
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
/* ffmpeg header */
+#define HAVE_MMX
#ifdef HAVE_FFMPEG_AVCODEC_H
# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
-#if LIBAVCODEC_BUILD < 4655
-# error You must have a libavcodec >= 4655 (get CVS)
+#if LIBAVCODEC_BUILD < 4680
+# error You must have a libavcodec >= 4680 (get CVS)
#endif
-
#include "ffmpeg.h"
#ifdef LIBAVCODEC_PP
# else
# include <libpostproc/postprocess.h>
# endif
-#else
-# include "postprocessing/postprocessing.h"
#endif
-#include "video.h" // video ffmpeg specific
-#include "audio.h" // audio ffmpeg specific
-
-/*
- * Local prototypes
- */
-int E_(OpenChroma) ( vlc_object_t * );
-static int OpenDecoder ( vlc_object_t * );
-static int RunDecoder ( decoder_fifo_t * );
-
-static int InitThread ( generic_thread_t * );
-static void EndThread ( generic_thread_t * );
-
+/*****************************************************************************
+ * decoder_sys_t: decoder descriptor
+ *****************************************************************************/
+struct decoder_sys_t
+{
+ /* Common part between video and audio decoder */
+ int i_cat;
+ int i_codec_id;
+ char *psz_namecodec;
-static int b_ffmpeginit = 0;
+ AVCodecContext *p_context;
+ AVCodec *p_codec;
+};
-static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** );
+/****************************************************************************
+ * Local prototypes
+ ****************************************************************************/
+static int OpenDecoder( vlc_object_t * );
+static void CloseDecoder( vlc_object_t * );
+static char *enc_hq_list[] = { "rd", "bits", "simple" };
+static char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define DR_TEXT N_("Direct rendering")
-
-#define ERROR_TEXT N_("Error resilience")
-#define ERROR_LONGTEXT N_( \
- "ffmpeg can make errors resiliences. \n" \
- "Nevertheless, with a buggy encoder (like ISO MPEG-4 encoder from M$) " \
- "this will produce a lot of errors.\n" \
- "Valid range is -1 to 99 (-1 disables all errors resiliences).")
-
-#define BUGS_TEXT N_("Workaround bugs")
-#define BUGS_LONGTEXT N_( \
- "Try to fix some bugs\n" \
- "1 autodetect\n" \
- "2 old msmpeg4\n" \
- "4 xvid interlaced\n" \
- "8 ump4 \n" \
- "16 no padding\n" \
- "32 ac vlc\n" \
- "64 Qpel chroma")
-
-#define HURRYUP_TEXT N_("Hurry up")
-#define HURRYUP_LONGTEXT N_( \
- "Allow the decoder to partially decode or skip frame(s) " \
- "when there is not enough time. It's useful with low CPU power " \
- "but it can produce distorted pictures.")
-
-#define TRUNC_TEXT N_("Truncated stream")
-#define TRUNC_LONGTEXT N_("truncated stream -1:auto,0:disable,:1:enable")
-
-#define PP_Q_TEXT N_("Post processing quality")
-#define PP_Q_LONGTEXT N_( \
- "Quality of post processing. Valid range is 0 to 6\n" \
- "Higher levels require considerable more CPU power, but produce " \
- "better looking pictures." )
-
-#define LIBAVCODEC_PP_TEXT N_("Ffmpeg postproc filter chains")
-/* FIXME (cut/past from ffmpeg */
-#define LIBAVCODEC_PP_LONGTEXT \
-"<filterName>[:<option>[:<option>...]][[,|/][-]<filterName>[:<option>...]]...\n" \
-"long form example:\n" \
-"vdeblock:autoq/hdeblock:autoq/linblenddeint default,-vdeblock\n" \
-"short form example:\n" \
-"vb:a/hb:a/lb de,-vb\n" \
-"more examples:\n" \
-"tn:64:128:256\n" \
-"Filters Options\n" \
-"short long name short long option Description\n" \
-"* * a autoq cpu power dependant enabler\n" \
-" c chrom chrominance filtring enabled\n" \
-" y nochrom chrominance filtring disabled\n" \
-"hb hdeblock (2 Threshold) horizontal deblocking filter\n" \
-" 1. difference factor: default=64, higher -> more deblocking\n" \
-" 2. flatness threshold: default=40, lower -> more deblocking\n" \
-" the h & v deblocking filters share these\n" \
-" so u cant set different thresholds for h / v\n" \
-"vb vdeblock (2 Threshold) vertical deblocking filter\n" \
-"h1 x1hdeblock Experimental h deblock filter 1\n" \
-"v1 x1vdeblock Experimental v deblock filter 1\n" \
-"dr dering Deringing filter\n" \
-"al autolevels automatic brightness / contrast\n" \
-" f fullyrange stretch luminance to (0..255)\n" \
-"lb linblenddeint linear blend deinterlacer\n" \
-"li linipoldeint linear interpolating deinterlace\n" \
-"ci cubicipoldeint cubic interpolating deinterlacer\n" \
-"md mediandeint median deinterlacer\n" \
-"fd ffmpegdeint ffmpeg deinterlacer\n" \
-"de default hb:a,vb:a,dr:a,al\n" \
-"fa fast h1:a,v1:a,dr:a,al\n" \
-"tn tmpnoise (3 Thresholds) Temporal Noise Reducer\n" \
-" 1. <= 2. <= 3. larger -> stronger filtering\n" \
-"fq forceQuant <quantizer> Force quantizer\n"
-
-#define FFMPEG_PP_TEXT N_( "Ffmpeg postprocessing module" )
-
-#define PP_AQ_TEXT N_("Auto-level Post processing quality")
-#define PP_AQ_LONGTEXT N_( \
- "Post processing quality is selected upon time left " \
- "but no more than requested quality\n" \
- "Not yet implemented !")
-
-#define FFMPEG_YV_TEXT N_("Force vertical luminance deblocking")
-#define FFMPEG_YV_LONGTEXT N_("Force vertical luminance deblocking (override other settings)")
-
-#define FFMPEG_YH_TEXT N_("Force horizontal luminance deblocking")
-#define FFMPEG_YH_LONGTEXT N_("Force horizontal luminance deblocking (override other settings)")
-
-#define FFMPEG_CV_TEXT N_("Force vertical chrominance deblocking")
-#define FFMPEG_CV_LONGTEXT N_("Force vertical chrominance deblocking (override other settings)")
-
-#define FFMPEG_CH_TEXT N_("Force horizontal chrominance deblocking")
-#define FFMPEG_CH_LONGTEXT N_("Force horizontal chrominance deblocking (override other settings)")
-
-#define FFMPEG_Y_DR_TEXT N_("Force luminance deringing")
-#define FFMPEG_Y_DR_LONGTEXT N_("Force luminance deringing (override other settings)")
-
-#define FFMPEG_C_DR_TEXT N_("Force chrominance deringing")
-#define FFMPEG_C_DR_LONGTEXT N_("Force chrominance deringing (override other settings)")
-
vlc_module_begin();
- add_category_hint( N_("ffmpeg"), NULL, VLC_FALSE );
- set_capability( "decoder", 70 );
- set_callbacks( OpenDecoder, NULL );
+
+ /* decoder main module */
set_description( _("ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
+ set_capability( "decoder", 70 );
+ set_callbacks( OpenDecoder, CloseDecoder );
add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, VLC_TRUE );
- add_integer ( "ffmpeg-error-resilience", -1, NULL, ERROR_TEXT, ERROR_LONGTEXT, VLC_TRUE );
- add_integer ( "ffmpeg-workaround-bugs", 1, NULL, BUGS_TEXT, BUGS_LONGTEXT, VLC_FALSE );
- add_bool( "ffmpeg-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, VLC_FALSE );
- add_integer( "ffmpeg-truncated", -1, NULL, TRUNC_TEXT, TRUNC_LONGTEXT, VLC_FALSE );
-
- add_category_hint( N_("Post processing"), NULL, VLC_FALSE );
+ add_integer ( "ffmpeg-error-resilience", -1, NULL, ERROR_TEXT,
+ ERROR_LONGTEXT, VLC_TRUE );
+ add_integer ( "ffmpeg-workaround-bugs", 1, NULL, BUGS_TEXT, BUGS_LONGTEXT,
+ VLC_FALSE );
+ add_bool( "ffmpeg-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT,
+ VLC_FALSE );
- add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE );
#ifdef LIBAVCODEC_PP
- add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT, LIBAVCODEC_PP_LONGTEXT, VLC_TRUE );
-#else
- add_module( "ffmpeg-pp", "postprocessing",NULL, NULL, FFMPEG_PP_TEXT, NULL, VLC_FALSE );
- add_bool( "ffmpeg-pp-auto", 0, NULL, PP_AQ_TEXT, PP_AQ_LONGTEXT, VLC_FALSE );
- add_bool( "ffmpeg-db-yv", 0, NULL, FFMPEG_YV_TEXT, FFMPEG_YV_LONGTEXT, VLC_TRUE );
- add_bool( "ffmpeg-db-yh", 0, NULL, FFMPEG_YH_TEXT, FFMPEG_YH_LONGTEXT, VLC_TRUE );
- add_bool( "ffmpeg-db-cv", 0, NULL, FFMPEG_CV_TEXT, FFMPEG_CV_LONGTEXT, VLC_TRUE );
- add_bool( "ffmpeg-db-ch", 0, NULL, FFMPEG_CH_TEXT, FFMPEG_CH_LONGTEXT, VLC_TRUE );
- add_bool( "ffmpeg-dr-y", 0, NULL, FFMPEG_Y_DR_TEXT, FFMPEG_Y_DR_LONGTEXT, VLC_TRUE );
- add_bool( "ffmpeg-dr-c", 0, NULL, FFMPEG_C_DR_TEXT, FFMPEG_C_DR_LONGTEXT, VLC_TRUE );
+ add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE );
+ add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT,
+ LIBAVCODEC_PP_LONGTEXT, VLC_TRUE );
#endif
+ add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT,
+ VLC_TRUE );
/* chroma conversion submodule */
add_submodule();
set_capability( "chroma", 50 );
- set_callbacks( E_(OpenChroma), NULL );
+ set_callbacks( E_(OpenChroma), E_(CloseChroma) );
set_description( _("ffmpeg chroma conversion") );
+ /* encoder submodule */
+ add_submodule();
+ set_description( _("ffmpeg audio/video encoder") );
+ set_capability( "encoder", 100 );
+ set_callbacks( E_(OpenEncoder), E_(CloseEncoder) );
+
+ add_string( ENC_CFG_PREFIX "hq", "simple", NULL, ENC_HQ_TEXT,
+ ENC_HQ_LONGTEXT, VLC_FALSE );
+ change_string_list( enc_hq_list, enc_hq_list_text, 0 );
+ add_integer( ENC_CFG_PREFIX "keyint", 0, NULL, ENC_KEYINT_TEXT,
+ ENC_KEYINT_LONGTEXT, VLC_FALSE );
+ add_integer( ENC_CFG_PREFIX "bframes", 0, NULL, ENC_BFRAMES_TEXT,
+ ENC_BFRAMES_LONGTEXT, VLC_FALSE );
+ add_bool( ENC_CFG_PREFIX "hurry-up", 0, NULL, ENC_HURRYUP_TEXT,
+ ENC_HURRYUP_LONGTEXT, VLC_FALSE );
+ add_bool( ENC_CFG_PREFIX "interlace", 0, NULL, ENC_INTERLACE_TEXT,
+ ENC_INTERLACE_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "vt", 0, NULL, ENC_VT_TEXT,
+ ENC_VT_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "pre-me", 0, NULL, ENC_PRE_ME_TEXT,
+ ENC_PRE_ME_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "strict-rc", 0, NULL, ENC_RC_STRICT_TEXT,
+ ENC_RC_STRICT_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8 * 3/2, NULL,
+ ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 0.1, NULL,
+ ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "i-quant-factor", 0, NULL,
+ ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "noise-reduction", 0, NULL,
+ ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "mpeg4-matrix", 0, NULL,
+ ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "qmin", 0, NULL,
+ ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "qmax", 0, NULL,
+ ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "trellis", 0, NULL,
+ ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, VLC_TRUE );
+
+ /* demux submodule */
+ add_submodule();
+ set_description( _("ffmpeg demuxer" ) );
+ set_capability( "demux2", 1 );
+ set_callbacks( E_(OpenDemux), E_(CloseDemux) );
+
+ var_Create( p_module->p_libvlc, "avcodec", VLC_VAR_MUTEX );
vlc_module_end();
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
- *****************************************************************************
- * Tries to launch a decoder and return score so that the interface is able
- * to chose.
*****************************************************************************/
static int OpenDecoder( vlc_object_t *p_this )
{
- decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this;
+ decoder_t *p_dec = (decoder_t*) p_this;
+ int i_cat, i_codec_id, i_result;
+ char *psz_namecodec;
+
+ AVCodecContext *p_context;
+ AVCodec *p_codec;
- if( ffmpeg_GetFfmpegCodec( p_fifo->i_fourcc, NULL, NULL, NULL ) )
+ /* *** determine codec type *** */
+ if( !E_(GetFfmpegCodec)( p_dec->fmt_in.i_codec, &i_cat, &i_codec_id,
+ &psz_namecodec ) )
{
- p_fifo->pf_run = RunDecoder;
- return VLC_SUCCESS;
+ return VLC_EGENERIC;
}
- return VLC_EGENERIC;
-}
-
-typedef union decoder_thread_u
-{
- generic_thread_t gen;
- adec_thread_t audio;
- vdec_thread_t video;
-
-} decoder_thread_t;
-
+ /* Bail out if buggy decoder */
+ if( i_codec_id == CODEC_ID_AAC )
+ {
+ msg_Dbg( p_dec, "refusing to use ffmpeg's (%s) decoder which is buggy",
+ psz_namecodec );
+ return VLC_EGENERIC;
+ }
-/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
- *****************************************************************************/
-static int RunDecoder( decoder_fifo_t *p_fifo )
-{
- generic_thread_t *p_decoder;
- int b_error;
+ /* Initialization must be done before avcodec_find_decoder() */
+ E_(InitLibavcodec)(p_this);
- if ( !(p_decoder = malloc( sizeof( decoder_thread_t ) ) ) )
+ /* *** ask ffmpeg for a decoder *** */
+ if( !( p_codec = avcodec_find_decoder( i_codec_id ) ) )
{
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return( -1 );
+ msg_Dbg( p_dec, "codec not found (%s)", psz_namecodec );
+ return VLC_EGENERIC;
}
- memset( p_decoder, 0, sizeof( decoder_thread_t ) );
- p_decoder->p_fifo = p_fifo;
+ /* *** get a p_context *** */
+ p_context = avcodec_alloc_context();
+ p_context->debug = config_GetInt( p_dec, "ffmpeg-debug" );
- if( InitThread( p_decoder ) != 0 )
+ /* Set CPU capabilities */
+ p_context->dsp_mask = 0;
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
{
- msg_Err( p_fifo, "initialization failed" );
- DecoderError( p_fifo );
- return( -1 );
+ p_context->dsp_mask |= FF_MM_MMX;
}
-
- while( (!p_decoder->p_fifo->b_die) && (!p_decoder->p_fifo->b_error) )
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
{
- switch( p_decoder->i_cat )
- {
- case VIDEO_ES:
- E_( DecodeThread_Video )( (vdec_thread_t*)p_decoder );
- break;
- case AUDIO_ES:
- E_( DecodeThread_Audio )( (adec_thread_t*)p_decoder );
- break;
- }
+ p_context->dsp_mask |= FF_MM_MMXEXT;
}
-
- if( ( b_error = p_decoder->p_fifo->b_error ) )
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
{
- DecoderError( p_decoder->p_fifo );
+ p_context->dsp_mask |= FF_MM_3DNOW;
+ }
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ {
+ p_context->dsp_mask |= FF_MM_SSE;
+ p_context->dsp_mask |= FF_MM_SSE2;
}
- EndThread( p_decoder );
-
- if( b_error )
+ switch( i_cat )
{
- return( -1 );
+ case VIDEO_ES:
+ p_dec->b_need_packetized = VLC_TRUE;
+ p_dec->pf_decode_video = E_(DecodeVideo);
+ i_result = E_( InitVideoDec )( p_dec, p_context, p_codec,
+ i_codec_id, psz_namecodec );
+ break;
+ case AUDIO_ES:
+ p_dec->pf_decode_audio = E_(DecodeAudio);
+ i_result = E_( InitAudioDec )( p_dec, p_context, p_codec,
+ i_codec_id, psz_namecodec );
+ break;
+ default:
+ i_result = VLC_EGENERIC;
}
- return( 0 );
+ p_dec->p_sys->i_cat = i_cat;
+
+ return i_result;
}
/*****************************************************************************
- *
- * Functions that initialize, decode and end the decoding process
- *
+ * CloseDecoder: decoder destruction
*****************************************************************************/
+static void CloseDecoder( vlc_object_t *p_this )
+{
+ decoder_t *p_dec = (decoder_t *)p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ if( !p_sys->p_context )
+ {
+ if( p_sys->p_context->extradata )
+ free( p_sys->p_context->extradata );
+
+ avcodec_close( p_sys->p_context );
+ msg_Dbg( p_dec, "ffmpeg codec (%s) stopped", p_sys->psz_namecodec );
+ av_free( p_sys->p_context );
+ }
+
+ switch( p_sys->i_cat )
+ {
+ case AUDIO_ES:
+ E_( EndAudioDec )( p_dec );
+ break;
+ case VIDEO_ES:
+ E_( EndVideoDec )( p_dec );
+ break;
+ }
+ free( p_sys );
+}
+
/*****************************************************************************
- * InitThread: initialize vdec output thread
- *****************************************************************************
- * This function is called from decoder_Run and performs the second step
- * of the initialization. It returns 0 on success. Note that the thread's
- * flag are not modified inside this function.
- *
- * ffmpeg codec will be open, some memory allocated. But Vout is not yet
- * open (done after the first decoded frame)
+ * local Functions
*****************************************************************************/
+int E_(GetFfmpegChroma)( vlc_fourcc_t i_chroma )
+{
+ switch( i_chroma )
+ {
+ case VLC_FOURCC( 'I', '4', '2', '0' ):
+ return PIX_FMT_YUV420P;
+ case VLC_FOURCC( 'I', '4', '2', '2' ):
+ return PIX_FMT_YUV422P;
+ case VLC_FOURCC( 'I', '4', '4', '4' ):
+ return PIX_FMT_YUV444P;
+ case VLC_FOURCC( 'R', 'V', '1', '5' ):
+ return PIX_FMT_RGB555;
+ case VLC_FOURCC( 'R', 'V', '1', '6' ):
+ return PIX_FMT_RGB565;
+ case VLC_FOURCC( 'R', 'V', '2', '4' ):
+ return PIX_FMT_RGB24;
+ case VLC_FOURCC( 'R', 'V', '3', '2' ):
+ return PIX_FMT_RGBA32;
+ case VLC_FOURCC( 'G', 'R', 'E', 'Y' ):
+ return PIX_FMT_GRAY8;
+ case VLC_FOURCC( 'Y', 'U', 'Y', '2' ):
+ return PIX_FMT_YUV422;
+ default:
+ return -1;
+ }
+}
-static int InitThread( generic_thread_t *p_decoder )
+void E_(InitLibavcodec)( vlc_object_t *p_object )
{
- int i_result;
+ static int b_ffmpeginit = 0;
+ vlc_value_t lockval;
+
+ var_Get( p_object->p_libvlc, "avcodec", &lockval );
+ vlc_mutex_lock( lockval.p_address );
- /* *** init ffmpeg library (libavcodec) *** */
+ /* *** init ffmpeg library (libavcodec) *** */
if( !b_ffmpeginit )
{
avcodec_init();
avcodec_register_all();
b_ffmpeginit = 1;
- msg_Dbg( p_decoder->p_fifo, "libavcodec initialized (interface "
- LIBAVCODEC_BUILD_STR ")" );
+ msg_Dbg( p_object, "libavcodec initialized (interface %d )",
+ LIBAVCODEC_BUILD );
}
else
{
- msg_Dbg( p_decoder->p_fifo, "libavcodec already initialized" );
+ msg_Dbg( p_object, "libavcodec already initialized" );
}
- /* *** determine codec type *** */
- ffmpeg_GetFfmpegCodec( p_decoder->p_fifo->i_fourcc,
- &p_decoder->i_cat,
- &p_decoder->i_codec_id,
- &p_decoder->psz_namecodec );
+ vlc_mutex_unlock( lockval.p_address );
+}
- /* *** ask ffmpeg for a decoder *** */
- if( !( p_decoder->p_codec =
- avcodec_find_decoder( p_decoder->i_codec_id ) ) )
- {
- msg_Err( p_decoder->p_fifo,
- "codec not found (%s)",
- p_decoder->psz_namecodec );
- return( -1 );
- }
- /* *** Get a p_context *** */
- p_decoder->p_context = avcodec_alloc_context();
+static struct
+{
+ vlc_fourcc_t i_fourcc;
+ int i_codec;
+ int i_cat;
+ char *psz_name;
- switch( p_decoder->i_cat )
- {
- case VIDEO_ES:
- i_result = E_( InitThread_Video )( (vdec_thread_t*)p_decoder );
- break;
- case AUDIO_ES:
- i_result = E_( InitThread_Audio )( (adec_thread_t*)p_decoder );
- break;
- default:
- i_result = -1;
- }
+} codecs_table[] =
+{
+ /* MPEG-1 Video */
+ { VLC_FOURCC('m','p','1','v'), CODEC_ID_MPEG1VIDEO,
+ VIDEO_ES, "MPEG-1 Video" },
+
+ /* MPEG-2 Video */
+ { VLC_FOURCC('m','p','2','v'), CODEC_ID_MPEG2VIDEO,
+ VIDEO_ES, "MPEG-2 Video" },
+ { VLC_FOURCC('m','p','g','v'), CODEC_ID_MPEG2VIDEO,
+ VIDEO_ES, "MPEG-2 Video" },
+
+ /* MPEG-4 Video */
+ { VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('d','i','v','x'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('M','P','4','S'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','p','4','s'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('M','4','S','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','4','s','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('x','v','i','d'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('X','V','I','D'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('X','v','i','D'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('D','X','5','0'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('d','x','5','0'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','p','4','v'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC( 4, 0, 0, 0 ), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','4','c','c'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('M','4','C','C'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ /* 3ivx delta 3.5 Unsupported
+ * putting it here gives extreme distorted images
+ { VLC_FOURCC('3','I','V','1'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('3','i','v','1'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" }, */
+ /* 3ivx delta 4 */
+ { VLC_FOURCC('3','I','V','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('3','i','v','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+
+ /* MSMPEG4 v1 */
+ { VLC_FOURCC('D','I','V','1'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+ { VLC_FOURCC('d','i','v','1'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+ { VLC_FOURCC('M','P','G','4'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+ { VLC_FOURCC('m','p','g','4'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+
+ /* MSMPEG4 v2 */
+ { VLC_FOURCC('D','I','V','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+ { VLC_FOURCC('d','i','v','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+ { VLC_FOURCC('M','P','4','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+ { VLC_FOURCC('m','p','4','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+
+ /* MSMPEG4 v3 / M$ mpeg4 v3 */
+ { VLC_FOURCC('M','P','G','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('m','p','g','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('M','P','4','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('m','p','4','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ /* DivX 3.20 */
+ { VLC_FOURCC('D','I','V','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('D','I','V','4'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','4'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('D','I','V','5'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','5'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('D','I','V','6'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','6'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ /* AngelPotion stuff */
+ { VLC_FOURCC('A','P','4','1'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ /* 3ivx doctered divx files */
+ { VLC_FOURCC('3','I','V','D'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('3','i','v','d'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ /* who knows? */
+ { VLC_FOURCC('3','V','I','D'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('3','v','i','d'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+
+ /* Sorenson v1 */
+ { VLC_FOURCC('S','V','Q','1'), CODEC_ID_SVQ1,
+ VIDEO_ES, "SVQ-1 (Sorenson Video v1)" },
+
+ /* Sorenson v3 */
+ { VLC_FOURCC('S','V','Q','3'), CODEC_ID_SVQ3,
+ VIDEO_ES, "SVQ-3 (Sorenson Video v3)" },
+
+ /* h264 */
+ { VLC_FOURCC('h','2','6','4'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
+ { VLC_FOURCC('H','2','6','4'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
+
+/* H263 and H263i */
+/* H263(+) is also known as Real Video 1.0 */
- p_decoder->pts = 0;
- p_decoder->p_buffer = NULL;
- p_decoder->i_buffer = 0;
- p_decoder->i_buffer_size = 0;
+/* FIXME FOURCC_H263P exist but what fourcc ? */
- return( i_result );
-}
+ /* H263 */
+ { VLC_FOURCC('H','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
+ { VLC_FOURCC('h','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
+ { VLC_FOURCC('U','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
+
+ /* H263i */
+ { VLC_FOURCC('I','2','6','3'), CODEC_ID_H263I,
+ VIDEO_ES, "I263.I" },
+ { VLC_FOURCC('i','2','6','3'), CODEC_ID_H263I,
+ VIDEO_ES, "I263.I" },
+
+ /* Flash (H263) variant */
+ { VLC_FOURCC('F','L','V','1'), CODEC_ID_FLV1,
+ VIDEO_ES, "Flash Video" },
+
+#if LIBAVCODEC_BUILD > 4680
+ { VLC_FOURCC('F','L','I','C'), CODEC_ID_FLIC,
+ VIDEO_ES, "Flic Video" },
+#endif
-/*****************************************************************************
- * EndThread: thread destruction
- *****************************************************************************
- * This function is called when the thread ends after a sucessful
- * initialization.
- *****************************************************************************/
-static void EndThread( generic_thread_t *p_decoder )
-{
+ /* MJPEG */
+ { VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'm', 'j', 'p', 'g' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'm', 'j', 'p', 'a' ), CODEC_ID_MJPEG, /* for mov file */
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'j', 'p', 'e', 'g' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'J', 'P', 'E', 'G' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'J', 'F', 'I', 'F' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'J', 'P', 'G', 'L' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+
+ { VLC_FOURCC( 'm', 'j', 'p', 'b' ), CODEC_ID_MJPEGB, /* for mov file */
+ VIDEO_ES, "Motion JPEG B Video" },
+
+#if LIBAVCODEC_BUILD > 4680
+ { VLC_FOURCC( 'S', 'P', '5', 'X' ), CODEC_ID_SP5X,
+ VIDEO_ES, "Sunplus Motion JPEG Video" },
+#endif
- if( !p_decoder )
- {
- return;
- }
+ /* DV */
+ { VLC_FOURCC('d','v','s','l'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','s','d'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('D','V','S','D'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','h','d'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','c',' '), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','p',' '), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('C','D','V','C'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+
+ /* Windows Media Video */
+ { VLC_FOURCC('W','M','V','1'), CODEC_ID_WMV1,
+ VIDEO_ES, "Windows Media Video 1" },
+ { VLC_FOURCC('W','M','V','2'), CODEC_ID_WMV2,
+ VIDEO_ES, "Windows Media Video 2" },
+
+#if LIBAVCODEC_BUILD >= 4683
+ /* Microsoft Video 1 */
+ { VLC_FOURCC('M','S','V','C'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('m','s','v','c'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('C','R','A','M'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('c','r','a','m'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('W','H','A','M'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('w','h','a','m'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+
+ /* Microsoft RLE */
+ { VLC_FOURCC('m','r','l','e'), CODEC_ID_MSRLE,
+ VIDEO_ES, "Microsoft RLE Video" },
+ { VLC_FOURCC(0x1,0x0,0x0,0x0), CODEC_ID_MSRLE,
+ VIDEO_ES, "Microsoft RLE Video" },
+#endif
- if( p_decoder->p_context != NULL)
- {
- FREE( p_decoder->p_context->extradata );
- avcodec_close( p_decoder->p_context );
- msg_Dbg( p_decoder->p_fifo,
- "ffmpeg codec (%s) stopped",
- p_decoder->psz_namecodec );
- free( p_decoder->p_context );
- }
+#if( !defined( WORDS_BIGENDIAN ) )
+ /* Indeo Video Codecs (Quality of this decoder on ppc is not good) */
+ { VLC_FOURCC('I','V','3','1'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+ { VLC_FOURCC('i','v','3','1'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+ { VLC_FOURCC('I','V','3','2'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+ { VLC_FOURCC('i','v','3','2'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+#endif
- FREE( p_decoder->p_buffer );
+ /* Huff YUV */
+ { VLC_FOURCC('H','F','Y','U'), CODEC_ID_HUFFYUV,
+ VIDEO_ES, "Huff YUV Video" },
- switch( p_decoder->i_cat )
- {
- case AUDIO_ES:
- E_( EndThread_Audio )( (adec_thread_t*)p_decoder );
- break;
- case VIDEO_ES:
- E_( EndThread_Video )( (vdec_thread_t*)p_decoder );
- break;
- }
+ /* Creative YUV */
+ { VLC_FOURCC('C','Y','U','V'), CODEC_ID_CYUV,
+ VIDEO_ES, "Creative YUV Video" },
- free( p_decoder );
-}
+ /* On2 VP3 Video Codecs */
+ { VLC_FOURCC('V','P','3','1'), CODEC_ID_VP3,
+ VIDEO_ES, "On2's VP3 Video" },
+ { VLC_FOURCC('v','p','3','1'), CODEC_ID_VP3,
+ VIDEO_ES, "On2's VP3 Video" },
-/*****************************************************************************
- * locales Functions
- *****************************************************************************/
+#if LIBAVCODEC_BUILD >= 4685
+ /* Xiph.org theora */
+ { VLC_FOURCC('t','h','e','o'), CODEC_ID_THEORA,
+ VIDEO_ES, "Xiph.org's Theora Video" },
+#endif
-int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes )
-{
- int i_copy;
- int i_count;
+#if ( !defined( WORDS_BIGENDIAN ) )
+ /* Asus Video (Another thing that doesn't work on PPC) */
+ { VLC_FOURCC('A','S','V','1'), CODEC_ID_ASV1,
+ VIDEO_ES, "Asus V1 Video" },
+ { VLC_FOURCC('A','S','V','2'), CODEC_ID_ASV2,
+ VIDEO_ES, "Asus V2 Video" },
+#endif
- data_packet_t *p_data;
+ /* FFMPEG Video 1 (lossless codec) */
+ { VLC_FOURCC('F','F','V','1'), CODEC_ID_FFV1,
+ VIDEO_ES, "FFMpeg Video 1" },
- i_count = 0;
- p_data = p_pes->p_first;
- while( p_data != NULL && i_count < i_max )
- {
+ /* ATI VCR1 */
+ { VLC_FOURCC('V','C','R','1'), CODEC_ID_VCR1,
+ VIDEO_ES, "ATI VCR1 Video" },
- i_copy = __MIN( p_data->p_payload_end - p_data->p_payload_start,
- i_max - i_count );
+ /* Cirrus Logic AccuPak */
+ { VLC_FOURCC('C','L','J','R'), CODEC_ID_CLJR,
+ VIDEO_ES, "Creative Logic AccuPak" },
- if( i_copy > 0 )
- {
- memcpy( p_buf,
- p_data->p_payload_start,
- i_copy );
- }
+ /* Real Video */
+ { VLC_FOURCC('R','V','1','0'), CODEC_ID_RV10,
+ VIDEO_ES, "Real Video 10" },
+ { VLC_FOURCC('R','V','1','3'), CODEC_ID_RV10,
+ VIDEO_ES, "Real Video 13" },
- p_data = p_data->p_next;
- i_count += i_copy;
- p_buf += i_copy;
- }
+#if LIBAVCODEC_BUILD >= 4684
+ /* Apple Video */
+ { VLC_FOURCC('r','p','z','a'), CODEC_ID_RPZA,
+ VIDEO_ES, "Apple Video" },
- if( i_count < i_max )
- {
- memset( p_buf, 0, i_max - i_count );
- }
- return( i_count );
-}
+ { VLC_FOURCC('s','m','c',' '), CODEC_ID_SMC,
+ VIDEO_ES, "Apple graphics" },
+ /* Cinepak */
+ { VLC_FOURCC('c','v','i','d'), CODEC_ID_CINEPAK,
+ VIDEO_ES, "Cinepak Video" },
-static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
- int *pi_cat,
- int *pi_ffmpeg_codec,
- char **ppsz_name )
-{
- int i_cat;
- int i_codec;
- char *psz_name;
+ /* Id Quake II CIN */
+ { VLC_FOURCC('I','D','C','I'), CODEC_ID_IDCIN,
+ VIDEO_ES, "Id Quake II CIN Video" },
+#endif
- switch( i_fourcc )
- {
-#if 0
- /* XXX don't use it */
- case FOURCC_mpgv:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MPEG1VIDEO;
- psz_name = "MPEG-1/2 Video";
- break;
+ /* 4X Technologies */
+ { VLC_FOURCC('4','x','m','v'), CODEC_ID_4XM,
+ VIDEO_ES, "4X Technologies Video" },
+
+#if LIBAVCODEC_BUILD >= 4694
+ /* Duck TrueMotion */
+ { VLC_FOURCC('D','U','C','K'), CODEC_ID_TRUEMOTION1,
+ VIDEO_ES, "Duck TrueMotion v1 Video" },
#endif
- case FOURCC_DIV1:
- case FOURCC_div1:
- case FOURCC_MPG4:
- case FOURCC_mpg4:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MSMPEG4V1;
- psz_name = "MS MPEG-4 v1";
- break;
-
- case FOURCC_DIV2:
- case FOURCC_div2:
- case FOURCC_MP42:
- case FOURCC_mp42:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MSMPEG4V2;
- psz_name = "MS MPEG-4 v2";
- break;
-
- case FOURCC_MPG3:
- case FOURCC_mpg3:
- case FOURCC_div3:
- case FOURCC_MP43:
- case FOURCC_mp43:
- case FOURCC_DIV3:
- case FOURCC_DIV4:
- case FOURCC_div4:
- case FOURCC_DIV5:
- case FOURCC_div5:
- case FOURCC_DIV6:
- case FOURCC_div6:
- case FOURCC_AP41:
- case FOURCC_3VID:
- case FOURCC_3vid:
- case FOURCC_3IVD:
- case FOURCC_3ivd:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MSMPEG4V3;
- psz_name = "MS MPEG-4 v3";
- break;
-
- case FOURCC_SVQ1:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_SVQ1;
- psz_name = "SVQ-1 (Sorenson Video v1)";
- break;
-#if LIBAVCODEC_BUILD >= 4666
- case FOURCC_SVQ3:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_SVQ3;
- psz_name = "SVQ-3 (Sorenson Video v3)";
- break;
+
+ /* Interplay MVE */
+ { VLC_FOURCC('i','m','v','e'), CODEC_ID_INTERPLAY_VIDEO,
+ VIDEO_ES, "Interplay MVE Video" },
+
+ /* Id RoQ */
+ { VLC_FOURCC('R','o','Q','v'), CODEC_ID_ROQ,
+ VIDEO_ES, "Id RoQ Video" },
+
+ /* Sony Playstation MDEC */
+ { VLC_FOURCC('M','D','E','C'), CODEC_ID_MDEC,
+ VIDEO_ES, "PSX MDEC Video" },
+
+#if LIBAVCODEC_BUILD >= 4699
+ /* Sierra VMD */
+ { VLC_FOURCC('v','m','d','v'), CODEC_ID_VMDVIDEO,
+ VIDEO_ES, "Sierra VMD Video" },
#endif
- case FOURCC_DIVX:
- case FOURCC_divx:
- case FOURCC_MP4S:
- case FOURCC_mp4s:
- case FOURCC_M4S2:
- case FOURCC_m4s2:
- case FOURCC_xvid:
- case FOURCC_XVID:
- case FOURCC_XviD:
- case FOURCC_DX50:
- case FOURCC_mp4v:
- case FOURCC_4:
- /* 3iv1 is unsupported by ffmpeg
- putting it here gives extreme distorted images
- case FOURCC_3IV1:
- case FOURCC_3iv1:
- */
- case FOURCC_3IV2:
- case FOURCC_3iv2:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MPEG4;
- psz_name = "MPEG-4";
- break;
-/* FIXME FOURCC_H263P exist but what fourcc ? */
- case FOURCC_H263:
- case FOURCC_h263:
- case FOURCC_U263:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_H263;
- psz_name = "H263";
- break;
-
- case FOURCC_I263:
- case FOURCC_i263:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_H263I;
- psz_name = "I263.I";
- break;
- case FOURCC_WMV1:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_WMV1;
- psz_name ="Windows Media Video 1";
- break;
- case FOURCC_WMV2:
- case FOURCC_MSS1:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_WMV2;
- psz_name ="Windows Media Video 2";
- break;
- case FOURCC_MJPG:
- case FOURCC_mjpg:
- case FOURCC_mjpa:
- case FOURCC_jpeg:
- case FOURCC_JPEG:
- case FOURCC_JFIF:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MJPEG;
- psz_name = "Motion JPEG";
- break;
- case FOURCC_mjpb:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_MJPEGB;
- psz_name = "Motion JPEG B";
- break;
- case FOURCC_dvsl:
- case FOURCC_dvsd:
- case FOURCC_DVSD:
- case FOURCC_dvhd:
- case FOURCC_dvc:
- case FOURCC_dvp:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_DVVIDEO;
- psz_name = "DV video";
- break;
-
- case FOURCC_MAC3:
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_MACE3;
- psz_name = "MACE-3 audio";
- break;
- case FOURCC_MAC6:
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_MACE6;
- psz_name = "MACE-6 audio";
- break;
- case FOURCC_dvau:
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_DVAUDIO;
- psz_name = "DV audio";
- break;
-
- case FOURCC_WMA1:
- case FOURCC_wma1:
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_WMAV1;
- psz_name ="Windows Media Audio 1";
- break;
- case FOURCC_WMA2:
- case FOURCC_wma2:
- i_cat = AUDIO_ES;
- i_codec = CODEC_ID_WMAV2;
- psz_name ="Windows Media Audio 2";
- break;
-
-#if( ( LIBAVCODEC_BUILD >= 4663 ) && ( defined( WORDS_BIGENDIAN ) ) )
- /* Quality of this decoder on ppc is not gooed */
- case FOURCC_IV31:
- case FOURCC_iv31:
- case FOURCC_IV32:
- case FOURCC_iv32:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_INDEO3;
- psz_name = "Indeo v3";
- break;
+ /*
+ * Audio Codecs
+ */
+
+ /* Windows Media Audio 1 */
+ { VLC_FOURCC('W','M','A','1'), CODEC_ID_WMAV1,
+ AUDIO_ES, "Windows Media Audio 1" },
+ { VLC_FOURCC('w','m','a','1'), CODEC_ID_WMAV1,
+ AUDIO_ES, "Windows Media Audio 1" },
+
+ /* Windows Media Audio 2 */
+ { VLC_FOURCC('W','M','A','2'), CODEC_ID_WMAV2,
+ AUDIO_ES, "Windows Media Audio 2" },
+ { VLC_FOURCC('w','m','a','2'), CODEC_ID_WMAV2,
+ AUDIO_ES, "Windows Media Audio 2" },
+
+ /* DV Audio */
+ { VLC_FOURCC('d','v','a','u'), CODEC_ID_DVAUDIO,
+ AUDIO_ES, "DV Audio" },
+
+ /* MACE-3 Audio */
+ { VLC_FOURCC('M','A','C','3'), CODEC_ID_MACE3,
+ AUDIO_ES, "MACE-3 Audio" },
+
+ /* MACE-6 Audio */
+ { VLC_FOURCC('M','A','C','6'), CODEC_ID_MACE6,
+ AUDIO_ES, "MACE-6 Audio" },
+
+ /* RealAudio 1.0 */
+ { VLC_FOURCC('1','4','_','4'), CODEC_ID_RA_144,
+ AUDIO_ES, "RealAudio 1.0" },
+
+ /* RealAudio 2.0 */
+ { VLC_FOURCC('2','8','_','8'), CODEC_ID_RA_288,
+ AUDIO_ES, "RealAudio 2.0" },
+
+ /* MPEG Audio layer 1/2/3 */
+ { VLC_FOURCC('m','p','g','a'), CODEC_ID_MP2,
+ AUDIO_ES, "MPEG Audio layer 1/2" },
+ { VLC_FOURCC('m','p','3',' '), CODEC_ID_MP3,
+ AUDIO_ES, "MPEG Audio layer 1/2/3" },
+
+ /* A52 Audio (aka AC3) */
+ { VLC_FOURCC('a','5','2',' '), CODEC_ID_AC3,
+ AUDIO_ES, "A52 Audio (aka AC3)" },
+ { VLC_FOURCC('a','5','2','b'), CODEC_ID_AC3, /* VLC specific hack */
+ AUDIO_ES, "A52 Audio (aka AC3)" },
+
+ /* AAC audio */
+ { VLC_FOURCC('m','p','4','a'), CODEC_ID_AAC,
+ AUDIO_ES, "MPEG AAC Audio" },
+
+ /* 4X Technologies */
+ { VLC_FOURCC('4','x','m','a'), CODEC_ID_ADPCM_4XM,
+ AUDIO_ES, "4X Technologies Audio" },
+
+ /* Interplay DPCM */
+ { VLC_FOURCC('i','d','p','c'), CODEC_ID_INTERPLAY_DPCM,
+ AUDIO_ES, "Interplay DPCM Audio" },
+
+ /* Id RoQ */
+ { VLC_FOURCC('R','o','Q','a'), CODEC_ID_ROQ_DPCM,
+ AUDIO_ES, "Id RoQ DPCM Audio" },
+
+#if LIBAVCODEC_BUILD >= 4685
+ /* Sony Playstation XA ADPCM */
+ { VLC_FOURCC('x','a',' ',' '), CODEC_ID_ADPCM_XA,
+ AUDIO_ES, "PSX XA ADPCM Audio" },
+
+ /* ADX ADPCM */
+ { VLC_FOURCC('a','d','x',' '), CODEC_ID_ADPCM_ADX,
+ AUDIO_ES, "ADX ADPCM Audio" },
#endif
-#if LIBAVCODEC_BUILD >= 4668
- /* Not yet finished
- case FOURCC_vp31:
- case FOURCC_VP31:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_VP3;
- psz_name = "On2's VP3 Video";
- break;
-
- case FOURCC_asv1:
- case FOURCC_ASV1:
- i_cat = VIDEO_ES;
- i_codec = CODEC_ID_ASV1;
- psz_name = "Asus V1";
- break;*/
+#if LIBAVCODEC_BUILD >= 4699
+ /* Sierra VMD */
+ { VLC_FOURCC('v','m','d','a'), CODEC_ID_VMDAUDIO,
+ AUDIO_ES, "Sierra VMD Audio" },
#endif
- default:
- i_cat = UNKNOWN_ES;
- i_codec = CODEC_ID_NONE;
- psz_name = NULL;
- break;
- }
+ /* PCM */
+ { VLC_FOURCC('s','8',' ',' '), CODEC_ID_PCM_S8,
+ AUDIO_ES, "PCM S8" },
+ { VLC_FOURCC('u','8',' ',' '), CODEC_ID_PCM_U8,
+ AUDIO_ES, "PCM U8" },
+ { VLC_FOURCC('s','1','6','l'), CODEC_ID_PCM_S16LE,
+ AUDIO_ES, "PCM S16 LE" },
+ { VLC_FOURCC('s','1','6','b'), CODEC_ID_PCM_S16BE,
+ AUDIO_ES, "PCM S16 BE" },
+ { VLC_FOURCC('u','1','6','l'), CODEC_ID_PCM_U16LE,
+ AUDIO_ES, "PCM U16 LE" },
+ { VLC_FOURCC('u','1','6','b'), CODEC_ID_PCM_U16BE,
+ AUDIO_ES, "PCM U16 BE" },
+ { VLC_FOURCC('a','l','a','w'), CODEC_ID_PCM_ALAW,
+ AUDIO_ES, "PCM ALAW" },
+ { VLC_FOURCC('u','l','a','w'), CODEC_ID_PCM_MULAW,
+ AUDIO_ES, "PCM ULAW" },
+
+ {0}
+};
+
+int E_(GetFfmpegCodec)( vlc_fourcc_t i_fourcc, int *pi_cat,
+ int *pi_ffmpeg_codec, char **ppsz_name )
+{
+ int i;
- if( i_codec != CODEC_ID_NONE )
+ for( i = 0; codecs_table[i].i_fourcc != 0; i++ )
{
- if( pi_cat ) *pi_cat = i_cat;
- if( pi_ffmpeg_codec ) *pi_ffmpeg_codec = i_codec;
- if( ppsz_name ) *ppsz_name = psz_name;
- return( VLC_TRUE );
- }
+ if( codecs_table[i].i_fourcc == i_fourcc )
+ {
+ if( pi_cat ) *pi_cat = codecs_table[i].i_cat;
+ if( pi_ffmpeg_codec ) *pi_ffmpeg_codec = codecs_table[i].i_codec;
+ if( ppsz_name ) *ppsz_name = codecs_table[i].psz_name;
- return( VLC_FALSE );
+ return VLC_TRUE;
+ }
+ }
+ return VLC_FALSE;
}
+int E_(GetVlcFourcc)( int i_ffmpeg_codec, int *pi_cat,
+ vlc_fourcc_t *pi_fourcc, char **ppsz_name )
+{
+ int i;
+ for( i = 0; codecs_table[i].i_codec != 0; i++ )
+ {
+ if( codecs_table[i].i_codec == i_ffmpeg_codec )
+ {
+ if( pi_cat ) *pi_cat = codecs_table[i].i_cat;
+ if( pi_fourcc ) *pi_fourcc = codecs_table[i].i_fourcc;
+ if( ppsz_name ) *ppsz_name = codecs_table[i].psz_name;
+ return VLC_TRUE;
+ }
+ }
+ return VLC_FALSE;
+}
projects / vlc / blobdiff