diff mbox series

[FFmpeg-devel] hevcdec: remove redundant bits_used_for_short_term_rps field

Message ID NXFN6wh--B-9@lynne.ee
State New
Headers show
Series [FFmpeg-devel] hevcdec: remove redundant bits_used_for_short_term_rps field | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Lynne June 6, 2023, 11:03 a.m. UTC 
It was introduced for Vulkan, but it is equivalent to
short_term_ref_pic_set_size when !short_term_ref_pic_set_sps_flag,
and when !!short_term_ref_pic_set_sps_flag, Vulkan hardcodes a zero
anyway.

3-line patch attached.

Comments

Philip Langdale June 7, 2023, 9:26 p.m. UTC | #1 
On Tue, 6 Jun 2023 13:03:43 +0200 (CEST)
Lynne <dev@lynne.ee> wrote:

> It was introduced for Vulkan, but it is equivalent to
> short_term_ref_pic_set_size when !short_term_ref_pic_set_sps_flag,
> and when !!short_term_ref_pic_set_sps_flag, Vulkan hardcodes a zero
> anyway.
> 
> 3-line patch attached.
> 

LGTM


--phil
Lynne June 7, 2023, 10:05 p.m. UTC | #2 
Jun 6, 2023, 13:03 by dev@lynne.ee:

> It was introduced for Vulkan, but it is equivalent to
> short_term_ref_pic_set_size when !short_term_ref_pic_set_sps_flag,
> and when !!short_term_ref_pic_set_sps_flag, Vulkan hardcodes a zero
> anyway.
>
> 3-line patch attached.
>

Pushed.
diff mbox series

Patch

From 67a4755b97de8fe0e22e25ff4714c76a5b570b44 Mon Sep 17 00:00:00 2001
From: Lynne <dev@lynne.ee>
Date: Tue, 6 Jun 2023 12:48:11 +0200
Subject: [PATCH] hevcdec: remove redundant bits_used_for_short_term_rps field

It was introduced for Vulkan, but it is equivalent to
short_term_ref_pic_set_size when !short_term_ref_pic_set_sps_flag,
and when !!short_term_ref_pic_set_sps_flag, Vulkan hardcodes a zero
anyway.
---
 libavcodec/hevcdec.c     | 1 -
 libavcodec/hevcdec.h     | 1 -
 libavcodec/vulkan_hevc.c | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index eee77ec4db..a4284921cb 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -723,7 +723,6 @@  static int hls_slice_header(HEVCContext *s)
                 if (ret < 0)
                     return ret;
 
-                sh->bits_used_for_short_term_rps = pos - get_bits_left(gb);
                 sh->short_term_rps = &sh->slice_rps;
             } else {
                 int numbits, rps_idx;
diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h
index 04ec25d540..94609e4699 100644
--- a/libavcodec/hevcdec.h
+++ b/libavcodec/hevcdec.h
@@ -268,7 +268,6 @@  typedef struct SliceHeader {
 
     ///< RPS coded in the slice header itself is stored here
     int short_term_ref_pic_set_sps_flag;
-    int bits_used_for_short_term_rps;
     int short_term_ref_pic_set_size;
     ShortTermRPS slice_rps;
     const ShortTermRPS *short_term_rps;
diff --git a/libavcodec/vulkan_hevc.c b/libavcodec/vulkan_hevc.c
index c9b6888410..dcf7e75bc5 100644
--- a/libavcodec/vulkan_hevc.c
+++ b/libavcodec/vulkan_hevc.c
@@ -788,7 +788,7 @@  static int vk_hevc_start_frame(AVCodecContext          *avctx,
         .NumDeltaPocsOfRefRpsIdx = h->sh.short_term_rps ? h->sh.short_term_rps->rps_idx_num_delta_pocs : 0,
         .PicOrderCntVal = h->poc,
         .NumBitsForSTRefPicSetInSlice = !h->sh.short_term_ref_pic_set_sps_flag ?
-                                         h->sh.bits_used_for_short_term_rps : 0,
+                                         h->sh.short_term_ref_pic_set_size : 0,
     };
 
     /* Fill in references */
-- 
2.40.1