Commit ec7c51f4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

avcodec: remove deprecated motion vector visualization option

parent 81cdf729
......@@ -111,9 +111,8 @@ vlc_module_begin ()
add_integer( "avcodec-skip-idct", 0, SKIP_IDCT_TEXT,
SKIP_IDCT_LONGTEXT, true )
change_integer_range( -1, 4 )
add_obsolete_integer ( "ffmpeg-vismv" ) /* removed since 2.1.0 */
add_integer ( "avcodec-vismv", 0, VISMV_TEXT, VISMV_LONGTEXT,
true )
add_obsolete_integer( "ffmpeg-vismv" ) /* removed since 2.1.0 */
add_obsolete_integer( "avcodec-vismv" ) /* removed since 3.0.0 */
add_obsolete_integer ( "ffmpeg-lowres" ) /* removed since 2.1.0 */
add_obsolete_bool( "ffmpeg-fast" ) /* removed since 2.1.0 */
add_bool( "avcodec-fast", false, FAST_TEXT, FAST_LONGTEXT, false )
......
......@@ -111,16 +111,6 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
#define CODEC_TEXT N_( "Codec name" )
#define CODEC_LONGTEXT N_( "Internal libavcodec codec name" )
/* TODO: Use a predefined list, with 0,1,2,4,7 */
#define VISMV_TEXT N_( "Visualize motion vectors" )
#define VISMV_LONGTEXT N_( \
"You can overlay the motion vectors (arrows showing how the images move) "\
"on the image. This value is a mask, based on these values:\n"\
"1 - visualize forward predicted MVs of P frames\n" \
"2 - visualize forward predicted MVs of B frames\n" \
"4 - visualize backward predicted MVs of B frames\n" \
"To visualize all vectors, the value should be 7." )
#define SKIPLOOPF_TEXT N_( "Skip the loop filter for H.264 decoding" )
#define SKIPLOOPF_LONGTEXT N_( "Skipping the loop filter (aka deblocking) " \
"usually has a detrimental effect on quality. However it provides a big " \
......
......@@ -297,10 +297,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
p_context->flags |= CODEC_FLAG_OUTPUT_CORRUPT;
#endif
i_val = var_CreateGetInteger( p_dec, "avcodec-vismv" );
if( i_val )
p_context->debug_mv = i_val;
i_val = var_CreateGetInteger( p_dec, "avcodec-skiploopfilter" );
if( i_val >= 4 ) p_context->skip_loop_filter = AVDISCARD_ALL;
else if( i_val == 3 ) p_context->skip_loop_filter = AVDISCARD_NONKEY;
......@@ -338,8 +334,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
(p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
/* No idea why ... but this fixes flickering on some TSCC streams */
p_sys->i_codec_id != AV_CODEC_ID_TSCC && p_sys->i_codec_id != AV_CODEC_ID_CSCD &&
p_sys->i_codec_id != AV_CODEC_ID_CINEPAK &&
!p_context->debug_mv )
p_sys->i_codec_id != AV_CODEC_ID_CINEPAK )
{
/* Some codecs set pix_fmt only after the 1st frame has been decoded,
* so we need to do another check in ffmpeg_GetFrameBuf() */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment