-rw-r--r-- | core/multimedia/opieplayer/loopcontrol.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index 70e4a78..ba14882 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp | |||
@@ -233,20 +233,22 @@ void LoopControl::startAudio() { | |||
233 | long samplesRead = 0; | 233 | long samplesRead = 0; |
234 | bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); | 234 | bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); |
235 | long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; | 235 | long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; |
236 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; | 236 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; |
237 | 237 | ||
238 | // this causes drop outs not sure why its even here | 238 | // this causes drop outs not sure why its even here |
239 | // if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { | 239 | if ( hasVideoChannel ) { |
240 | // usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); | 240 | if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { |
241 | // } | 241 | usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); |
242 | // else if ( sampleWaitTime <= -5000 ) { | 242 | } |
243 | // qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); | 243 | else if ( sampleWaitTime <= -5000 ) { |
244 | // // //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); | 244 | qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); |
245 | // currentSample = sampleWeShouldBeAt; | 245 | // //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); |
246 | // } | 246 | currentSample = sampleWeShouldBeAt; |
247 | } | ||
248 | } | ||
247 | 249 | ||
248 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); | 250 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); |
249 | 251 | ||
250 | if( mediaPlayerState->isStreaming == FALSE) | 252 | if( mediaPlayerState->isStreaming == FALSE) |
251 | audioSampleCounter = currentSample + samplesRead - 1; | 253 | audioSampleCounter = currentSample + samplesRead - 1; |
252 | 254 | ||