From b936e398e2c49c1b766db9aefbd24e3563b4a751 Mon Sep 17 00:00:00 2001 From: Robert Kausch Date: Sat, 2 Mar 2019 18:06:46 +0100 Subject: [PATCH] Speed up FLAC__bitwriter_write_byte_block (metadata writing) --- src/libFLAC/bitwriter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libFLAC/bitwriter.c b/src/libFLAC/bitwriter.c index bfe79b02..6e86585b 100644 --- a/src/libFLAC/bitwriter.c +++ b/src/libFLAC/bitwriter.c @@ -410,6 +410,10 @@ inline FLAC__bool FLAC__bitwriter_write_byte_block(FLAC__BitWriter *bw, const FL { uint32_t i; + /* grow capacity upfront to prevent constant reallocation during writes */ + if(bw->capacity <= bw->words + nvals / (FLAC__BITS_PER_WORD / 8) + 1 && !bitwriter_grow_(bw, nvals * 8)) + return false; + /* this could be faster but currently we don't need it to be since it's only used for writing metadata */ for(i = 0; i < nvals; i++) { if(!FLAC__bitwriter_write_raw_uint32_nocheck(bw, (FLAC__uint32)(vals[i]), 8))