zomb1pod/mlc
1
0
Fork 0
forked from blue/mlc
Code Pull Requests Activity

Add check and normalization for more than 16 bits per sample FLAC-files

Browse Source
This commit is contained in:
Maksim Podoprelov 2023-11-13 20:01:38 +03:00
parent 3971a5b662
commit 97f61bb40c
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/flactomp3.cpp
View File

@ -294,16 +294,28 @@ bool FLACtoMP3::scaleJPEG(const FLAC__StreamMetadata_Picture& picture) {
return true; return true;
} }
bool FLACtoMP3::decodeFrame(const int32_t * const buffer[], uint32_t size) { bool FLACtoMP3::decodeFrame(const int32_t * const buffer[], uint32_t size, const uint32_t bitsPerSample) {
if (!outputInitilized) { if (!outputInitilized) {
bool success = initializeOutput(); bool success = initializeOutput();
if (!success) if (!success)
return false; return false;
} }
if (bitsPerSample >= 16)
return decodeFrameImpl(buffer, size, 1 << (bitsPerSample - 16));
return false;
}
bool FLACtoMP3::decodeFrameImpl(const int32_t * const buffer[], uint32_t size, const uint32_t divisor)
{
for (size_t i = 0; i < size; ++i) { for (size_t i = 0; i < size; ++i) {
pcm[pcmCounter++] = (int16_t)buffer[0][i]; int32_t left = buffer[0][i];
pcm[pcmCounter++] = (int16_t)buffer[1][i]; int32_t right = buffer[1][i];
left /= divisor;
right /= divisor;
pcm[pcmCounter++] = (int16_t)left;
pcm[pcmCounter++] = (int16_t)right;
if (pcmCounter == pcmSize) if (pcmCounter == pcmSize)
return flush(); return flush();
@ -395,7 +407,7 @@ FLAC__StreamDecoderWriteStatus FLACtoMP3::write(
return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
} }
bool result = self->decodeFrame(buffer, frame->header.blocksize); bool result = self->decodeFrame(buffer, frame->header.blocksize, frame->header.bits_per_sample);
if (result) if (result)
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;

3
src/flactomp3.h
View File

@ -29,7 +29,8 @@ private:
void processTags(const FLAC__StreamMetadata_VorbisComment& tags); void processTags(const FLAC__StreamMetadata_VorbisComment& tags);
void processInfo(const FLAC__StreamMetadata_StreamInfo& info); void processInfo(const FLAC__StreamMetadata_StreamInfo& info);
void processPicture(const FLAC__StreamMetadata_Picture& picture); void processPicture(const FLAC__StreamMetadata_Picture& picture);
bool decodeFrame(const int32_t * const buffer[], uint32_t size); bool decodeFrame(const int32_t * const buffer[], uint32_t size, const uint32_t bitsPerSample);
bool decodeFrameImpl(const int32_t * const buffer[], uint32_t size, const uint32_t divisor);
bool flush(); bool flush();
bool initializeOutput(); bool initializeOutput();
bool scaleJPEG(const FLAC__StreamMetadata_Picture& picture); bool scaleJPEG(const FLAC__StreamMetadata_Picture& picture);