diff mbox series

[FFmpeg-devel,2/2] lavc/vulkan_av1: Use av1dec reference order hint information

Message ID b1314082-5d32-4ffd-84f8-bbb82e86713a@jkqxz.net
State New
Headers show
Series [FFmpeg-devel,1/2] lavc/av1: Record reference ordering information for each frame | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/configure_x86 warning Failed to apply patch

Commit Message

Mark Thompson April 7, 2024, 1:54 p.m. UTC 
---
  libavcodec/vulkan_av1.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c
index c9e398eaec..8cca97c005 100644
--- a/libavcodec/vulkan_av1.c
+++ b/libavcodec/vulkan_av1.c
@@ -242,7 +242,6 @@  static int vk_av1_start_frame(AVCodecContext          *avctx,

      const AV1RawFrameHeader *frame_header = s->raw_frame_header;
      const AV1RawFilmGrainParams *film_grain = &s->cur_frame.film_grain;
-    CodedBitstreamAV1Context *cbs_ctx = (CodedBitstreamAV1Context *)(s->cbc->priv_data);

      const int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) &&
                              film_grain->apply_grain;
@@ -272,7 +271,7 @@  static int vk_av1_start_frame(AVCodecContext          *avctx,

      ap->ref_frame_sign_bias_mask = 0x0;
      for (int i = 0; i < STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME; i++)
-        ap->ref_frame_sign_bias_mask |= cbs_ctx->ref_frame_sign_bias[i] << i;
+        ap->ref_frame_sign_bias_mask |= pic->ref_frame_sign_bias[i] << i;

      for (int i = 0; i < STD_VIDEO_AV1_REFS_PER_FRAME; i++) {
          const int idx = pic->raw_frame_header->ref_frame_idx[i];
@@ -294,7 +293,7 @@  static int vk_av1_start_frame(AVCodecContext          *avctx,

          err = vk_av1_fill_pict(avctx, &ap->ref_src[ref_count], &vp->ref_slots[ref_count],
                                 &vp->refs[ref_count], &ap->std_refs[ref_count], &ap->vkav1_refs[ref_count],
-                               ref_frame, 0, 0, cbs_ctx->ref[idx].saved_order_hints);
+                               ref_frame, 0, 0, ref_frame->saved_order_hints);
          if (err < 0)
              return err;