mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
cbs: Add buffer padding when splitting fragments
Remove any trailing zeroes from H.26[45] NAL units at the same time.
This commit is contained in:
parent
44cde38c8a
commit
e7f64191b2
@ -479,12 +479,19 @@ static int cbs_h2645_fragment_add_nals(CodedBitstreamContext *ctx,
|
||||
|
||||
for (i = 0; i < packet->nb_nals; i++) {
|
||||
const H2645NAL *nal = &packet->nals[i];
|
||||
size_t size = nal->size;
|
||||
uint8_t *data;
|
||||
|
||||
data = av_malloc(nal->size);
|
||||
// Remove trailing zeroes.
|
||||
while (size > 0 && nal->data[size - 1] == 0)
|
||||
--size;
|
||||
av_assert0(size > 0);
|
||||
|
||||
data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
|
||||
if (!data)
|
||||
return AVERROR(ENOMEM);
|
||||
memcpy(data, nal->data, nal->size);
|
||||
memcpy(data, nal->data, size);
|
||||
memset(data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
|
||||
|
||||
err = ff_cbs_insert_unit_data(ctx, frag, -1, nal->type,
|
||||
data, nal->size);
|
||||
|
@ -131,10 +131,11 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx,
|
||||
unit_size = (end - 4) - (start - 1);
|
||||
}
|
||||
|
||||
unit_data = av_malloc(unit_size);
|
||||
unit_data = av_malloc(unit_size + AV_INPUT_BUFFER_PADDING_SIZE);
|
||||
if (!unit_data)
|
||||
return AVERROR(ENOMEM);
|
||||
memcpy(unit_data, start - 1, unit_size);
|
||||
memset(unit_data + unit_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
|
||||
|
||||
err = ff_cbs_insert_unit_data(ctx, frag, i, unit_type,
|
||||
unit_data, unit_size);
|
||||
|
Loading…
Reference in New Issue
Block a user