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

avcodec/av1dec: update reference frame state on show_existing_frame

Browse Source 
As defined in Section 7.4

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2020-09-09 19:14:01 -03:00
parent b80c66bb6b
commit 9c6026bc72
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/av1dec.c
View File

@@ -580,15 +580,9 @@ static int set_output_frame(AVCodecContext *avctx, AVFrame *frame,
const AVPacket *pkt, int *got_frame) const AVPacket *pkt, int *got_frame)
{ {
AV1DecContext *s = avctx->priv_data; AV1DecContext *s = avctx->priv_data;
const AV1RawFrameHeader *header = s->raw_frame_header; const AVFrame *srcframe = s->cur_frame.tf.f;
const AVFrame *srcframe;
int ret; int ret;
if (header->show_existing_frame)
srcframe = s->ref[header->frame_to_show_map_idx].tf.f;
else
srcframe = s->cur_frame.tf.f;
ret = av_frame_ref(frame, srcframe); ret = av_frame_ref(frame, srcframe);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -733,6 +727,22 @@ static int av1_decode_frame(AVCodecContext *avctx, void *frame,
s->raw_frame_header = &obu->obu.frame_header; s->raw_frame_header = &obu->obu.frame_header;
if (s->raw_frame_header->show_existing_frame) { if (s->raw_frame_header->show_existing_frame) {
if (s->cur_frame.tf.f->buf[0])
av1_frame_unref(avctx, &s->cur_frame);
ret = av1_frame_ref(avctx, &s->cur_frame,
&s->ref[s->raw_frame_header->frame_to_show_map_idx]);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to get reference frame.\n");
goto end;
}
ret = update_reference_list(avctx);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to update reference list.\n");
goto end;
}
ret = set_output_frame(avctx, frame, pkt, got_frame); ret = set_output_frame(avctx, frame, pkt, got_frame);
if (ret < 0) if (ret < 0)
av_log(avctx, AV_LOG_ERROR, "Set output frame error.\n"); av_log(avctx, AV_LOG_ERROR, "Set output frame error.\n");