1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

avcodec/hevc_ps: extract SPS fields required for hvcC construction

Signed-off-by: Aman Gupta <aman@tmm1.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Aman Gupta 2017-09-26 18:04:12 -07:00
parent 0351b8e358
commit c32077c0ee
2 changed files with 4 additions and 1 deletions

View File

@ -893,7 +893,7 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
skip_bits1(gb); // temporal_id_nesting_flag sps->temporal_id_nesting_flag = get_bits(gb, 1);
if ((ret = parse_ptl(gb, avctx, &sps->ptl, sps->max_sub_layers)) < 0) if ((ret = parse_ptl(gb, avctx, &sps->ptl, sps->max_sub_layers)) < 0)
return ret; return ret;
@ -956,6 +956,7 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id,
sps->bit_depth, bit_depth_chroma); sps->bit_depth, bit_depth_chroma);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
sps->bit_depth_chroma = bit_depth_chroma;
ret = map_pixel_format(avctx, sps); ret = map_pixel_format(avctx, sps);
if (ret < 0) if (ret < 0)

View File

@ -232,6 +232,7 @@ typedef struct HEVCSPS {
HEVCWindow pic_conf_win; HEVCWindow pic_conf_win;
int bit_depth; int bit_depth;
int bit_depth_chroma;
int pixel_shift; int pixel_shift;
enum AVPixelFormat pix_fmt; enum AVPixelFormat pix_fmt;
@ -244,6 +245,7 @@ typedef struct HEVCSPS {
int num_reorder_pics; int num_reorder_pics;
int max_latency_increase; int max_latency_increase;
} temporal_layer[HEVC_MAX_SUB_LAYERS]; } temporal_layer[HEVC_MAX_SUB_LAYERS];
uint8_t temporal_id_nesting_flag;
VUI vui; VUI vui;
PTL ptl; PTL ptl;