virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/ttaenc: Defer freeing dynamic buffer

Browse Source 
The TTA muxer writes a seektable in a dynamic buffer as it receives
packets and when writing the trailer, closes the dynamic buffer using
avio_close_dyn_buf(), writes the seektable and frees the buffer. But
the TTA muxer already has a deinit function which unconditionally
calls ffio_free_dyn_buf() on the dynamic buffer, so switching to
avio_get_dyn_buf() means that one can remove the code to free the
buffer; furthermore, it also might save an allocation if the seektable
is so small that it fits into the dynamic buffer's write buffer or if
adding the padding that avio_close_dyn_buf() adds necessitated
reallocating of the underlying buffer.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-05-20 21:52:09 +02:00
parent 9f6b738896
commit dbacecd347
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/ttaenc.c
View File

@ -145,10 +145,8 @@ static int tta_write_trailer(AVFormatContext *s)
/* Write Seek table */ /* Write Seek table */
crc = ffio_get_checksum(tta->seek_table) ^ UINT32_MAX; crc = ffio_get_checksum(tta->seek_table) ^ UINT32_MAX;
avio_wl32(tta->seek_table, crc); avio_wl32(tta->seek_table, crc);
size = avio_close_dyn_buf(tta->seek_table, &ptr); size = avio_get_dyn_buf(tta->seek_table, &ptr);
avio_write(s->pb, ptr, size); avio_write(s->pb, ptr, size);
tta->seek_table = NULL;
av_free(ptr);
/* Write audio data */ /* Write audio data */
tta_queue_flush(s); tta_queue_flush(s);