har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc: deprecate FF_DEBUG_MV and remove all traces of its use

Browse Source 
It has not been actually used since
37045e422903695e610cca6ecb753df643ab9380, when the broken vismv code was
removed.
This commit is contained in:
Anton Khirnov 2013-10-27 11:19:52 +01:00
parent b6a4701612
commit ccc7129845
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
avconv.c
View File

@ -1745,9 +1745,6 @@ static int transcode_init(void)
av_log(NULL, AV_LOG_WARNING, "The bitrate parameter is set too low." av_log(NULL, AV_LOG_WARNING, "The bitrate parameter is set too low."
"It takes bits/s as argument, not kbits/s\n"); "It takes bits/s as argument, not kbits/s\n");
extra_size += ost->st->codec->extradata_size; extra_size += ost->st->codec->extradata_size;
if (ost->st->codec->me_threshold)
input_streams[ost->source_index]->st->codec->debug |= FF_DEBUG_MV;
} else { } else {
av_opt_set_dict(ost->st->codec, &ost->opts); av_opt_set_dict(ost->st->codec, &ost->opts);
} }

5
libavcodec/avcodec.h
View File

@ -2306,7 +2306,12 @@ typedef struct AVCodecContext {
#define FF_DEBUG_BITSTREAM 4 #define FF_DEBUG_BITSTREAM 4
#define FF_DEBUG_MB_TYPE 8 #define FF_DEBUG_MB_TYPE 8
#define FF_DEBUG_QP 16 #define FF_DEBUG_QP 16
#if FF_API_DEBUG_MV
/**
* @deprecated this option does nothing
*/
#define FF_DEBUG_MV 32 #define FF_DEBUG_MV 32
#endif
#define FF_DEBUG_DCT_COEFF 0x00000040 #define FF_DEBUG_DCT_COEFF 0x00000040
#define FF_DEBUG_SKIP 0x00000080 #define FF_DEBUG_SKIP 0x00000080
#define FF_DEBUG_STARTCODE 0x00000100 #define FF_DEBUG_STARTCODE 0x00000100

3
libavcodec/mpegvideo.c
View File

@ -321,8 +321,7 @@ static int alloc_picture_tables(MpegEncContext *s, Picture *pic)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if (s->out_format == FMT_H263 || s->encoding || if (s->out_format == FMT_H263 || s->encoding) {
(s->avctx->debug & FF_DEBUG_MV) || s->avctx->debug_mv) {
int mv_size = 2 * (b8_array_size + 4) * sizeof(int16_t); int mv_size = 2 * (b8_array_size + 4) * sizeof(int16_t);
int ref_index_size = 4 * mb_array_size; int ref_index_size = 4 * mb_array_size;

2
libavcodec/options_table.h
View File

@ -209,7 +209,9 @@ static const AVOption avcodec_options[] = {
{"bitstream", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BITSTREAM }, INT_MIN, INT_MAX, V|D, "debug"}, {"bitstream", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_BITSTREAM }, INT_MIN, INT_MAX, V|D, "debug"},
{"mb_type", "macroblock (MB) type", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"}, {"mb_type", "macroblock (MB) type", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MB_TYPE }, INT_MIN, INT_MAX, V|D, "debug"},
{"qp", "per-block quantization parameter (QP)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_QP }, INT_MIN, INT_MAX, V|D, "debug"}, {"qp", "per-block quantization parameter (QP)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_QP }, INT_MIN, INT_MAX, V|D, "debug"},
#if FF_API_DEBUG_MV
{"mv", "motion vector", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MV }, INT_MIN, INT_MAX, V|D, "debug"}, {"mv", "motion vector", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MV }, INT_MIN, INT_MAX, V|D, "debug"},
#endif
{"dct_coeff", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_DCT_COEFF }, INT_MIN, INT_MAX, V|D, "debug"}, {"dct_coeff", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_DCT_COEFF }, INT_MIN, INT_MAX, V|D, "debug"},
{"skip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_SKIP }, INT_MIN, INT_MAX, V|D, "debug"}, {"skip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_SKIP }, INT_MIN, INT_MAX, V|D, "debug"},
{"startcode", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_STARTCODE }, INT_MIN, INT_MAX, V|D, "debug"}, {"startcode", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_STARTCODE }, INT_MIN, INT_MAX, V|D, "debug"},

3
libavcodec/version.h
View File

@ -76,5 +76,8 @@
#ifndef FF_API_SET_DIMENSIONS #ifndef FF_API_SET_DIMENSIONS
#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_DEBUG_MV
#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */