MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/apetag: Avoid allocation for small tags 

By using avio_get_dyn_buf() + ffio_free_dyn_buf() instead of
avio_close_dyn_buf() + av_free() one can avoid an allocation + copy for
small tags. Furthermore, it simplifies freeing.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2019-11-27 13:22:06 +01:00 committed by James Almer
parent 163bb9ac0a
commit 67ce9e0463
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/apetag.c
View File

@ -186,11 +186,11 @@ int ff_ape_write_tag(AVFormatContext *s)
{
AVDictionaryEntry *e = NULL;
int size, ret, count = 0;
AVIOContext *dyn_bc = NULL;
uint8_t *dyn_buf = NULL;
AVIOContext *dyn_bc;
uint8_t *dyn_buf;
if ((ret = avio_open_dyn_buf(&dyn_bc)) < 0)
goto end;
return ret;
ff_standardize_creation_time(s);
while ((e = av_dict_get(s->metadata, "", e, AV_DICT_IGNORE_SUFFIX))) {
@ -211,7 +211,7 @@ int ff_ape_write_tag(AVFormatContext *s)
if (!count)
goto end;
size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
size = avio_get_dyn_buf(dyn_bc, &dyn_buf);
if (size <= 0)
goto end;
size += APE_TAG_FOOTER_BYTES;
@ -239,9 +239,7 @@ int ff_ape_write_tag(AVFormatContext *s)
ffio_fill(s->pb, 0, 8); // reserved
end:
if (dyn_bc && !dyn_buf)
avio_close_dyn_buf(dyn_bc, &dyn_buf);
av_freep(&dyn_buf);
ffio_free_dyn_buf(&dyn_bc);
return ret;
}