mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
lavc/hevc: store VPS/SPS/PPS data
This commit is contained in:
parent
7055b28d98
commit
bf011695fd
@ -387,6 +387,9 @@ typedef struct HEVCVPS {
|
||||
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_hrd_parameters;
|
||||
|
||||
uint8_t data[4096];
|
||||
int data_size;
|
||||
} HEVCVPS;
|
||||
|
||||
typedef struct ScalingList {
|
||||
@ -483,6 +486,9 @@ typedef struct HEVCSPS {
|
||||
int vshift[3];
|
||||
|
||||
int qp_bd_offset;
|
||||
|
||||
uint8_t data[4096];
|
||||
int data_size;
|
||||
} HEVCSPS;
|
||||
|
||||
typedef struct HEVCPPS {
|
||||
@ -557,6 +563,9 @@ typedef struct HEVCPPS {
|
||||
int *tile_pos_rs; ///< TilePosRS
|
||||
int *min_tb_addr_zs; ///< MinTbAddrZS
|
||||
int *min_tb_addr_zs_tab;///< MinTbAddrZS
|
||||
|
||||
uint8_t data[4096];
|
||||
int data_size;
|
||||
} HEVCPPS;
|
||||
|
||||
typedef struct HEVCParamSets {
|
||||
|
@ -399,6 +399,7 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx,
|
||||
{
|
||||
int i,j;
|
||||
int vps_id = 0;
|
||||
ptrdiff_t nal_size;
|
||||
HEVCVPS *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");
|
||||
|
||||
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);
|
||||
if (vps_id >= MAX_VPS_COUNT) {
|
||||
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));
|
||||
unsigned int sps_id;
|
||||
int ret;
|
||||
ptrdiff_t nal_size;
|
||||
|
||||
if (!sps_buf)
|
||||
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");
|
||||
|
||||
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,
|
||||
apply_defdispwin,
|
||||
ps->vps_list, avctx);
|
||||
@ -1407,6 +1431,7 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx,
|
||||
HEVCSPS *sps = NULL;
|
||||
int i, ret = 0;
|
||||
unsigned int pps_id = 0;
|
||||
ptrdiff_t nal_size;
|
||||
|
||||
AVBufferRef *pps_buf;
|
||||
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");
|
||||
|
||||
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
|
||||
pps->loop_filter_across_tiles_enabled_flag = 1;
|
||||
pps->num_tile_columns = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user