virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/hevc: Move skipped_bytes_pos_size_nal into HAVCNAL

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-13 00:35:11 +02:00
parent 5620ed3557
commit bcc6c7bb65
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/hevc.c
View File

@ -2974,7 +2974,6 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx)
for(i=0; i < s->pkt.nals_allocated; i++) { for(i=0; i < s->pkt.nals_allocated; i++) {
av_freep(&s->skipped_bytes_pos_nal[i]); av_freep(&s->skipped_bytes_pos_nal[i]);
} }
av_freep(&s->skipped_bytes_pos_size_nal);
av_freep(&s->skipped_bytes_pos_nal); av_freep(&s->skipped_bytes_pos_nal);
av_freep(&s->cabac_state); av_freep(&s->cabac_state);

2
libavcodec/hevc.h
View File

@ -761,6 +761,7 @@ typedef struct HEVCNAL {
int temporal_id; int temporal_id;
int skipped_bytes; int skipped_bytes;
int skipped_bytes_pos_size_nal;
} HEVCNAL; } HEVCNAL;
/* an input packet split into unescaped NAL units */ /* an input packet split into unescaped NAL units */
@ -903,7 +904,6 @@ typedef struct HEVCContext {
int skipped_bytes_pos_size; int skipped_bytes_pos_size;
int **skipped_bytes_pos_nal; int **skipped_bytes_pos_nal;
int *skipped_bytes_pos_size_nal;
const uint8_t *data; const uint8_t *data;

16
libavcodec/hevc_parse.c
View File

@ -218,32 +218,28 @@ int ff_hevc_split_packet(HEVCContext *s, HEVCPacket *pkt, const uint8_t *buf, in
memset(pkt->nals + pkt->nals_allocated, 0, memset(pkt->nals + pkt->nals_allocated, 0,
(new_size - pkt->nals_allocated) * sizeof(*pkt->nals)); (new_size - pkt->nals_allocated) * sizeof(*pkt->nals));
tmp = av_realloc_array(s->skipped_bytes_pos_size_nal, new_size, sizeof(*s->skipped_bytes_pos_size_nal));
if (!tmp)
return AVERROR(ENOMEM);
s->skipped_bytes_pos_size_nal = tmp;
tmp = av_realloc_array(s->skipped_bytes_pos_nal, new_size, sizeof(*s->skipped_bytes_pos_nal)); tmp = av_realloc_array(s->skipped_bytes_pos_nal, new_size, sizeof(*s->skipped_bytes_pos_nal));
if (!tmp) if (!tmp)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->skipped_bytes_pos_nal = tmp; s->skipped_bytes_pos_nal = tmp;
s->skipped_bytes_pos_size_nal[pkt->nals_allocated] = 1024; // initial buffer size nal = &pkt->nals[pkt->nb_nals];
s->skipped_bytes_pos_nal[pkt->nals_allocated] = av_malloc_array(s->skipped_bytes_pos_size_nal[pkt->nals_allocated], sizeof(*s->skipped_bytes_pos)); nal->skipped_bytes_pos_size_nal = 1024; // initial buffer size
s->skipped_bytes_pos_nal[pkt->nals_allocated] = av_malloc_array(nal->skipped_bytes_pos_size_nal, sizeof(*s->skipped_bytes_pos));
if (!s->skipped_bytes_pos_nal[pkt->nals_allocated]) if (!s->skipped_bytes_pos_nal[pkt->nals_allocated])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
pkt->nals_allocated = new_size; pkt->nals_allocated = new_size;
} }
s->skipped_bytes_pos_size = s->skipped_bytes_pos_size_nal[pkt->nb_nals];
s->skipped_bytes_pos = s->skipped_bytes_pos_nal[pkt->nb_nals];
nal = &pkt->nals[pkt->nb_nals]; nal = &pkt->nals[pkt->nb_nals];
s->skipped_bytes_pos_size = nal->skipped_bytes_pos_size_nal;
s->skipped_bytes_pos = s->skipped_bytes_pos_nal[pkt->nb_nals];
consumed = ff_hevc_extract_rbsp(s, buf, extract_length, nal); consumed = ff_hevc_extract_rbsp(s, buf, extract_length, nal);
if (consumed < 0) if (consumed < 0)
return consumed; return consumed;
s->skipped_bytes_pos_size_nal[pkt->nb_nals] = s->skipped_bytes_pos_size; nal->skipped_bytes_pos_size_nal = s->skipped_bytes_pos_size;
s->skipped_bytes_pos_nal[pkt->nb_nals++] = s->skipped_bytes_pos; s->skipped_bytes_pos_nal[pkt->nb_nals++] = s->skipped_bytes_pos;
ret = init_get_bits8(&nal->gb, nal->data, nal->size); ret = init_get_bits8(&nal->gb, nal->data, nal->size);