avcodec/h264dec: Support skipping frames that used gray gap frames

Michael Niedermayer committed 3 years ago

Commit e56d91f1 parent 6364fa92 files · +8 −0Browse files

Unified · Split

2 files

          (h->avctx->flags2 & AV_CODEC_FLAG2_SHOW_ALL) ||
          out->recovered)) {
+        if (h->skip_gray > 0 &&
+            h->non_gray && out->gray &&
+            !(h->avctx->flags2 & AV_CODEC_FLAG2_SHOW_ALL)
+        )
+            return 0;
         if (!h->avctx->hwaccel &&
             (out->field_poc[0] == INT_MAX ||
              out->field_poc[1] == INT_MAX)
     { "nal_length_size", "nal_length_size", OFFSET(nal_length_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 4, VDX },
     { "enable_er", "Enable error resilience on damaged frames (unsafe)", OFFSET(enable_er), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD },
     { "x264_build", "Assume this x264 version if no x264 version found in any SEI", OFFSET(x264_build), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VD },
+    { "skip_gray", "Do not return gray gap frames", OFFSET(skip_gray), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, VD },
     { "noref_gray", "Avoid using gray gap frames as references", OFFSET(noref_gray), AV_OPT_TYPE_INT, {.i64 = 1}, -1, 1, VD },
     { NULL },
 };

@@ -572,6 +572,7 @@ typedef struct H264Context { · 571 unmodified lines
572		572
573	int non_gray; ///< Did we encounter a intra frame after a gray gap frame	573	int non_gray; ///< Did we encounter a intra frame after a gray gap frame
574	int noref_gray;	574	int noref_gray;
		575	int skip_gray;
575	} H264Context;	576	} H264Context;
576		577
577	extern const uint16_t ff_h264_mb_sizes[4];	578	extern const uint16_t ff_h264_mb_sizes[4];

Keyboard shortcuts