har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/hevc: store VPS/SPS/PPS data

Browse Source
This commit is contained in:
Matthieu Bouron 2016-09-07 11:36:10 +02:00
parent 7055b28d98
commit bf011695fd
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/hevc.h
View File

@ -387,6 +387,9 @@ typedef struct HEVCVPS {
uint8_t vps_poc_proportional_to_timing_flag; uint8_t vps_poc_proportional_to_timing_flag;
int vps_num_ticks_poc_diff_one; ///< vps_num_ticks_poc_diff_one_minus1 + 1 int vps_num_ticks_poc_diff_one; ///< vps_num_ticks_poc_diff_one_minus1 + 1
int vps_num_hrd_parameters; int vps_num_hrd_parameters;
uint8_t data[4096];
int data_size;
} HEVCVPS; } HEVCVPS;
typedef struct ScalingList { typedef struct ScalingList {
@ -483,6 +486,9 @@ typedef struct HEVCSPS {
int vshift[3]; int vshift[3];
int qp_bd_offset; int qp_bd_offset;
uint8_t data[4096];
int data_size;
} HEVCSPS; } HEVCSPS;
typedef struct HEVCPPS { typedef struct HEVCPPS {
@ -557,6 +563,9 @@ typedef struct HEVCPPS {
int *tile_pos_rs; ///< TilePosRS int *tile_pos_rs; ///< TilePosRS
int *min_tb_addr_zs; ///< MinTbAddrZS int *min_tb_addr_zs; ///< MinTbAddrZS
int *min_tb_addr_zs_tab;///< MinTbAddrZS int *min_tb_addr_zs_tab;///< MinTbAddrZS
uint8_t data[4096];
int data_size;
} HEVCPPS; } HEVCPPS;
typedef struct HEVCParamSets { typedef struct HEVCParamSets {

36
libavcodec/hevc_ps.c
View File

@ -399,6 +399,7 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx,
{ {
int i,j; int i,j;
int vps_id = 0; int vps_id = 0;
ptrdiff_t nal_size;
HEVCVPS *vps; HEVCVPS *vps;
AVBufferRef *vps_buf = av_buffer_allocz(sizeof(*vps)); AVBufferRef *vps_buf = av_buffer_allocz(sizeof(*vps));
@ -408,6 +409,17 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx,
av_log(avctx, AV_LOG_DEBUG, "Decoding VPS\n"); av_log(avctx, AV_LOG_DEBUG, "Decoding VPS\n");
nal_size = gb->buffer_end - gb->buffer;
if (nal_size > sizeof(vps->data)) {
av_log(avctx, AV_LOG_WARNING, "Truncating likely oversized VPS "
"(%"PTRDIFF_SPECIFIER" > %"SIZE_SPECIFIER")\n",
nal_size, sizeof(vps->data));
vps->data_size = sizeof(vps->data);
} else {
vps->data_size = nal_size;
}
memcpy(vps->data, gb->buffer, vps->data_size);
vps_id = get_bits(gb, 4); vps_id = get_bits(gb, 4);
if (vps_id >= MAX_VPS_COUNT) { if (vps_id >= MAX_VPS_COUNT) {
av_log(avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", vps_id); av_log(avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", vps_id);
@ -1177,6 +1189,7 @@ int ff_hevc_decode_nal_sps(GetBitContext *gb, AVCodecContext *avctx,
AVBufferRef *sps_buf = av_buffer_allocz(sizeof(*sps)); AVBufferRef *sps_buf = av_buffer_allocz(sizeof(*sps));
unsigned int sps_id; unsigned int sps_id;
int ret; int ret;
ptrdiff_t nal_size;
if (!sps_buf) if (!sps_buf)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -1184,6 +1197,17 @@ int ff_hevc_decode_nal_sps(GetBitContext *gb, AVCodecContext *avctx,
av_log(avctx, AV_LOG_DEBUG, "Decoding SPS\n"); av_log(avctx, AV_LOG_DEBUG, "Decoding SPS\n");
nal_size = gb->buffer_end - gb->buffer;
if (nal_size > sizeof(sps->data)) {
av_log(avctx, AV_LOG_WARNING, "Truncating likely oversized SPS "
"(%"PTRDIFF_SPECIFIER" > %"SIZE_SPECIFIER")\n",
nal_size, sizeof(sps->data));
sps->data_size = sizeof(sps->data);
} else {
sps->data_size = nal_size;
}
memcpy(sps->data, gb->buffer, sps->data_size);
ret = ff_hevc_parse_sps(sps, gb, &sps_id, ret = ff_hevc_parse_sps(sps, gb, &sps_id,
apply_defdispwin, apply_defdispwin,
ps->vps_list, avctx); ps->vps_list, avctx);
@ -1407,6 +1431,7 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx,
HEVCSPS *sps = NULL; HEVCSPS *sps = NULL;
int i, ret = 0; int i, ret = 0;
unsigned int pps_id = 0; unsigned int pps_id = 0;
ptrdiff_t nal_size;
AVBufferRef *pps_buf; AVBufferRef *pps_buf;
HEVCPPS *pps = av_mallocz(sizeof(*pps)); HEVCPPS *pps = av_mallocz(sizeof(*pps));
@ -1423,6 +1448,17 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx,
av_log(avctx, AV_LOG_DEBUG, "Decoding PPS\n"); av_log(avctx, AV_LOG_DEBUG, "Decoding PPS\n");
nal_size = gb->buffer_end - gb->buffer;
if (nal_size > sizeof(pps->data)) {
av_log(avctx, AV_LOG_WARNING, "Truncating likely oversized PPS "
"(%"PTRDIFF_SPECIFIER" > %"SIZE_SPECIFIER")\n",
nal_size, sizeof(pps->data));
pps->data_size = sizeof(pps->data);
} else {
pps->data_size = nal_size;
}
memcpy(pps->data, gb->buffer, pps->data_size);
// Default values // Default values
pps->loop_filter_across_tiles_enabled_flag = 1; pps->loop_filter_across_tiles_enabled_flag = 1;
pps->num_tile_columns = 1; pps->num_tile_columns = 1;