X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fffmpeg%2Fffmpeg.c;h=e890d58a5c13279806269332f765f5ed95780c81;hb=f485214f09dd284cbb85674e937fbbb0a6032a2e;hp=33a3fd4863650b9fc95df4e71596713adaf1c47f;hpb=33bf3f9a1d3a0a112c2244a4cd73a09df698ec8f;p=vlc diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c index 33a3fd4863..e890d58a5c 100644 --- a/modules/codec/ffmpeg/ffmpeg.c +++ b/modules/codec/ffmpeg/ffmpeg.c @@ -1,11 +1,11 @@ /***************************************************************************** * ffmpeg.c: video decoder using ffmpeg library ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN + * Copyright (C) 1999-2001 the VideoLAN team * $Id$ * * Authors: Laurent Aimar - * Gildas Bazin + * Gildas Bazin * * 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 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -29,7 +29,7 @@ #include /* ffmpeg header */ -#define HAVE_MMX +#define HAVE_MMX 1 #ifdef HAVE_FFMPEG_AVCODEC_H # include #else @@ -70,49 +70,153 @@ struct decoder_sys_t static int OpenDecoder( vlc_object_t * ); static void CloseDecoder( vlc_object_t * ); +static int nloopf_list[] = { 0, 1, 2, 3, 4 }; +static char *nloopf_list_text[] = + { N_("None"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") }; + +static char *enc_hq_list[] = { "rd", "bits", "simple" }; +static char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") }; /***************************************************************************** * Module descriptor *****************************************************************************/ vlc_module_begin(); - + set_shortname( "FFmpeg"); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_SCODEC ); /* decoder main module */ - set_description( _("ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)") ); +#if defined(MODULE_NAME_is_ffmpegaltivec) \ + || (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG)) + set_description( _("AltiVec FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") ); + /*add_requirement( ALTIVEC );*/ + set_capability( "decoder", 71 ); +#else + set_description( _("FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") ); set_capability( "decoder", 70 ); +#endif + set_section( N_("Decoding") , NULL ); 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, + 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-vismv", 0, NULL, VISMV_TEXT, VISMV_LONGTEXT, + VLC_TRUE ); + add_integer ( "ffmpeg-lowres", 0, NULL, LOWRES_TEXT, LOWRES_LONGTEXT, + VLC_TRUE ); + change_integer_range( 0, 2 ); + add_integer ( "ffmpeg-skiploopfilter", 0, NULL, SKIPLOOPF_TEXT, + SKIPLOOPF_LONGTEXT, VLC_TRUE ); + change_integer_list( nloopf_list, nloopf_list_text, 0 ); #ifdef LIBAVCODEC_PP 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), E_(CloseChroma) ); - set_description( _("ffmpeg chroma conversion") ); + set_description( _("FFmpeg chroma conversion") ); /* encoder submodule */ add_submodule(); - set_description( _("ffmpeg audio/video encoder") ); + set_section( N_("Encoding") , NULL ); + 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_bool( ENC_CFG_PREFIX "interlace-me", 1, NULL, ENC_INTERLACE_ME_TEXT, + ENC_INTERLACE_ME_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, NULL, + ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, VLC_TRUE ); + add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0, 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 ); + add_float( ENC_CFG_PREFIX "qscale", 0, NULL, + ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, VLC_TRUE ); + add_integer( ENC_CFG_PREFIX "strict", 0, NULL, + ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, VLC_TRUE ); + add_float( ENC_CFG_PREFIX "lumi-masking", 0.0, NULL, + ENC_LUMI_MASKING_TEXT, ENC_LUMI_MASKING_LONGTEXT, VLC_TRUE ); + add_float( ENC_CFG_PREFIX "dark-masking", 0.0, NULL, + ENC_DARK_MASKING_TEXT, ENC_DARK_MASKING_LONGTEXT, VLC_TRUE ); + add_float( ENC_CFG_PREFIX "p-masking", 0.0, NULL, + ENC_P_MASKING_TEXT, ENC_P_MASKING_LONGTEXT, VLC_TRUE ); + add_float( ENC_CFG_PREFIX "border-masking", 0.0, NULL, + ENC_BORDER_MASKING_TEXT, ENC_BORDER_MASKING_LONGTEXT, VLC_TRUE ); + add_integer( ENC_CFG_PREFIX "luma-elim-threshold", 0, NULL, + ENC_LUMA_ELIM_TEXT, ENC_LUMA_ELIM_LONGTEXT, VLC_TRUE ); + add_integer( ENC_CFG_PREFIX "chroma-elim-threshold", 0, NULL, + ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, VLC_TRUE ); + /* demux submodule */ add_submodule(); - set_description( _("ffmpeg demuxer" ) ); - set_capability( "demux2", 1 ); + set_description( _("FFmpeg demuxer" ) ); + set_capability( "demux2", 2 ); set_callbacks( E_(OpenDemux), E_(CloseDemux) ); - var_Create( p_module->p_libvlc, "avcodec", VLC_VAR_MUTEX ); + /* mux submodule */ + add_submodule(); + set_description( _("FFmpeg muxer" ) ); + set_capability( "sout mux", 2 ); + set_callbacks( E_(OpenMux), E_(CloseMux) ); + + /* video filter submodule */ + add_submodule(); + set_capability( "video filter2", 50 ); + set_callbacks( E_(OpenFilter), E_(CloseFilter) ); + set_description( _("FFmpeg video filter") ); + + /* crop/padd submodule */ + add_submodule(); + set_capability( "crop padd", 10 ); + set_callbacks( E_(OpenCropPadd), E_(CloseFilter) ); + set_description( _("FFmpeg crop padd filter") ); + + /* video filter submodule */ + add_submodule(); + set_capability( "video filter2", 0 ); + set_callbacks( E_(OpenDeinterlace), E_(CloseDeinterlace) ); + set_description( _("FFmpeg deinterlace video filter") ); + add_shortcut( "ffmpeg-deinterlace" ); + + var_Create( p_module->p_libvlc_global, "avcodec", VLC_VAR_MUTEX ); vlc_module_end(); /***************************************************************************** @@ -124,8 +228,8 @@ static int OpenDecoder( vlc_object_t *p_this ) int i_cat, i_codec_id, i_result; char *psz_namecodec; - AVCodecContext *p_context; - AVCodec *p_codec; + AVCodecContext *p_context = NULL; + AVCodec *p_codec = NULL; /* *** determine codec type *** */ if( !E_(GetFfmpegCodec)( p_dec->fmt_in.i_codec, &i_cat, &i_codec_id, @@ -146,7 +250,8 @@ static int OpenDecoder( vlc_object_t *p_this ) E_(InitLibavcodec)(p_this); /* *** ask ffmpeg for a decoder *** */ - if( !( p_codec = avcodec_find_decoder( i_codec_id ) ) ) + p_codec = avcodec_find_decoder( i_codec_id ); + if( !p_codec ) { msg_Dbg( p_dec, "codec not found (%s)", psz_namecodec ); return VLC_EGENERIC; @@ -154,24 +259,31 @@ static int OpenDecoder( vlc_object_t *p_this ) /* *** get a p_context *** */ p_context = avcodec_alloc_context(); + if( !p_context ) + return VLC_ENOMEM; + p_context->debug = config_GetInt( p_dec, "ffmpeg-debug" ); + p_context->opaque = (void *)p_this; /* Set CPU capabilities */ p_context->dsp_mask = 0; - if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) ) + if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) ) { p_context->dsp_mask |= FF_MM_MMX; } - if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) ) + if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) ) { p_context->dsp_mask |= FF_MM_MMXEXT; } - if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) ) + if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW) ) { p_context->dsp_mask |= FF_MM_3DNOW; } - if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) ) + if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) ) { p_context->dsp_mask |= FF_MM_SSE; + } + if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE2) ) + { p_context->dsp_mask |= FF_MM_SSE2; } @@ -192,7 +304,7 @@ static int OpenDecoder( vlc_object_t *p_this ) i_result = VLC_EGENERIC; } - p_dec->p_sys->i_cat = i_cat; + if( i_result == VLC_SUCCESS ) p_dec->p_sys->i_cat = i_cat; return i_result; } @@ -204,16 +316,9 @@ 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; + vlc_value_t lockval; - 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 ); - free( p_sys->p_context ); - } + var_Get( p_dec->p_libvlc_global, "avcodec", &lockval ); switch( p_sys->i_cat ) { @@ -225,37 +330,76 @@ static void CloseDecoder( vlc_object_t *p_this ) break; } + if( p_sys->p_context ) + { + if( p_sys->p_context->extradata ) + free( p_sys->p_context->extradata ); + p_sys->p_context->extradata = NULL; + vlc_mutex_lock( lockval.p_address ); + avcodec_close( p_sys->p_context ); + vlc_mutex_unlock( lockval.p_address ); + msg_Dbg( p_dec, "ffmpeg codec (%s) stopped", p_sys->psz_namecodec ); + av_free( p_sys->p_context ); + } + free( p_sys ); } - + /***************************************************************************** * local Functions *****************************************************************************/ -int E_(GetFfmpegChroma)( vlc_fourcc_t i_chroma ) +static void LibavcodecCallback( void *p_opaque, int i_level, + const char *psz_format, va_list va ) { - switch( i_chroma ) + int i_vlc_level; + AVCodecContext *p_avctx = (AVCodecContext *)p_opaque; + AVClass *p_avc; + vlc_object_t *p_this; + char *psz_new_format; + const char *psz_item_name; + + p_avc = p_avctx ? p_avctx->av_class : 0; + +#define cln p_avc->class_name + /* Make sure we can get p_this back */ + if( !p_avctx || !p_avc || !cln || + cln[0]!='A' || cln[1]!='V' || cln[2]!='C' || cln[3]!='o' || + cln[4]!='d' || cln[5]!='e' || cln[6]!='c' ) + { + if( i_level == AV_LOG_ERROR ) vfprintf( stderr, psz_format, va ); + return; + } +#undef cln + + p_this = (vlc_object_t *)p_avctx->opaque; + + switch( i_level ) { - 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; + case AV_LOG_QUIET: + i_vlc_level = VLC_MSG_ERR; + break; + case AV_LOG_ERROR: + i_vlc_level = VLC_MSG_WARN; + break; + case AV_LOG_INFO: + i_vlc_level = VLC_MSG_DBG; + break; + case AV_LOG_DEBUG: + /* Print debug messages if they were requested */ + if( p_avctx->debug ) vfprintf( stderr, psz_format, va ); + return; default: - return -1; + return; } + + psz_item_name = p_avc->item_name(p_opaque); + psz_new_format = malloc( strlen(psz_format) + strlen(psz_item_name) + + 18 + 5 ); + snprintf( psz_new_format, strlen(psz_format) + strlen(psz_item_name) + + 18 + 5, "%s (%s@%p)", psz_format, p_avc->item_name(p_opaque), p_opaque ); + msg_GenericVa( p_this, MSG_QUEUE_NORMAL,i_vlc_level, + MODULE_STRING, psz_new_format, va ); + free( psz_new_format ); } void E_(InitLibavcodec)( vlc_object_t *p_object ) @@ -263,7 +407,7 @@ void E_(InitLibavcodec)( vlc_object_t *p_object ) static int b_ffmpeginit = 0; vlc_value_t lockval; - var_Get( p_object->p_libvlc, "avcodec", &lockval ); + var_Get( p_object->p_libvlc_global, "avcodec", &lockval ); vlc_mutex_lock( lockval.p_address ); /* *** init ffmpeg library (libavcodec) *** */ @@ -271,6 +415,7 @@ void E_(InitLibavcodec)( vlc_object_t *p_object ) { avcodec_init(); avcodec_register_all(); + av_log_set_callback( LibavcodecCallback ); b_ffmpeginit = 1; msg_Dbg( p_object, "libavcodec initialized (interface %d )", @@ -284,7 +429,73 @@ void E_(InitLibavcodec)( vlc_object_t *p_object ) vlc_mutex_unlock( lockval.p_address ); } +/***************************************************************************** + * Chroma fourcc -> ffmpeg_id mapping + *****************************************************************************/ +static struct +{ + vlc_fourcc_t i_chroma; + int i_chroma_id; + +} chroma_table[] = +{ + /* Planar YUV formats */ + { VLC_FOURCC('Y','U','V','A'), PIX_FMT_YUV444P }, /* Hack */ + { VLC_FOURCC('I','4','4','4'), PIX_FMT_YUV444P }, + { VLC_FOURCC('J','4','4','4'), PIX_FMT_YUVJ444P }, + { VLC_FOURCC('I','4','2','2'), PIX_FMT_YUV422P }, + { VLC_FOURCC('J','4','2','2'), PIX_FMT_YUVJ422P }, + { VLC_FOURCC('I','4','2','0'), PIX_FMT_YUV420P }, + { VLC_FOURCC('Y','V','1','2'), PIX_FMT_YUV420P }, + { VLC_FOURCC('I','Y','U','V'), PIX_FMT_YUV420P }, + { VLC_FOURCC('J','4','2','0'), PIX_FMT_YUVJ420P }, + { VLC_FOURCC('I','4','1','1'), PIX_FMT_YUV411P }, + { VLC_FOURCC('I','4','1','0'), PIX_FMT_YUV410P }, + { VLC_FOURCC('Y','V','U','9'), PIX_FMT_YUV410P }, + + /* Packed YUV formats */ + { VLC_FOURCC('Y','U','Y','2'), PIX_FMT_YUV422 }, +#if LIBAVCODEC_BUILD >= 4720 + { VLC_FOURCC('U','Y','V','Y'), PIX_FMT_UYVY422 }, +#endif + + /* Packed RGB formats */ + { VLC_FOURCC('R','V','1','5'), PIX_FMT_RGB555 }, + { VLC_FOURCC('R','V','1','6'), PIX_FMT_RGB565 }, + { VLC_FOURCC('R','V','2','4'), PIX_FMT_RGB24 }, + { VLC_FOURCC('R','V','3','2'), PIX_FMT_RGBA32 }, + { VLC_FOURCC('G','R','E','Y'), PIX_FMT_GRAY8 }, + + {0} +}; + +int E_(GetFfmpegChroma)( vlc_fourcc_t i_chroma ) +{ + int i; + + for( i = 0; chroma_table[i].i_chroma != 0; i++ ) + { + if( chroma_table[i].i_chroma == i_chroma ) + return chroma_table[i].i_chroma_id; + } + return -1; +} + +vlc_fourcc_t E_(GetVlcChroma)( int i_ffmpeg_chroma ) +{ + int i; + + for( i = 0; chroma_table[i].i_chroma != 0; i++ ) + { + if( chroma_table[i].i_chroma_id == i_ffmpeg_chroma ) + return chroma_table[i].i_chroma; + } + return 0; +} +/***************************************************************************** + * Codec fourcc -> ffmpeg_id mapping + *****************************************************************************/ static struct { vlc_fourcc_t i_fourcc; @@ -323,18 +534,26 @@ static struct VIDEO_ES, "MPEG-4 Video" }, { VLC_FOURCC('X','v','i','D'), CODEC_ID_MPEG4, VIDEO_ES, "MPEG-4 Video" }, + { VLC_FOURCC('X','V','I','X'), CODEC_ID_MPEG4, + VIDEO_ES, "MPEG-4 Video" }, + { VLC_FOURCC('x','v','i','x'), 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('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" }, + { VLC_FOURCC('F','M','P','4'), 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, @@ -420,6 +639,15 @@ static struct VIDEO_ES, "h264" }, { VLC_FOURCC('H','2','6','4'), CODEC_ID_H264, VIDEO_ES, "h264" }, + { VLC_FOURCC('x','2','6','4'), CODEC_ID_H264, + VIDEO_ES, "h264" }, + /* avc1: special case h264 */ + { VLC_FOURCC('a','v','c','1'), CODEC_ID_H264, + VIDEO_ES, "h264" }, + { VLC_FOURCC('V','S','S','H'), CODEC_ID_H264, + VIDEO_ES, "h264" }, + { VLC_FOURCC('v','s','s','h'), CODEC_ID_H264, + VIDEO_ES, "h264" }, /* H263 and H263i */ /* H263(+) is also known as Real Video 1.0 */ @@ -433,6 +661,8 @@ static struct VIDEO_ES, "H263" }, { VLC_FOURCC('U','2','6','3'), CODEC_ID_H263, VIDEO_ES, "H263" }, + { VLC_FOURCC('M','2','6','3'), CODEC_ID_H263, + VIDEO_ES, "H263" }, /* H263i */ { VLC_FOURCC('I','2','6','3'), CODEC_ID_H263I, @@ -444,6 +674,11 @@ static struct { VLC_FOURCC('F','L','V','1'), CODEC_ID_FLV1, VIDEO_ES, "Flash Video" }, +#if LIBAVCODEC_BUILD > 4716 + { VLC_FOURCC('H','2','6','1'), CODEC_ID_H261, + VIDEO_ES, "H.261" }, +#endif + #if LIBAVCODEC_BUILD > 4680 { VLC_FOURCC('F','L','I','C'), CODEC_ID_FLIC, VIDEO_ES, "Flic Video" }, @@ -484,8 +719,12 @@ static struct VIDEO_ES, "DV Video" }, { VLC_FOURCC('d','v','c',' '), CODEC_ID_DVVIDEO, VIDEO_ES, "DV Video" }, + { VLC_FOURCC('d','v','c','p'), CODEC_ID_DVVIDEO, + VIDEO_ES, "DV Video PAL" }, { VLC_FOURCC('d','v','p',' '), CODEC_ID_DVVIDEO, - VIDEO_ES, "DV Video" }, + VIDEO_ES, "DV Video Pro" }, + { VLC_FOURCC('d','v','p','p'), CODEC_ID_DVVIDEO, + VIDEO_ES, "DV Video Pro PAL" }, { VLC_FOURCC('C','D','V','C'), CODEC_ID_DVVIDEO, VIDEO_ES, "DV Video" }, @@ -494,6 +733,18 @@ static struct VIDEO_ES, "Windows Media Video 1" }, { VLC_FOURCC('W','M','V','2'), CODEC_ID_WMV2, VIDEO_ES, "Windows Media Video 2" }, +#if LIBAVCODEC_BUILD >= ((51<<16)+(10<<8)+1) + { VLC_FOURCC('W','M','V','3'), CODEC_ID_WMV3, + VIDEO_ES, "Windows Media Video 3" }, + { VLC_FOURCC('W','V','C','1'), CODEC_ID_VC1, + VIDEO_ES, "Windows Media Video VC1" }, +#endif +#if 0 + /* WMVA is the VC-1 codec before the standardization proces, + it is not bitstream compatible and deprecated */ + { VLC_FOURCC('W','M','V','A'), CODEC_ID_VC1, + VIDEO_ES, "Windows Media Video Advanced Profile" }, +#endif #if LIBAVCODEC_BUILD >= 4683 /* Microsoft Video 1 */ @@ -517,7 +768,6 @@ static struct VIDEO_ES, "Microsoft RLE Video" }, #endif -#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" }, @@ -527,6 +777,10 @@ static struct VIDEO_ES, "Indeo Video v3" }, { VLC_FOURCC('i','v','3','2'), CODEC_ID_INDEO3, VIDEO_ES, "Indeo Video v3" }, + +#if LIBAVCODEC_BUILD >= 4721 + { VLC_FOURCC('t','s','c','c'), CODEC_ID_TSCC, + VIDEO_ES, "TechSmith Camtasia Screen Capture Video" }, #endif /* Huff YUV */ @@ -538,11 +792,28 @@ static struct VIDEO_ES, "Creative YUV Video" }, /* On2 VP3 Video Codecs */ + { VLC_FOURCC('V','P','3',' '), CODEC_ID_VP3, + VIDEO_ES, "On2's VP3 Video" }, + { VLC_FOURCC('V','P','3','0'), CODEC_ID_VP3, + VIDEO_ES, "On2's VP3 Video" }, { 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" }, +#if LIBAVCODEC_BUILD >= ((51<<16)+(14<<8)+0) + { VLC_FOURCC('V','P','5',' '), CODEC_ID_VP5, + VIDEO_ES, "On2's VP5 Video" }, + { VLC_FOURCC('V','P','5','0'), CODEC_ID_VP5, + VIDEO_ES, "On2's VP5 Video" }, + { VLC_FOURCC('V','P','6','2'), CODEC_ID_VP6, + VIDEO_ES, "On2's VP6.2 Video" }, + { VLC_FOURCC('v','p','6','2'), CODEC_ID_VP6, + VIDEO_ES, "On2's VP6.2 Video" }, + { VLC_FOURCC('V','P','6','F'), CODEC_ID_VP6F, + VIDEO_ES, "On2's VP6.2 Video (Flash)" }, +#endif + #if LIBAVCODEC_BUILD >= 4685 /* Xiph.org theora */ { VLC_FOURCC('t','h','e','o'), CODEC_ID_THEORA, @@ -620,6 +891,76 @@ static struct VIDEO_ES, "Sierra VMD Video" }, #endif +#if LIBAVCODEC_BUILD >= 4719 + /* FFMPEG's SNOW wavelet codec */ + { VLC_FOURCC('S','N','O','W'), CODEC_ID_SNOW, + VIDEO_ES, "FFMpeg SNOW wavelet Video" }, +#endif + +#if LIBAVCODEC_BUILD >= 4752 + { VLC_FOURCC('r','l','e',' '), CODEC_ID_QTRLE, + VIDEO_ES, "Apple QuickTime RLE Video" }, + + { VLC_FOURCC('q','d','r','w'), CODEC_ID_QDRAW, + VIDEO_ES, "Apple QuickDraw Video" }, + + { VLC_FOURCC('Q','P','E','G'), CODEC_ID_QPEG, + VIDEO_ES, "QPEG Video" }, + { VLC_FOURCC('Q','1','.','0'), CODEC_ID_QPEG, + VIDEO_ES, "QPEG Video" }, + { VLC_FOURCC('Q','1','.','1'), CODEC_ID_QPEG, + VIDEO_ES, "QPEG Video" }, + + { VLC_FOURCC('U','L','T','I'), CODEC_ID_ULTI, + VIDEO_ES, "IBM Ultimotion Video" }, + + { VLC_FOURCC('V','I','X','L'), CODEC_ID_VIXL, + VIDEO_ES, "Miro/Pinnacle VideoXL Video" }, + + { VLC_FOURCC('L','O','C','O'), CODEC_ID_LOCO, + VIDEO_ES, "LOCO Video" }, + + { VLC_FOURCC('W','N','V','1'), CODEC_ID_WNV1, + VIDEO_ES, "Winnov WNV1 Video" }, + + { VLC_FOURCC('A','A','S','C'), CODEC_ID_AASC, + VIDEO_ES, "Autodesc RLE Video" }, +#endif +#if LIBAVCODEC_BUILD >= 4753 + { VLC_FOURCC('I','V','2','0'), CODEC_ID_INDEO2, + VIDEO_ES, "Indeo Video v2" }, + { VLC_FOURCC('R','T','2','1'), CODEC_ID_INDEO2, + VIDEO_ES, "Indeo Video v2" }, +#endif + +#if LIBAVCODEC_BUILD >= ((51<<16)+(13<<8)+0) + { VLC_FOURCC('V','M','n','c'), CODEC_ID_VMNC, + VIDEO_ES, "VMware Video" }, +#endif + + + /* + * Image codecs + */ + +#if LIBAVCODEC_BUILD >= 4731 + { VLC_FOURCC('p','n','g',' '), CODEC_ID_PNG, + VIDEO_ES, "PNG Image" }, + { VLC_FOURCC('p','p','m',' '), CODEC_ID_PPM, + VIDEO_ES, "PPM Image" }, + { VLC_FOURCC('p','g','m',' '), CODEC_ID_PGM, + VIDEO_ES, "PGM Image" }, + { VLC_FOURCC('p','g','m','y'), CODEC_ID_PGMYUV, + VIDEO_ES, "PGM YUV Image" }, + { VLC_FOURCC('p','a','m',' '), CODEC_ID_PAM, + VIDEO_ES, "PAM Image" }, +#endif + +#if LIBAVCODEC_BUILD >= ((51<<16)+(0<<8)+0) + { VLC_FOURCC('b','m','p',' '), CODEC_ID_BMP, + VIDEO_ES, "BMP Image" }, +#endif + /* * Audio Codecs */ @@ -668,6 +1009,12 @@ static struct { VLC_FOURCC('a','5','2','b'), CODEC_ID_AC3, /* VLC specific hack */ AUDIO_ES, "A52 Audio (aka AC3)" }, +#if LIBAVCODEC_BUILD >= 4719 + /* DTS Audio */ + { VLC_FOURCC('d','t','s',' '), CODEC_ID_DTS, + AUDIO_ES, "DTS Audio" }, +#endif + /* AAC audio */ { VLC_FOURCC('m','p','4','a'), CODEC_ID_AAC, AUDIO_ES, "MPEG AAC Audio" }, @@ -700,6 +1047,50 @@ static struct AUDIO_ES, "Sierra VMD Audio" }, #endif +#if LIBAVCODEC_BUILD >= 4706 + /* G.726 ADPCM */ + { VLC_FOURCC('g','7','2','6'), CODEC_ID_ADPCM_G726, + AUDIO_ES, "G.726 ADPCM Audio" }, +#endif + +#if LIBAVCODEC_BUILD >= 4683 + /* AMR */ + { VLC_FOURCC('s','a','m','r'), CODEC_ID_AMR_NB, + AUDIO_ES, "AMR narrow band" }, + { VLC_FOURCC('s','a','w','b'), CODEC_ID_AMR_WB, + AUDIO_ES, "AMR wide band" }, +#endif + +#if LIBAVCODEC_BUILD >= 4703 + /* FLAC */ + { VLC_FOURCC('f','l','a','c'), CODEC_ID_FLAC, + AUDIO_ES, "FLAC (Free Lossless Audio Codec)" }, +#endif + +#if LIBAVCODEC_BUILD >= 4745 + /* ALAC */ + { VLC_FOURCC('a','l','a','c'), CODEC_ID_ALAC, + AUDIO_ES, "Apple Lossless Audio Codec" }, +#endif + +#if LIBAVCODEC_BUILD >= ((50<<16)+(0<<8)+1) + /* QDM2 */ + { VLC_FOURCC('Q','D','M','2'), CODEC_ID_QDM2, + AUDIO_ES, "QDM2 Audio" }, +#endif + +#if LIBAVCODEC_BUILD >= ((51<<16)+(0<<8)+0) + /* COOK */ + { VLC_FOURCC('c','o','o','k'), CODEC_ID_COOK, + AUDIO_ES, "Cook Audio" }, +#endif + +#if LIBAVCODEC_BUILD >= ((51<<16)+(8<<8)+0) + /* Shorten */ + { VLC_FOURCC('s','h','n',' '), CODEC_ID_SHORTEN, + AUDIO_ES, "Shorten Lossless Audio" }, +#endif + /* PCM */ { VLC_FOURCC('s','8',' ',' '), CODEC_ID_PCM_S8, AUDIO_ES, "PCM S8" },