#include "h2645_parse.h"
int ff_h2645_extract_rbsp(const uint8_t *src, int length,
- H2645NAL *nal, int small_padding)
+ H2645RBSP *rbsp, H2645NAL *nal, int small_padding)
{
int i, si, di;
uint8_t *dst;
- int64_t padding = small_padding ? 0 : MAX_MBPAIR_SIZE;
nal->skipped_bytes = 0;
#define STARTCODE_TEST \
} else if (i > length)
i = length;
- av_fast_padded_malloc(&nal->rbsp_buffer, &nal->rbsp_buffer_size,
- length + padding);
- if (!nal->rbsp_buffer)
- return AVERROR(ENOMEM);
-
+ nal->rbsp_buffer = &rbsp->rbsp_buffer[rbsp->rbsp_buffer_size];
dst = nal->rbsp_buffer;
memcpy(dst, src, i);
nal->size = di;
nal->raw_data = src;
nal->raw_size = si;
+ rbsp->rbsp_buffer_size += si;
+
return si;
}
GetByteContext bc;
int consumed, ret = 0;
int next_avc = is_nalff ? 0 : length;
+ int64_t padding = small_padding ? 0 : MAX_MBPAIR_SIZE;
bytestream2_init(&bc, buf, length);
+ av_fast_padded_malloc(&pkt->rbsp.rbsp_buffer, &pkt->rbsp.rbsp_buffer_alloc_size, length + padding);
+ if (!pkt->rbsp.rbsp_buffer)
+ return AVERROR(ENOMEM);
+ pkt->rbsp.rbsp_buffer_size = 0;
pkt->nb_nals = 0;
while (bytestream2_get_bytes_left(&bc) >= 4) {
H2645NAL *nal;
}
nal = &pkt->nals[pkt->nb_nals];
- consumed = ff_h2645_extract_rbsp(bc.buffer, extract_length, nal, small_padding);
+ consumed = ff_h2645_extract_rbsp(bc.buffer, extract_length, &pkt->rbsp, nal, small_padding);
if (consumed < 0)
return consumed;
{
int i;
for (i = 0; i < pkt->nals_allocated; i++) {
- av_freep(&pkt->nals[i].rbsp_buffer);
av_freep(&pkt->nals[i].skipped_bytes_pos);
}
av_freep(&pkt->nals);
pkt->nals_allocated = 0;
+ av_freep(&pkt->rbsp.rbsp_buffer);
+ pkt->rbsp.rbsp_buffer_alloc_size = pkt->rbsp.rbsp_buffer_size = 0;
}