[FFmpeg-cvslog] avcodec/cbs_h265: rename H265RawPSExtensionData to H265RawExtensionData

James Almer git at videolan.org
Mon May 4 01:56:28 EEST 2020


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Apr 20 15:33:18 2020 -0300| [bdfc1d3cd33079b44dcb1f2ba02bfc69b811a3ca] | committer: James Almer

avcodec/cbs_h265: rename H265RawPSExtensionData to H265RawExtensionData

So that NAL types other than Parameter Set ones may use it.

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdfc1d3cd33079b44dcb1f2ba02bfc69b811a3ca
---

 libavcodec/cbs_h265.h                 | 10 +++++-----
 libavcodec/cbs_h265_syntax_template.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h
index ad746bf35f..2c1e153ad9 100644
--- a/libavcodec/cbs_h265.h
+++ b/libavcodec/cbs_h265.h
@@ -182,11 +182,11 @@ typedef struct H265RawVUI {
     uint8_t log2_max_mv_length_vertical;
 } H265RawVUI;
 
-typedef struct H265RawPSExtensionData {
+typedef struct H265RawExtensionData {
     uint8_t *data;
     size_t bit_length;
     AVBufferRef *data_ref;
-} H265RawPSExtensionData;
+} H265RawExtensionData;
 
 typedef struct H265RawVPS {
     H265RawNALUnitHeader nal_unit_header;
@@ -221,7 +221,7 @@ typedef struct H265RawVPS {
     H265RawHRDParameters hrd_parameters[HEVC_MAX_LAYER_SETS];
 
     uint8_t vps_extension_flag;
-    H265RawPSExtensionData extension_data;
+    H265RawExtensionData extension_data;
 } H265RawVPS;
 
 typedef struct H265RawSTRefPicSet {
@@ -325,7 +325,7 @@ typedef struct H265RawSPS {
     uint8_t sps_scc_extension_flag;
     uint8_t sps_extension_4bits;
 
-    H265RawPSExtensionData extension_data;
+    H265RawExtensionData extension_data;
 
     // Range extension.
     uint8_t transform_skip_rotation_enabled_flag;
@@ -413,7 +413,7 @@ typedef struct H265RawPPS {
     uint8_t pps_scc_extension_flag;
     uint8_t pps_extension_4bits;
 
-    H265RawPSExtensionData extension_data;
+    H265RawExtensionData extension_data;
 
     // Range extension.
     uint8_t log2_max_transform_skip_block_size_minus2;
diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c
index 0696eeeb9e..a51b12cfc6 100644
--- a/libavcodec/cbs_h265_syntax_template.c
+++ b/libavcodec/cbs_h265_syntax_template.c
@@ -59,7 +59,7 @@ static int FUNC(byte_alignment)(CodedBitstreamContext *ctx, RWContext *rw)
 }
 
 static int FUNC(extension_data)(CodedBitstreamContext *ctx, RWContext *rw,
-                                H265RawPSExtensionData *current)
+                                H265RawExtensionData *current)
 {
     int err;
     size_t k;



More information about the ffmpeg-cvslog mailing list