Mercurial > hg > svcore
comparison data/fileio/MP3FileReader.cpp @ 1354:97deefd38060 3.0-integration
Further win32 build updates
author | Chris Cannam |
---|---|
date | Mon, 09 Jan 2017 13:51:39 +0000 |
parents | 330bcc92507d |
children | b812df0351d9 |
comparison
equal
deleted
inserted
replaced
1353:2001fe23e449 | 1354:97deefd38060 |
---|---|
472 | 472 |
473 if (m_channelCount == 0) { | 473 if (m_channelCount == 0) { |
474 | 474 |
475 m_fileRate = pcm->samplerate; | 475 m_fileRate = pcm->samplerate; |
476 m_channelCount = channels; | 476 m_channelCount = channels; |
477 | |
478 SVDEBUG << "MP3FileReader::accept: file rate = " << pcm->samplerate | |
479 << ", channel count = " << channels << ", about to init " | |
480 << "decode cache" << endl; | |
477 | 481 |
478 initialiseDecodeCache(); | 482 initialiseDecodeCache(); |
479 | 483 |
480 if (m_cacheMode == CacheInTemporaryFile) { | 484 if (m_cacheMode == CacheInTemporaryFile) { |
481 // SVDEBUG << "MP3FileReader::accept: channel count " << m_channelCount << ", file rate " << m_fileRate << ", about to start serialised section" << endl; | 485 // SVDEBUG << "MP3FileReader::accept: channel count " << m_channelCount << ", file rate " << m_fileRate << ", about to start serialised section" << endl; |
502 SVDEBUG << "MP3FileReader: Decoding cancelled" << endl; | 506 SVDEBUG << "MP3FileReader: Decoding cancelled" << endl; |
503 return MAD_FLOW_STOP; | 507 return MAD_FLOW_STOP; |
504 } | 508 } |
505 | 509 |
506 if (!isDecodeCacheInitialised()) { | 510 if (!isDecodeCacheInitialised()) { |
511 SVDEBUG << "MP3FileReader::accept: fallback case: file rate = " << pcm->samplerate | |
512 << ", channel count = " << channels << ", about to init " | |
513 << "decode cache" << endl; | |
507 initialiseDecodeCache(); | 514 initialiseDecodeCache(); |
508 } | 515 } |
509 | 516 |
510 if (m_sampleBufferSize < size_t(frames)) { | 517 if (m_sampleBufferSize < size_t(frames)) { |
511 if (!m_sampleBuffer) { | 518 if (!m_sampleBuffer) { |