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

lavc/hevc_refs: fix dpb logical for IRAP

Browse Source 
According to C.5.2.2, item 2. When we got an IRAP, and the
NoOutputOfPriorPicsFlag = 0, we need bump all outputable frames.

Tested-by: Fei Wang <fei.w.wang@intel.com>
Signed-off-by: Xu Guangxin <guangxin.xu@intel.com>
This commit is contained in:
Xu Guangxin
2022-07-15 13:06:41 +08:00
committed by Haihao Xiang
parent 3b923116e5
commit 6c12fe0dda
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/hevc_refs.c
View File

@@ -175,21 +175,24 @@ int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc)
int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush) int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
{ {
if (IS_IRAP(s) && s->no_rasl_output_flag == 1) {
const static int mask = HEVC_FRAME_FLAG_BUMPING | HEVC_FRAME_FLAG_OUTPUT;
for (int i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
HEVCFrame *frame = &s->DPB[i];
if ((frame->flags & mask) == HEVC_FRAME_FLAG_OUTPUT &&
frame->sequence != s->seq_decode) {
if (s->sh.no_output_of_prior_pics_flag == 1)
ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
else
frame->flags |= HEVC_FRAME_FLAG_BUMPING;
}
}
}
do { do {
int nb_output = 0; int nb_output = 0;
int min_poc = INT_MAX; int min_poc = INT_MAX;
int i, min_idx, ret; int i, min_idx, ret;
if (s->sh.no_output_of_prior_pics_flag == 1 && s->no_rasl_output_flag == 1) {
for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
HEVCFrame *frame = &s->DPB[i];
if (!(frame->flags & HEVC_FRAME_FLAG_BUMPING) && frame->poc != s->poc &&
frame->sequence == s->seq_output) {
ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
}
}
}
for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
HEVCFrame *frame = &s->DPB[i]; HEVCFrame *frame = &s->DPB[i];
if ((frame->flags & HEVC_FRAME_FLAG_OUTPUT) && if ((frame->flags & HEVC_FRAME_FLAG_OUTPUT) &&