virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

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

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-10-17 19:32:34 +02:00
parent 6364fa9e9a
commit e56d91f8a8
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264dec.c
View File

@ -939,6 +939,12 @@ static int finalize_frame(H264Context *h, AVFrame *dst, H264Picture *out, int *g
(h->avctx->flags2 & AV_CODEC_FLAG2_SHOW_ALL) || (h->avctx->flags2 & AV_CODEC_FLAG2_SHOW_ALL) ||
out->recovered)) { 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 && if (!h->avctx->hwaccel &&
(out->field_poc[0] == INT_MAX || (out->field_poc[0] == INT_MAX ||
out->field_poc[1] == INT_MAX) out->field_poc[1] == INT_MAX)
@ -1091,6 +1097,7 @@ static const AVOption h264_options[] = {
{ "nal_length_size", "nal_length_size", OFFSET(nal_length_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 4, VDX }, { "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 }, { "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 }, { "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 }, { "noref_gray", "Avoid using gray gap frames as references", OFFSET(noref_gray), AV_OPT_TYPE_INT, {.i64 = 1}, -1, 1, VD },
{ NULL }, { NULL },
}; };

1
libavcodec/h264dec.h
View File

@ -572,6 +572,7 @@ typedef struct H264Context {
int non_gray; ///< Did we encounter a intra frame after a gray gap frame int non_gray; ///< Did we encounter a intra frame after a gray gap frame
int noref_gray; int noref_gray;
int skip_gray;
} H264Context; } H264Context;
extern const uint16_t ff_h264_mb_sizes[4]; extern const uint16_t ff_h264_mb_sizes[4];