diff --git a/libmedia/MediaParser.cpp b/libmedia/MediaParser.cpp index 74bbd9a..8761a31 100644 --- a/libmedia/MediaParser.cpp +++ b/libmedia/MediaParser.cpp @@ -221,6 +221,9 @@ MediaParser::nextAudioFrame() bool MediaParser::nextAudioFrameTimestamp(boost::uint64_t& ts) const { +#ifdef LOAD_MEDIA_IN_A_SEPARATE_THREAD + boost::mutex::scoped_lock lock(_qMutex); +#endif const EncodedAudioFrame* ef = peekNextAudioFrame(); if ( ! ef ) return false; ts = ef->timestamp; @@ -230,9 +233,7 @@ MediaParser::nextAudioFrameTimestamp(boost::uint64_t& ts) const const EncodedAudioFrame* MediaParser::peekNextAudioFrame() const { -#ifdef LOAD_MEDIA_IN_A_SEPARATE_THREAD - boost::mutex::scoped_lock lock(_qMutex); -#else // ndef LOAD_MEDIA_IN_A_SEPARATE_THREAD +#ifndef LOAD_MEDIA_IN_A_SEPARATE_THREAD while (!parsingCompleted() && _audioInfo.get() && _audioFrames.empty()) { const_cast(this)->parseNextChunk();