search for: decodersession

...ac-dev/attachments/20140926/a0386298/attachment.htm -------------- next part -------------- diff --git a/src/flac/decode.c b/src/flac/decode.c index 5e5e17a..90e0b1a 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -101,7 +101,7 @@ static FLAC__bool is_big_endian_host_; static FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__bool use_first_serial_number, long serial_number, FileFormat format, FLAC__bool treat_warnings_as_errors, FLAC__bool continue_through_decode_errors, FLAC__bool channel_map_none, replaygain_synthesis_spec_t replaygain_synthesis_spec, FLAC__bool a...

...ng the write buffer from the default 512 bytes to 10 MB already reduces the problem tremendously. -------------- next part -------------- diff --git a/src/flac/decode.c b/src/flac/decode.c index 5e5e17a..9e9405c 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -251,6 +251,7 @@ FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__ DecoderSession_destroy(d, /*error_occurred=*/true); return false; } + setvbuf(d->fout, NULL, _IOFBF, 10*1024*1024); /* 10MB output buffer to help reduce disk fragmentation */ } }

...ped in > Win32 #ifdef or similar. > > Erik -------------- next part -------------- diff --git a/src/flac/decode.c b/src/flac/decode.c index 5e5e17a..7705107 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -101,7 +101,7 @@ static FLAC__bool is_big_endian_host_; static FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__bool use_first_serial_number, long serial_number, FileFormat format, FLAC__bool treat_warnings_as_errors, FLAC__bool continue_through_decode_errors, FLAC__bool channel_map_none, replaygain_synthesis_spec_t replaygain_synthesis_spec, FLAC__bool a...

Can you please wrap the setvbuf in _WIN32 IFDEFs too? Currently memory usage of FLAC decoding is about 1MB, so this patch is increasing memory usage tenfold, also for platforms that do not need this. It is a non-problem on my system anyway. Op 26-09-14 om 10:36 schreef Janne Hyv?rinen: > I made some changes to the previous patch. I don't know why I > originally didn't put the

...39;t need changes as outputfilename was already known. Attached is a fixed and improved version. -------------- next part -------------- diff --git a/src/flac/decode.c b/src/flac/decode.c index 5e5e17a..ed7eff8 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -263,6 +263,23 @@ FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__ void DecoderSession_destroy(DecoderSession *d, FLAC__bool error_occurred) { if(0 != d->fout && d->fout != stdout) { +#ifdef _WIN32 + if(!error_occurred) { + FLAC__off_t written_size = ftello(d->fout); + if(written_size...

Now that we've selected a channel mapping for 7 and 8 channel flac, the command-line encoder tools needs updating to accept wav files with compatible channel maps. -r -------------- next part --------------

...retval = flac__decode_wav(infilename, option_values.test_only? 0 : outfilename, option_values.analyze, option_values.aopts, options); Details below: (gdb) run Starting program: /home/tom/sources/flac-1.1.2/src/flac/.libs/lt-flac --silent --test metaflac.flac Breakpoint 1, DecoderSession_process (d=0xbffff530) at decode.c:500 500 if(flac__utils_fwrite("\000", 1, 1, d->fout) != 1) { (gdb) print d $1 = (DecoderSession *) 0xbffff530 (gdb) print d->fout $2 = (FILE *) 0x0 (gdb) n Program received signal SIGSEGV, Segmentation fault. 0xb7ea7044 in fw...

...nd just makes the code shorter. --- src/flac/decode.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/flac/decode.c b/src/flac/decode.c index fa82c04..98fc430 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -333,32 +333,26 @@ FLAC__bool DecoderSession_process(DecoderSession *d) return false; /* set channel mapping */ - if(!d->channel_map_none) { - /* currently FLAC order matches SMPTE/WAVEFORMATEXTENSIBLE order, so no reordering is necessary; see encode.c */ - /* only the channel mask must be set if it was not already picked up from...

...sk from the metadata block. --- src/flac/decode.c | 5 +++++ src/flac/encode.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/flac/decode.c b/src/flac/decode.c index 98fc430..2d1bdd6 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -354,6 +354,11 @@ FLAC__bool DecoderSession_process(DecoderSession *d) else if(d->channels == 6) { d->channel_mask = 0x060f; } + else if(d->channels == 7) { + d->channel_mask = 0x070f; + } + else if(d->channels == 8) { + d->...

...front right, front center, LFE, back left, back right, side left, side right</li> </ul> </li> <li> diff --git a/src/flac/decode.c b/src/flac/decode.c index 98fc430..77acb7c 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -354,6 +354,12 @@ FLAC__bool DecoderSession_process(DecoderSession *d) else if(d->channels == 6) { d->channel_mask = 0x060f; } + else if(d->channels == 7) { + d->channel_mask = 0x070f; + } + else if(d->channels == 8) { + d->...

doing "make check" on flac-1.1.2, I get a segmentation fault ././test_metaflac.sh: line 51: 17370 Segmentation fault flac $* when running this portion of the test/test_metaflac.sh script: (set -x && run_metaflac --preserve-modtime --add-padding=12345 $flacfile) check_exit check_flac <---------------- where the segfault happens All other tests in

Hi Josh, Here are all the patches that are currently applied to the Debian packages for flac. You may disagree with some of them but as the current maintainer, I'm submitting them all for your consideration. (I should've submitted them earlier, but I've been quite busy. Sorry!) Here is a listing of the patches that I'll be sending: Patch 1 fixes a simple typo in metaflac