X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fffmpeg%2Fffmpeg.c;h=d5e6f2dbe363af277fbccf9559f6d2c7852b3170;hb=3b420ec94e74840c9e9a22f1a73a442c24d3d0b2;hp=66a40a7739259e3622cbd057b04161934a226dc6;hpb=e00551fba283031fa8e4036eb044c640cfdb64be;p=vlc diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c index 66a40a7739..d5e6f2dbe3 100644 --- a/modules/codec/ffmpeg/ffmpeg.c +++ b/modules/codec/ffmpeg/ffmpeg.c @@ -34,7 +34,7 @@ /* ffmpeg header */ #define HAVE_MMX 1 -#if defined(HAVE_LIBAVCODEC_AVCODEC_H) +#ifdef HAVE_LIBAVCODEC_AVCODEC_H # include #elif defined(HAVE_FFMPEG_AVCODEC_H) # include @@ -76,7 +76,7 @@ static const char *nloopf_list_text[] = static const char *enc_hq_list[] = { "rd", "bits", "simple" }; static const char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") }; -#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE) +#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE) static int pi_mode_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; static const char *ppsz_mode_descriptions[] = { N_("Fast bilinear"), N_("Bilinear"), N_("Bicubic (good quality)"), @@ -111,33 +111,33 @@ vlc_module_begin(); set_callbacks( OpenDecoder, CloseDecoder ); - add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, VLC_TRUE ); + add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, true ); add_integer ( "ffmpeg-error-resilience", 1, NULL, ERROR_TEXT, - ERROR_LONGTEXT, VLC_TRUE ); + ERROR_LONGTEXT, true ); add_integer ( "ffmpeg-workaround-bugs", 1, NULL, BUGS_TEXT, BUGS_LONGTEXT, - VLC_FALSE ); + false ); add_bool( "ffmpeg-hurry-up", 1, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, - VLC_FALSE ); + false ); add_integer( "ffmpeg-skip-frame", 0, NULL, SKIP_FRAME_TEXT, - SKIP_FRAME_LONGTEXT, VLC_TRUE ); + SKIP_FRAME_LONGTEXT, true ); change_integer_range( -1, 4 ); add_integer( "ffmpeg-skip-idct", 0, NULL, SKIP_IDCT_TEXT, - SKIP_IDCT_LONGTEXT, VLC_TRUE ); + SKIP_IDCT_LONGTEXT, true ); change_integer_range( -1, 4 ); add_integer ( "ffmpeg-vismv", 0, NULL, VISMV_TEXT, VISMV_LONGTEXT, - VLC_TRUE ); + true ); add_integer ( "ffmpeg-lowres", 0, NULL, LOWRES_TEXT, LOWRES_LONGTEXT, - VLC_TRUE ); + true ); change_integer_range( 0, 2 ); add_integer ( "ffmpeg-skiploopfilter", 0, NULL, SKIPLOOPF_TEXT, - SKIPLOOPF_LONGTEXT, VLC_TRUE ); + SKIPLOOPF_LONGTEXT, true ); change_integer_list( nloopf_list, nloopf_list_text, 0 ); - add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE ); + add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, false ); add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT, - LIBAVCODEC_PP_LONGTEXT, VLC_TRUE ); + LIBAVCODEC_PP_LONGTEXT, true ); add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT, - VLC_TRUE ); + true ); /* encoder submodule */ add_submodule(); @@ -147,62 +147,69 @@ vlc_module_begin(); set_callbacks( E_(OpenEncoder), E_(CloseEncoder) ); add_string( ENC_CFG_PREFIX "hq", "simple", NULL, ENC_HQ_TEXT, - ENC_HQ_LONGTEXT, VLC_FALSE ); + ENC_HQ_LONGTEXT, 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 ); + ENC_KEYINT_LONGTEXT, false ); add_integer( ENC_CFG_PREFIX "bframes", 0, NULL, ENC_BFRAMES_TEXT, - ENC_BFRAMES_LONGTEXT, VLC_FALSE ); + ENC_BFRAMES_LONGTEXT, false ); add_bool( ENC_CFG_PREFIX "hurry-up", 0, NULL, ENC_HURRYUP_TEXT, - ENC_HURRYUP_LONGTEXT, VLC_FALSE ); + ENC_HURRYUP_LONGTEXT, false ); add_bool( ENC_CFG_PREFIX "interlace", 0, NULL, ENC_INTERLACE_TEXT, - ENC_INTERLACE_LONGTEXT, VLC_TRUE ); + ENC_INTERLACE_LONGTEXT, true ); add_bool( ENC_CFG_PREFIX "interlace-me", 1, NULL, ENC_INTERLACE_ME_TEXT, - ENC_INTERLACE_ME_LONGTEXT, VLC_TRUE ); + ENC_INTERLACE_ME_LONGTEXT, true ); add_integer( ENC_CFG_PREFIX "vt", 0, NULL, ENC_VT_TEXT, - ENC_VT_LONGTEXT, VLC_TRUE ); + ENC_VT_LONGTEXT, true ); add_bool( ENC_CFG_PREFIX "pre-me", 0, NULL, ENC_PRE_ME_TEXT, - ENC_PRE_ME_LONGTEXT, VLC_TRUE ); + ENC_PRE_ME_LONGTEXT, true ); add_bool( ENC_CFG_PREFIX "strict-rc", 0, NULL, ENC_RC_STRICT_TEXT, - ENC_RC_STRICT_LONGTEXT, VLC_TRUE ); + ENC_RC_STRICT_LONGTEXT, true ); add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8, NULL, - ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, VLC_TRUE ); + ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, true ); add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0, NULL, - ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, VLC_TRUE ); + ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, true ); add_float( ENC_CFG_PREFIX "i-quant-factor", 0, NULL, - ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, VLC_TRUE ); + ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, true ); add_integer( ENC_CFG_PREFIX "noise-reduction", 0, NULL, - ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, VLC_TRUE ); + ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, true ); add_bool( ENC_CFG_PREFIX "mpeg4-matrix", 0, NULL, - ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, VLC_TRUE ); + ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, true ); add_integer( ENC_CFG_PREFIX "qmin", 0, NULL, - ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, VLC_TRUE ); + ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, true ); add_integer( ENC_CFG_PREFIX "qmax", 0, NULL, - ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, VLC_TRUE ); + ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, true ); add_bool( ENC_CFG_PREFIX "trellis", 0, NULL, - ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, VLC_TRUE ); + ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, true ); add_float( ENC_CFG_PREFIX "qscale", 0, NULL, - ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, VLC_TRUE ); + ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, true ); add_integer( ENC_CFG_PREFIX "strict", 0, NULL, - ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, VLC_TRUE ); + ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, true ); add_float( ENC_CFG_PREFIX "lumi-masking", 0.0, NULL, - ENC_LUMI_MASKING_TEXT, ENC_LUMI_MASKING_LONGTEXT, VLC_TRUE ); + ENC_LUMI_MASKING_TEXT, ENC_LUMI_MASKING_LONGTEXT, true ); add_float( ENC_CFG_PREFIX "dark-masking", 0.0, NULL, - ENC_DARK_MASKING_TEXT, ENC_DARK_MASKING_LONGTEXT, VLC_TRUE ); + ENC_DARK_MASKING_TEXT, ENC_DARK_MASKING_LONGTEXT, true ); add_float( ENC_CFG_PREFIX "p-masking", 0.0, NULL, - ENC_P_MASKING_TEXT, ENC_P_MASKING_LONGTEXT, VLC_TRUE ); + ENC_P_MASKING_TEXT, ENC_P_MASKING_LONGTEXT, true ); add_float( ENC_CFG_PREFIX "border-masking", 0.0, NULL, - ENC_BORDER_MASKING_TEXT, ENC_BORDER_MASKING_LONGTEXT, VLC_TRUE ); + ENC_BORDER_MASKING_TEXT, ENC_BORDER_MASKING_LONGTEXT, true ); add_integer( ENC_CFG_PREFIX "luma-elim-threshold", 0, NULL, - ENC_LUMA_ELIM_TEXT, ENC_LUMA_ELIM_LONGTEXT, VLC_TRUE ); + ENC_LUMA_ELIM_TEXT, ENC_LUMA_ELIM_LONGTEXT, true ); add_integer( ENC_CFG_PREFIX "chroma-elim-threshold", 0, NULL, - ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, VLC_TRUE ); + ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, true ); + +#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4) + /* Audio AAC encoder profile */ + add_string( ENC_CFG_PREFIX "aac-profile", "main", NULL, + ENC_PROFILE_TEXT, ENC_PROFILE_LONGTEXT, true ); +#endif + +#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) || defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_TREE) -#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE) /* demux submodule */ add_submodule(); set_description( _("FFmpeg demuxer" ) ); - set_capability( "demux2", 2 ); + set_capability( "demux", 2 ); set_callbacks( E_(OpenDemux), E_(CloseDemux) ); /* mux submodule */ @@ -210,11 +217,11 @@ vlc_module_begin(); set_description( _("FFmpeg muxer" ) ); set_capability( "sout mux", 2 ); add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT, - MUX_LONGTEXT, VLC_TRUE ); + MUX_LONGTEXT, true ); set_callbacks( E_(OpenMux), E_(CloseMux) ); #endif -#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE) +#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE) /* video filter submodule */ add_submodule(); set_description( _("Video scaling filter") ); @@ -222,7 +229,7 @@ vlc_module_begin(); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VFILTER ); set_callbacks( E_(OpenScaler), E_(CloseScaler) ); - add_integer( "swscale-mode", 0, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, VLC_TRUE ); + add_integer( "swscale-mode", 0, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, true ); change_integer_list( pi_mode_values, ppsz_mode_descriptions, 0 ); #else @@ -323,7 +330,7 @@ static int OpenDecoder( vlc_object_t *p_this ) p_context->dsp_mask |= FF_MM_SSE2; } - p_dec->b_need_packetized = VLC_TRUE; + p_dec->b_need_packetized = true; switch( i_cat ) { case VIDEO_ES: @@ -493,10 +500,14 @@ static struct /* Packed RGB formats */ #if defined(WORDS_BIGENDIAN) + { VLC_FOURCC('R','G','B','8'), PIX_FMT_BGR8 }, { VLC_FOURCC('R','V','1','5'), PIX_FMT_BGR555 }, { VLC_FOURCC('R','V','1','6'), PIX_FMT_BGR565 }, { VLC_FOURCC('R','V','2','4'), PIX_FMT_BGR24 }, #else +#if defined(PIX_FMT_RGB8) + { VLC_FOURCC('R','G','B','8'), PIX_FMT_RGB8 }, +#endif { 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 }, @@ -577,6 +588,8 @@ static struct VIDEO_ES, "Sony HDV (MPEG-2 Video)" }, { VLC_FOURCC('h','d','v','3'), CODEC_ID_MPEG2VIDEO, VIDEO_ES, "FCP HDV (MPEG-2 Video)" }, + { VLC_FOURCC('h','d','v','5'), CODEC_ID_MPEG2VIDEO, + VIDEO_ES, "HDV 720p25 (MPEG-2 Video)" }, { VLC_FOURCC('m','x','5','n'), CODEC_ID_MPEG2VIDEO, VIDEO_ES, "MPEG2 IMX NTSC 525/60 50mb/s (FCP)" }, { VLC_FOURCC('m','x','5','p'), CODEC_ID_MPEG2VIDEO, @@ -1313,6 +1326,8 @@ static struct /* MUSEPACK8 Audio */ { VLC_FOURCC('M','P','C','K'), CODEC_ID_MUSEPACK8, AUDIO_ES, "MUSEPACK8 Audio" }, + { VLC_FOURCC('M','P','C','8'), CODEC_ID_MUSEPACK8, + AUDIO_ES, "MUSEPACK8 Audio" }, #endif /* RealAudio 1.0 */ @@ -1351,6 +1366,10 @@ static struct { VLC_FOURCC('m','p','4','a'), CODEC_ID_AAC, AUDIO_ES, "MPEG AAC Audio" }, + /* AC-3 Audio (Dolby Digital) */ + { VLC_FOURCC('a','c','-','3'), CODEC_ID_AC3, + AUDIO_ES, "AC-3 Audio (Dolby Digital)" }, + /* 4X Technologies */ { VLC_FOURCC('4','x','m','a'), CODEC_ID_ADPCM_4XM, AUDIO_ES, "4X Technologies Audio" }, @@ -1523,10 +1542,10 @@ int E_(GetFfmpegCodec)( vlc_fourcc_t i_fourcc, int *pi_cat, if( pi_ffmpeg_codec ) *pi_ffmpeg_codec = codecs_table[i].i_codec; if( ppsz_name ) *ppsz_name = (char *)codecs_table[i].psz_name; - return VLC_TRUE; + return true; } } - return VLC_FALSE; + return false; } int E_(GetVlcFourcc)( int i_ffmpeg_codec, int *pi_cat, @@ -1542,8 +1561,8 @@ int E_(GetVlcFourcc)( int i_ffmpeg_codec, int *pi_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 true; } } - return VLC_FALSE; + return false; }