avcodec/cbs: use a reference to the assembled CodedBitstreamFragment buffer when writing packets

This saves one malloc + memcpy per packet

The CodedBitstreamFragment buffer is padded to follow the requirements
of AVPacket.

Reviewed-by: jkqxz
Signed-off-by: James Almer <jamrial@gmail.com>
pull/280/merge
James Almer 7 years ago
parent 69995a94d8
commit df3a2ff767
  1. 12
      libavcodec/cbs.c
  2. 8
      libavcodec/cbs_h2645.c
  3. 3
      libavcodec/cbs_mpeg2.c

@ -308,17 +308,21 @@ int ff_cbs_write_packet(CodedBitstreamContext *ctx,
AVPacket *pkt, AVPacket *pkt,
CodedBitstreamFragment *frag) CodedBitstreamFragment *frag)
{ {
AVBufferRef *buf;
int err; int err;
err = ff_cbs_write_fragment_data(ctx, frag); err = ff_cbs_write_fragment_data(ctx, frag);
if (err < 0) if (err < 0)
return err; return err;
err = av_new_packet(pkt, frag->data_size); av_assert0(frag->data_ref);
if (err < 0) buf = av_buffer_ref(frag->data_ref);
return err; if (!buf)
return AVERROR(ENOMEM);
memcpy(pkt->data, frag->data, frag->data_size); av_init_packet(pkt);
pkt->buf = buf;
pkt->data = frag->data;
pkt->size = frag->data_size; pkt->size = frag->data_size;
return 0; return 0;

@ -1298,7 +1298,7 @@ static int cbs_h2645_assemble_fragment(CodedBitstreamContext *ctx,
max_size += 3 + frag->units[i].data_size * 3 / 2; max_size += 3 + frag->units[i].data_size * 3 / 2;
} }
data = av_malloc(max_size); data = av_malloc(max_size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!data) if (!data)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -1349,11 +1349,13 @@ static int cbs_h2645_assemble_fragment(CodedBitstreamContext *ctx,
} }
av_assert0(dp <= max_size); av_assert0(dp <= max_size);
err = av_reallocp(&data, dp); err = av_reallocp(&data, dp + AV_INPUT_BUFFER_PADDING_SIZE);
if (err) if (err)
return err; return err;
memset(data + dp, 0, AV_INPUT_BUFFER_PADDING_SIZE);
frag->data_ref = av_buffer_create(data, dp, NULL, NULL, 0); frag->data_ref = av_buffer_create(data, dp + AV_INPUT_BUFFER_PADDING_SIZE,
NULL, NULL, 0);
if (!frag->data_ref) { if (!frag->data_ref) {
av_freep(&data); av_freep(&data);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

@ -369,7 +369,7 @@ static int cbs_mpeg2_assemble_fragment(CodedBitstreamContext *ctx,
for (i = 0; i < frag->nb_units; i++) for (i = 0; i < frag->nb_units; i++)
size += 3 + frag->units[i].data_size; size += 3 + frag->units[i].data_size;
frag->data_ref = av_buffer_alloc(size); frag->data_ref = av_buffer_alloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!frag->data_ref) if (!frag->data_ref)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
data = frag->data_ref->data; data = frag->data_ref->data;
@ -388,6 +388,7 @@ static int cbs_mpeg2_assemble_fragment(CodedBitstreamContext *ctx,
av_assert0(dp == size); av_assert0(dp == size);
memset(data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
frag->data = data; frag->data = data;
frag->data_size = size; frag->data_size = size;

Loading…
Cancel
Save