virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

av1_metadata: Avoid allocations and copies of packet structures

Browse Source 
This commit changes av1_metadata to (a) use ff_bsf_get_packet_ref
instead of ff_bsf_get_packet (thereby avoiding one malloc and free per
filtered packet) and (b) to use only one packet structure at all,
thereby avoiding a call to av_packet_copy_props.

(b) has been made possible by the recent changes to ff_cbs_write_packet.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2019-06-17 05:42:07 +02:00 committed by Mark Thompson
parent 1e93f5060f
commit 7549f0ac1b
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/av1_metadata_bsf.c
View File

@ -116,19 +116,18 @@ static int av1_metadata_update_sequence_header(AVBSFContext *bsf,
return 0; return 0;
} }
static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *out) static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *pkt)
{ {
AV1MetadataContext *ctx = bsf->priv_data; AV1MetadataContext *ctx = bsf->priv_data;
AVPacket *in = NULL;
CodedBitstreamFragment *frag = &ctx->access_unit; CodedBitstreamFragment *frag = &ctx->access_unit;
AV1RawOBU td, *obu; AV1RawOBU td, *obu;
int err, i; int err, i;
err = ff_bsf_get_packet(bsf, &in); err = ff_bsf_get_packet_ref(bsf, pkt);
if (err < 0) if (err < 0)
return err; return err;
err = ff_cbs_read_packet(ctx->cbc, frag, in); err = ff_cbs_read_packet(ctx->cbc, frag, pkt);
if (err < 0) { if (err < 0) {
av_log(bsf, AV_LOG_ERROR, "Failed to read packet.\n"); av_log(bsf, AV_LOG_ERROR, "Failed to read packet.\n");
goto fail; goto fail;
@ -173,23 +172,18 @@ static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *out)
} }
} }
err = ff_cbs_write_packet(ctx->cbc, out, frag); err = ff_cbs_write_packet(ctx->cbc, pkt, frag);
if (err < 0) { if (err < 0) {
av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n"); av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n");
goto fail; goto fail;
} }
err = av_packet_copy_props(out, in);
if (err < 0)
goto fail;
err = 0; err = 0;
fail: fail:
ff_cbs_fragment_reset(ctx->cbc, frag); ff_cbs_fragment_reset(ctx->cbc, frag);
if (err < 0) if (err < 0)
av_packet_unref(out); av_packet_unref(pkt);
av_packet_free(&in);
return err; return err;
} }