diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@googlemail.com> | 2019-02-12 01:47:43 +0300 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2019-02-26 00:40:13 +0300 |
| commit | b8c45bbcbc207293f955e838ea66106f4b65b1ac (patch) | |
| tree | e46eb58202941ad69cbd56f142a7900c7499ae13 /libavcodec/h264_metadata_bsf.c | |
| parent | c5b452ed2f16a0d7bf01d7d84097337f8756987b (diff) | |
libavcodec/cbs: Stop needlessly reallocating the units array
Currently, a fragment's unit array is constantly reallocated during
splitting of a packet. This commit changes this: One can keep the units
array by distinguishing between the number of allocated and the number
of valid units in the units array.
The more units a packet is split into, the bigger the benefit.
So MPEG-2 benefits the most; for a video coming from an NTSC-DVD
(usually 32 units per frame) the average cost of cbs_insert_unit (for a
single unit) went down from 6717 decicycles to 450 decicycles (based
upon 10 runs with 4194304 runs each); if each packet consists of only
one unit, it went down from 2425 to 448; for a H.264 video where most
packets contain nine units, it went from 4431 to 450.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@googlemail.com>
Diffstat (limited to 'libavcodec/h264_metadata_bsf.c')
| -rw-r--r-- | libavcodec/h264_metadata_bsf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index e674f2a88d..a17987a06c 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -604,7 +604,7 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *out) err = 0; fail: - ff_cbs_fragment_uninit(ctx->cbc, au); + ff_cbs_fragment_reset(ctx->cbc, au); av_freep(&displaymatrix_side_data); if (err < 0) @@ -648,13 +648,15 @@ static int h264_metadata_init(AVBSFContext *bsf) err = 0; fail: - ff_cbs_fragment_uninit(ctx->cbc, au); + ff_cbs_fragment_reset(ctx->cbc, au); return err; } static void h264_metadata_close(AVBSFContext *bsf) { H264MetadataContext *ctx = bsf->priv_data; + + ff_cbs_fragment_free(ctx->cbc, &ctx->access_unit); ff_cbs_close(&ctx->cbc); } |