[vlc-commits] packetizer: hevc_nal: extract reorder depth

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Oct  2 13:56:34 2017 +0200| [a3c984ac64111e30e652a05a264a11124f9bd720] | committer: Francois Cartegnie

packetizer: hevc_nal: extract reorder depth

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

 modules/packetizer/hevc_nal.c | 11 ++++++++---
 modules/packetizer/hevc_nal.h |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/packetizer/hevc_nal.c b/modules/packetizer/hevc_nal.c
index 1cd76c1257..944412a1ed 100644
--- a/modules/packetizer/hevc_nal.c
+++ b/modules/packetizer/hevc_nal.c
@@ -644,9 +644,9 @@ static bool hevc_parse_video_parameter_set_rbsp( bs_t *p_bs,
                       0 : p_vps->vps_max_sub_layers_minus1);
          i<= p_vps->vps_max_sub_layers_minus1; i++ )
     {
-        (void) bs_read_ue( p_bs ); //nal_ue_t dec_pic_buffering_minus1;
-        (void) bs_read_ue( p_bs ); //nal_ue_t num_reorder_pics;
-        (void) bs_read_ue( p_bs ); //nal_ue_t max_latency_increase_plus1;
+        p_vps->vps_max[i].dec_pic_buffering_minus1 = bs_read_ue( p_bs );
+        p_vps->vps_max[i].num_reorder_pics = bs_read_ue( p_bs );
+        p_vps->vps_max[i].max_latency_increase_plus1 = bs_read_ue( p_bs );
     }
     if( bs_remain( p_bs ) < 10 )
         return false;
@@ -1043,6 +1043,11 @@ bool hevc_get_picture_size( const hevc_sequence_parameter_set_t *p_sps,
     return true;
 }
 
+uint8_t hevc_get_max_num_reorder( const hevc_video_parameter_set_t *p_vps )
+{
+    return p_vps->vps_max[0/* base layer */].num_reorder_pics;
+}
+
 static inline uint8_t vlc_ceil_log2( uint32_t val )
 {
     uint8_t n = 31 - clz(val);
diff --git a/modules/packetizer/hevc_nal.h b/modules/packetizer/hevc_nal.h
index 9035c64f80..b0c91c0682 100644
--- a/modules/packetizer/hevc_nal.h
+++ b/modules/packetizer/hevc_nal.h
@@ -192,6 +192,7 @@ bool hevc_get_colorimetry( const hevc_sequence_parameter_set_t *p_sps,
                            video_transfer_func_t *p_transfer,
                            video_color_space_t *p_colorspace,
                            bool *p_full_range );
+uint8_t hevc_get_max_num_reorder( const hevc_video_parameter_set_t *p_vps );
 bool hevc_get_slice_type( const hevc_slice_segment_header_t *, enum hevc_slice_type_e * );
 
 /* Get level and Profile from DecoderConfigurationRecord */