From 3ff54622533627493643c8e4a5e982fc99a7df47 Mon Sep 17 00:00:00 2001 From: Lynne Date: Wed, 22 Feb 2023 22:30:36 +0100 Subject: [PATCH 21/92] av1dec: expose ref_order_hint Commit by Dave Airlie --- libavcodec/av1dec.c | 9 +++++++++ libavcodec/av1dec.h | 1 + 2 files changed, 10 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index a80e37e33f..5a3c51e94a 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -591,6 +591,8 @@ static void av1_frame_unref(AVCodecContext *avctx, AV1Frame *f) f->spatial_id = f->temporal_id = 0; memset(f->skip_mode_frame_idx, 0, 2 * sizeof(uint8_t)); + memset(f->ref_order_hint, 0, + 7 * sizeof(uint8_t)); memset(&f->film_grain, 0, sizeof(f->film_grain)); f->coded_lossless = 0; } @@ -633,6 +635,9 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s memcpy(dst->skip_mode_frame_idx, src->skip_mode_frame_idx, 2 * sizeof(uint8_t)); + memcpy(dst->ref_order_hint, + src->ref_order_hint, + 7 * sizeof(uint8_t)); memcpy(&dst->film_grain, &src->film_grain, sizeof(dst->film_grain)); @@ -1267,6 +1272,10 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, s->cur_frame.spatial_id = header->spatial_id; s->cur_frame.temporal_id = header->temporal_id; + for (int i = 0; i < 7; i++) + s->cur_frame.ref_order_hint[i] = + s->raw_frame_header->ref_order_hint[s->raw_frame_header->ref_frame_idx[i]]; + if (avctx->hwaccel && s->cur_frame.f->buf[0]) { ret = avctx->hwaccel->start_frame(avctx, unit->data, unit->data_size); diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h index cef899f81f..2be28e7469 100644 --- a/libavcodec/av1dec.h +++ b/libavcodec/av1dec.h @@ -48,6 +48,7 @@ typedef struct AV1Frame { int32_t gm_params[AV1_NUM_REF_FRAMES][6]; uint8_t skip_mode_frame_idx[2]; + uint8_t ref_order_hint[7]; AV1RawFilmGrainParams film_grain; -- 2.39.2