change for video

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
@@ -143,200 +143,202 @@ void LoopControl::timerEvent( QTimerEvent *te ) {
             mediaPlayerState->updatePosition( current_frame );
         }
     }
 
     if ( !moreVideo && !moreAudio ) { 
         mediaPlayerState->setPlaying( FALSE );
         mediaPlayerState->setNext();
     }
 }
 
 
 void LoopControl::setPosition( long pos ) {
     audioMutex->lock();
 //    qDebug("Loop control %d", pos);
     if ( hasVideoChannel && hasAudioChannel ) {
         playtime.restart();
         playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) );
         current_frame = pos + 1;
         mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
         prev_frame = current_frame - 1;
         currentSample = (int)( (double)current_frame * freq / framerate );
         mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
         audioSampleCounter = currentSample - 1;
     } else if ( hasVideoChannel ) {
         playtime.restart();
         playtime = playtime.addMSecs( long((double)-pos * 1000.0 / framerate) );
         current_frame = pos + 1;
         mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
         prev_frame = current_frame - 1;
     } else if ( hasAudioChannel ) {
         playtime.restart();
         playtime = playtime.addMSecs( long((double)-pos * 1000.0 / freq) );
         currentSample = pos + 1;
         mediaPlayerState->curDecoder()->audioSetSample( currentSample, stream );
         audioSampleCounter = currentSample - 1;
     }
 
     audioMutex->unlock();
 }
 
 
 void LoopControl::startVideo() {
 
     if ( moreVideo ) {
 
         if ( mediaPlayerState->curDecoder() ) {
 
             if ( hasAudioChannel && !isMuted ) {
 
                 current_frame = long( playtime.elapsed() * framerate / 1000 );
 
                 if ( prev_frame != -1 && current_frame <= prev_frame )
                     return;
 
             } else {
                   // Don't skip
                 current_frame++;
             }
 
             if ( prev_frame == -1 || current_frame > prev_frame ) {
                 if ( current_frame > prev_frame + 1 ) {
                     mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
                 }
                 moreVideo = videoUI->playVideo();
                 prev_frame = current_frame;
             }
 
         } else {
 
             moreVideo = FALSE;
             killTimer( videoId );
 
         }
 
     }
 }
 
 
 void LoopControl::startAudio() {
     
     audioMutex->lock();
     if ( moreAudio ) {
 
         if ( !isMuted && mediaPlayerState->curDecoder() ) {
 
             currentSample = audioSampleCounter + 1;
 
             if ( currentSample != audioSampleCounter + 1 )
                 qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
 
             long samplesRead = 0;
             bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream );
             long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000;
             long sampleWaitTime = currentSample - sampleWeShouldBeAt;
 
 // this causes drop outs not sure why its even here
-//           if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
-//         usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
-//           }
-//         else if ( sampleWaitTime <= -5000 ) {
-//        qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
-// //       //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
-//        currentSample = sampleWeShouldBeAt;
-//          }
+         if ( hasVideoChannel ) {
+           if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
+         usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
+           }
+         else if ( sampleWaitTime <= -5000 ) {
+        qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
+ //       //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
+        currentSample = sampleWeShouldBeAt;
+          }
+}
 
             audioDevice->write( audioBuffer, samplesRead * 2 * channels );
 
             if(  mediaPlayerState->isStreaming == FALSE)
                 audioSampleCounter = currentSample + samplesRead - 1;
 
             moreAudio = readOk && (audioSampleCounter <= total_audio_samples);
 
         } else {
 
             moreAudio = FALSE;
 
         }
 
     }
 
     audioMutex->unlock();
 }
 
 
 void LoopControl::killTimers() {
 
     audioMutex->lock();
 
     if ( hasVideoChannel ) 
         killTimer( videoId );
     killTimer( sliderId );
     threadOkToGo = FALSE;
 
     audioMutex->unlock();
 }
 
 
 void LoopControl::startTimers() {
 
     audioMutex->lock();
 
     moreVideo = FALSE;
     moreAudio = FALSE;
 
     if ( hasVideoChannel ) {
         moreVideo = TRUE;
         int mSecsBetweenFrames = (int)(100 / framerate); // 10% of the real value
         videoId = startTimer( mSecsBetweenFrames );
     }
 
     if ( hasAudioChannel ) {
         moreAudio = TRUE;
         threadOkToGo = TRUE;
     }
 
     sliderId = startTimer( 300 ); // update slider every 1/3 second
 
     audioMutex->unlock();
 }
 
 
 void LoopControl::setPaused( bool pause ) {
 
     if ( !mediaPlayerState->curDecoder() || !mediaPlayerState->curDecoder()->isOpen() )
         return;
 
     if ( pause ) {
         killTimers();
     } else {
           // Force an update of the position
         mediaPlayerState->setPosition( mediaPlayerState->position() + 1 );
         mediaPlayerState->setPosition( mediaPlayerState->position() - 1 );
           // Just like we never stopped
         startTimers();
     }
 }
 
 
 void LoopControl::stop( bool willPlayAgainShortly ) {
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     if ( !willPlayAgainShortly && disabledSuspendScreenSaver ) {
         disabledSuspendScreenSaver = FALSE; 
           // Re-enable the suspend mode
         QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
     }
 #endif
 
     if ( mediaPlayerState->curDecoder() && mediaPlayerState->curDecoder()->isOpen() ) {
 
         killTimers();
 
         audioMutex->lock();
 
         mediaPlayerState->curDecoder()->close();
 
         if ( audioDevice ) {
             delete audioDevice;
             delete audioBuffer;
             audioDevice = 0;