From bb28e7f70dd77d13ea82aca73227f422af80ec7b Mon Sep 17 00:00:00 2001 From: Kieran Kunhya Date: Wed, 3 Jun 2020 18:21:28 +0100 Subject: [PATCH] avcodec: remove FLAG2_FAST mode It's 2020. --- fftools/ffplay.c | 5 - libavcodec/avcodec.h | 4 - libavcodec/h264_slice.c | 6 - libavcodec/mpeg12dec.c | 273 ------------------------------------- libavcodec/options_table.h | 1 - tools/target_dec_fuzzer.c | 2 - 6 files changed, 291 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index d673b8049a..1ba4e9fceb 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -331,7 +331,6 @@ static int show_status = -1; static int av_sync_type = AV_SYNC_AUDIO_MASTER; static int64_t start_time = AV_NOPTS_VALUE; static int64_t duration = AV_NOPTS_VALUE; -static int fast = 0; static int genpts = 0; static int lowres = 0; static int decoder_reorder_pts = -1; @@ -2623,9 +2622,6 @@ static int stream_component_open(VideoState *is, int stream_index) } avctx->lowres = stream_lowres; - if (fast) - avctx->flags2 |= AV_CODEC_FLAG2_FAST; - opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], codec); if (!av_dict_get(opts, "threads", NULL, 0)) av_dict_set(&opts, "threads", "auto", 0); @@ -3602,7 +3598,6 @@ static const OptionDef options[] = { { "f", HAS_ARG, { .func_arg = opt_format }, "force format", "fmt" }, { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { .func_arg = opt_frame_pix_fmt }, "set pixel format", "format" }, { "stats", OPT_BOOL | OPT_EXPERT, { &show_status }, "show status", "" }, - { "fast", OPT_BOOL | OPT_EXPERT, { &fast }, "non spec compliant optimizations", "" }, { "genpts", OPT_BOOL | OPT_EXPERT, { &genpts }, "generate pts", "" }, { "drp", OPT_INT | HAS_ARG | OPT_EXPERT, { &decoder_reorder_pts }, "let decoder reorder pts 0=off 1=on -1=auto", ""}, { "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, { &lowres }, "", "" }, diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c91b2fd169..f5a91ba59a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -342,10 +342,6 @@ typedef struct RcOverride{ #define AV_CODEC_FLAG_INTERLACED_ME (1 << 29) #define AV_CODEC_FLAG_CLOSED_GOP (1U << 31) -/** - * Allow non spec compliant speedup tricks. - */ -#define AV_CODEC_FLAG2_FAST (1 << 0) /** * Skip bitstream encoding. */ diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 713953778a..6a7cfa8563 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1990,13 +1990,7 @@ static int h264_slice_init(H264Context *h, H264SliceContext *sl, sl->deblocking_filter = 0; if (sl->deblocking_filter == 1 && h->nb_slice_ctx > 1) { - if (h->avctx->flags2 & AV_CODEC_FLAG2_FAST) { - /* Cheat slightly for speed: - * Do not bother to deblock across slices. */ - sl->deblocking_filter = 2; - } else { h->postpone_filter = 1; - } } sl->qp_thresh = 15 - FFMIN(sl->slice_alpha_c0_offset, sl->slice_beta_offset) - diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 40d054def5..bc9b74c3f0 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -220,96 +220,6 @@ end: return 0; } -/** - * Note: this function can read out of range and crash for corrupt streams. - * Changing this would eat up any speed benefits it has. - * Do not use "fast" flag if you need the code to be robust. - */ -static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, - int16_t *block, int n) -{ - int level, i, j, run; - RLTable *rl = &ff_rl_mpeg1; - uint8_t *const scantable = s->intra_scantable.permutated; - const int qscale = s->qscale; - - { - OPEN_READER(re, &s->gb); - i = -1; - // Special case for first coefficient, no need to add second VLC table. - UPDATE_CACHE(re, &s->gb); - if (((int32_t) GET_CACHE(re, &s->gb)) < 0) { - level = (3 * qscale) >> 1; - level = (level - 1) | 1; - if (GET_CACHE(re, &s->gb) & 0x40000000) - level = -level; - block[0] = level; - i++; - SKIP_BITS(re, &s->gb, 2); - if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) - goto end; - } - - /* now quantify & encode AC coefficients */ - for (;;) { - GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], - TEX_VLC_BITS, 2, 0); - - if (level != 0) { - i += run; - if (i > MAX_INDEX) - break; - j = scantable[i]; - level = ((level * 2 + 1) * qscale) >> 1; - level = (level - 1) | 1; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - - SHOW_SBITS(re, &s->gb, 1); - SKIP_BITS(re, &s->gb, 1); - } else { - /* escape */ - run = SHOW_UBITS(re, &s->gb, 6) + 1; - LAST_SKIP_BITS(re, &s->gb, 6); - UPDATE_CACHE(re, &s->gb); - level = SHOW_SBITS(re, &s->gb, 8); - SKIP_BITS(re, &s->gb, 8); - if (level == -128) { - level = SHOW_UBITS(re, &s->gb, 8) - 256; - SKIP_BITS(re, &s->gb, 8); - } else if (level == 0) { - level = SHOW_UBITS(re, &s->gb, 8); - SKIP_BITS(re, &s->gb, 8); - } - i += run; - if (i > MAX_INDEX) - break; - j = scantable[i]; - if (level < 0) { - level = -level; - level = ((level * 2 + 1) * qscale) >> 1; - level = (level - 1) | 1; - level = -level; - } else { - level = ((level * 2 + 1) * qscale) >> 1; - level = (level - 1) | 1; - } - } - - block[j] = level; - if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) - break; - UPDATE_CACHE(re, &s->gb); - } -end: - LAST_SKIP_BITS(re, &s->gb, 2); - CLOSE_READER(re, &s->gb); - } - - check_scantable_index(s, i); - - s->block_last_index[n] = i; - return 0; -} - static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, int16_t *block, int n) { @@ -396,83 +306,6 @@ end: return 0; } -/** - * Note: this function can read out of range and crash for corrupt streams. - * Changing this would eat up any speed benefits it has. - * Do not use "fast" flag if you need the code to be robust. - */ -static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, - int16_t *block, int n) -{ - int level, i, j, run; - RLTable *rl = &ff_rl_mpeg1; - uint8_t *const scantable = s->intra_scantable.permutated; - const int qscale = s->qscale; - OPEN_READER(re, &s->gb); - i = -1; - - // special case for first coefficient, no need to add second VLC table - UPDATE_CACHE(re, &s->gb); - if (((int32_t) GET_CACHE(re, &s->gb)) < 0) { - level = (3 * qscale) >> 1; - if (GET_CACHE(re, &s->gb) & 0x40000000) - level = -level; - block[0] = level; - i++; - SKIP_BITS(re, &s->gb, 2); - if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF) - goto end; - } - - /* now quantify & encode AC coefficients */ - for (;;) { - GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); - - if (level != 0) { - i += run; - if (i > MAX_INDEX) - break; - j = scantable[i]; - level = ((level * 2 + 1) * qscale) >> 1; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - - SHOW_SBITS(re, &s->gb, 1); - SKIP_BITS(re, &s->gb, 1); - } else { - /* escape */ - run = SHOW_UBITS(re, &s->gb, 6) + 1; - LAST_SKIP_BITS(re, &s->gb, 6); - UPDATE_CACHE(re, &s->gb); - level = SHOW_SBITS(re, &s->gb, 12); - SKIP_BITS(re, &s->gb, 12); - - i += run; - if (i > MAX_INDEX) - break; - j = scantable[i]; - if (level < 0) { - level = ((-level * 2 + 1) * qscale) >> 1; - level = -level; - } else { - level = ((level * 2 + 1) * qscale) >> 1; - } - } - - block[j] = level; - if (((int32_t) GET_CACHE(re, &s->gb)) <= (int32_t) 0xBFFFFFFF || i > 63) - break; - - UPDATE_CACHE(re, &s->gb); - } -end: - LAST_SKIP_BITS(re, &s->gb, 2); - CLOSE_READER(re, &s->gb); - - check_scantable_index(s, i); - - s->block_last_index[n] = i; - return 0; -} - static inline int mpeg2_decode_block_intra(MpegEncContext *s, int16_t *block, int n) { @@ -558,87 +391,6 @@ static inline int mpeg2_decode_block_intra(MpegEncContext *s, return 0; } -/** - * Note: this function can read out of range and crash for corrupt streams. - * Changing this would eat up any speed benefits it has. - * Do not use "fast" flag if you need the code to be robust. - */ -static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, - int16_t *block, int n) -{ - int level, dc, diff, i, j, run; - int component; - RLTable *rl; - uint8_t *const scantable = s->intra_scantable.permutated; - const uint16_t *quant_matrix; - const int qscale = s->qscale; - - /* DC coefficient */ - if (n < 4) { - quant_matrix = s->intra_matrix; - component = 0; - } else { - quant_matrix = s->chroma_intra_matrix; - component = (n & 1) + 1; - } - diff = decode_dc(&s->gb, component); - if (diff >= 0xffff) - return AVERROR_INVALIDDATA; - dc = s->last_dc[component]; - dc += diff; - s->last_dc[component] = dc; - block[0] = dc * (1 << (3 - s->intra_dc_precision)); - i = 0; - if (s->intra_vlc_format) - rl = &ff_rl_mpeg2; - else - rl = &ff_rl_mpeg1; - - { - OPEN_READER(re, &s->gb); - /* now quantify & encode AC coefficients */ - for (;;) { - UPDATE_CACHE(re, &s->gb); - GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], - TEX_VLC_BITS, 2, 0); - - if (level >= 64 || i > 63) { - break; - } else if (level != 0) { - i += run; - j = scantable[i]; - level = (level * qscale * quant_matrix[j]) >> 4; - level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - - SHOW_SBITS(re, &s->gb, 1); - LAST_SKIP_BITS(re, &s->gb, 1); - } else { - /* escape */ - run = SHOW_UBITS(re, &s->gb, 6) + 1; - LAST_SKIP_BITS(re, &s->gb, 6); - UPDATE_CACHE(re, &s->gb); - level = SHOW_SBITS(re, &s->gb, 12); - SKIP_BITS(re, &s->gb, 12); - i += run; - j = scantable[i]; - if (level < 0) { - level = (-level * qscale * quant_matrix[j]) >> 4; - level = -level; - } else { - level = (level * qscale * quant_matrix[j]) >> 4; - } - } - - block[j] = level; - } - CLOSE_READER(re, &s->gb); - } - - check_scantable_index(s, i); - - s->block_last_index[n] = i; - return 0; -} - /******************************************/ /* decoding */ @@ -769,14 +521,9 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) ff_xvmc_pack_pblocks(s, -1); // inter are always full blocks if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { - if (s->avctx->flags2 & AV_CODEC_FLAG2_FAST) { - for (i = 0; i < 6; i++) - mpeg2_fast_decode_block_intra(s, *s->pblocks[i], i); - } else { for (i = 0; i < mb_block_count; i++) if ((ret = mpeg2_decode_block_intra(s, *s->pblocks[i], i)) < 0) return ret; - } } else { for (i = 0; i < 6; i++) { ret = ff_mpeg1_decode_block_intra(&s->gb, @@ -1000,15 +747,6 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) ff_xvmc_pack_pblocks(s, cbp); if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { - if (s->avctx->flags2 & AV_CODEC_FLAG2_FAST) { - for (i = 0; i < 6; i++) { - if (cbp & 32) - mpeg2_fast_decode_block_non_intra(s, *s->pblocks[i], i); - else - s->block_last_index[i] = -1; - cbp += cbp; - } - } else { cbp <<= 12 - mb_block_count; for (i = 0; i < mb_block_count; i++) { @@ -1020,17 +758,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) } cbp += cbp; } - } } else { - if (s->avctx->flags2 & AV_CODEC_FLAG2_FAST) { - for (i = 0; i < 6; i++) { - if (cbp & 32) - mpeg1_fast_decode_block_inter(s, *s->pblocks[i], i); - else - s->block_last_index[i] = -1; - cbp += cbp; - } - } else { for (i = 0; i < 6; i++) { if (cbp & 32) { if ((ret = mpeg1_decode_block_inter(s, *s->pblocks[i], i)) < 0) @@ -1040,7 +768,6 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) } cbp += cbp; } - } } } else { for (i = 0; i < 12; i++) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 8ba137f51e..c71da55d65 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -70,7 +70,6 @@ static const AVOption avcodec_options[] = { {"output_corrupt", "Output even potentially corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_OUTPUT_CORRUPT }, INT_MIN, INT_MAX, V|D, "flags"}, {"drop_changed", "Drop frames whose parameters differ from first decoded frame", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_DROPCHANGED }, INT_MIN, INT_MAX, A|V|D, "flags"}, {"flags2", NULL, OFFSET(flags2), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT}, 0, UINT_MAX, V|A|E|D|S, "flags2"}, -{"fast", "allow non-spec-compliant speedup tricks", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_FAST }, INT_MIN, INT_MAX, V|E, "flags2"}, {"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, "flags2"}, {"ignorecrop", "ignore cropping information from sps", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_IGNORE_CROP }, INT_MIN, INT_MAX, V|D, "flags2"}, {"local_header", "place global headers at every keyframe instead of in extradata", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_LOCAL_HEADER }, INT_MIN, INT_MAX, V|E, "flags2"}, diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index d01deaf8d5..c9a755cf69 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -208,8 +208,6 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (flags & 8) ctx->err_recognition |= AV_EF_EXPLODE; } - if ((flags & 0x10) && c->id != AV_CODEC_ID_H264) - ctx->flags2 |= AV_CODEC_FLAG2_FAST; if (flags & 0x40) av_force_cpu_flags(0); -- 2.17.1