virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

h264_redundant_pps: Avoid allocations and copies of packet structures

Browse Source 
This commit changes h264_redundant_pps 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-20 01:45:03 +02:00 committed by Mark Thompson
parent 3f81cc8c94
commit d78553cc4c
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/h264_redundant_pps_bsf.c
View File

@ -66,19 +66,18 @@ static int h264_redundant_pps_fixup_slice(H264RedundantPPSContext *ctx,
return 0;
}
static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *pkt)
{
H264RedundantPPSContext *ctx = bsf->priv_data;
AVPacket *in;
CodedBitstreamFragment *au = &ctx->access_unit;
int au_has_sps;
int err, i;
err = ff_bsf_get_packet(bsf, &in);
err = ff_bsf_get_packet_ref(bsf, pkt);
if (err < 0)
return err;
err = ff_cbs_read_packet(ctx->input, au, in);
err = ff_cbs_read_packet(ctx->input, au, pkt);
if (err < 0)
goto fail;
@ -94,7 +93,7 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
goto fail;
if (!au_has_sps) {
av_log(bsf, AV_LOG_VERBOSE, "Deleting redundant PPS "
"at %"PRId64".\n", in->pts);
"at %"PRId64".\n", pkt->pts);
err = ff_cbs_delete_unit(ctx->input, au, i);
if (err < 0)
goto fail;
@ -107,21 +106,15 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
}
}
err = ff_cbs_write_packet(ctx->output, out, au);
if (err < 0)
goto fail;
err = av_packet_copy_props(out, in);
err = ff_cbs_write_packet(ctx->output, pkt, au);
if (err < 0)
goto fail;
err = 0;
fail:
ff_cbs_fragment_reset(ctx->output, au);
av_packet_free(&in);
if (err < 0)
av_packet_unref(out);
av_packet_unref(pkt);
return err;
}