LAV
/
FFmpeg
1
0
Fork 0
Code

avcodec/h264: Avoid using gray gap frames as references 

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

11
libavcodec/h264_refs.c
View File

@ -410,6 +410,17 @@ int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl)
else
return -1;
}
if (h->noref_gray>0 && sl->ref_list[list][index].parent->gray && h->non_gray) {
for (int j=0; j<sl->list_count; j++) {
int list2 = (list+j)&1;
if (h->default_ref[list2].parent && !h->default_ref[list2].parent->gray
&& !(!FIELD_PICTURE(h) && (h->default_ref[list2].reference&3) != 3)) {
sl->ref_list[list][index] = h->default_ref[list2];
av_log(h, AV_LOG_DEBUG, "replacement of gray gap frame\n");
break;
}
}
}
av_assert0(av_buffer_get_ref_count(sl->ref_list[list][index].parent->f->buf[0]) > 0);
}
}

1
libavcodec/h264dec.c
View File

@ -1091,6 +1091,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 },
{ "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 },
{ "noref_gray", "Avoid using gray gap frames as references", OFFSET(noref_gray), AV_OPT_TYPE_INT, {.i64 = 1}, -1, 1, VD },
{ NULL },
};

1
libavcodec/h264dec.h
View File

@ -571,6 +571,7 @@ typedef struct H264Context {
int ref2frm[MAX_SLICES][2][64]; ///< reference to frame number lists, used in the loop filter, the first 2 are for -2,-1
int non_gray; ///< Did we encounter a intra frame after a gray gap frame
int noref_gray;
} H264Context;
extern const uint16_t ff_h264_mb_sizes[4];