Changeset 10892

Timestamp:

12/15/09 12:27:28 (3 years ago)

Author:

robert

Message:

From Julen Garcia, "So here is the code with a proper audio sync (at least in my computer)"

Location:

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg

Files:

• FFmpegClocks.cpp (modified) (8 diffs)
• FFmpegClocks.hpp (modified) (2 diffs)
• FFmpegDecoder.cpp (modified) (2 diffs)
• FFmpegDecoderAudio.cpp (modified) (1 diff)
• FFmpegDecoderVideo.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegClocks.cpp

@@ -40 +40 @@
     m_audio_delay(0.0),
     m_audio_disabled(false),
-    m_rewind(false),
     m_paused(false),
     m_last_current_time(0.0)
@@ -60 +59 @@
     m_frame_time = start_time;
 
+    m_pause_time = 0;
+    m_seek_time = 0;
+    
     m_audio_buffer_end_pts = start_time;
     m_audio_timer.setStartTick();
@@ -69 +71 @@
         m_paused = true;
     else
+    {
         m_paused = false;
-}
-
-
-
-void FFmpegClocks::rewindAudio()
-{
-    ScopedLock lock(m_mutex);
-
+        if(!m_audio_disabled) m_audio_timer.setStartTick();
+    }
+}
+
+
+
+void FFmpegClocks::rewind()
+{
+    ScopedLock lock(m_mutex);
+
+    m_pause_time = 0;
+    m_seek_time = 0;
+    
     m_audio_buffer_end_pts = m_start_time;
     m_audio_timer.setStartTick();
 
-    m_rewind = ! m_rewind;
-}
-
-
-
-void FFmpegClocks::rewindVideo()
-{
-    ScopedLock lock(m_mutex);
+    m_last_frame_delay = 0.040;
+    m_frame_time = m_start_time;
 
     if (m_audio_disabled)
         return;
 
-    m_video_clock = m_start_time;
-
+    m_video_clock = m_start_time;    
+}
+
+void FFmpegClocks::seek(double seek_time)
+{
+    ScopedLock lock(m_mutex);
+    
+    m_video_clock = seek_time;
     m_last_frame_delay = 0.040;
-    m_last_frame_pts = m_start_time - m_last_frame_delay;
-    m_frame_time = m_start_time;
-
-    m_rewind = ! m_rewind;
-}
-
+    m_frame_time = seek_time;
+}
 
 
@@ -180 +184 @@
 
     // If incorrect delay, use previous one
+    
     if (delay <= 0.0 || delay >= 1.0)
+    {
         delay = m_last_frame_delay;
+        if(!m_audio_disabled) m_frame_time = pts - delay;
+    }
+    
 
     // Save for next time
@@ -194 +203 @@
 
     const double audio_time = getAudioTime();
-    const double actual_delay = (! m_rewind) ?
-        clamp(m_frame_time - audio_time, -0.5*delay, 2.5*delay) :
-        m_last_actual_delay; // when rewinding audio or video (but the other has yet to be), get the last used delay
+    const double actual_delay = clamp(m_frame_time - audio_time, -0.5*delay, 2.5*delay);
 
     //m_frame_time += delay;
@@ -225 +232 @@
 void FFmpegClocks::setSeekTime(double seek_time)
 {
-    m_seek_time = getAudioTime() - seek_time;
+    m_seek_time += getAudioTime() - seek_time;
 }
 
@@ -232 +239 @@
 double FFmpegClocks::getAudioTime() const
 {
-    return m_audio_buffer_end_pts + m_audio_timer.time_s() - m_pause_time - m_audio_delay;
+    if(m_audio_disabled)
+        return m_audio_buffer_end_pts + m_audio_timer.time_s() - m_pause_time - m_audio_delay - m_seek_time;
+    else
+        return m_audio_buffer_end_pts + m_audio_timer.time_s() - m_audio_delay;
 }
 
@@ -239 +249 @@
 {
     if(!m_paused)
-        m_last_current_time = getAudioTime() - m_seek_time; // synced with audio
+        m_last_current_time = getAudioTime();
     
     return m_last_current_time;  

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegClocks.hpp

@@ -24 +24 @@
     void reset(double start_time);
     void pause(bool pause);
-    void rewindAudio();
-    void rewindVideo();
+    void seek(double seek_time);
+    void rewind();
 
     void audioSetBufferEndPts(double pts);
@@ -64 +64 @@
     Timer     m_audio_timer;
     bool      m_audio_disabled;
-    bool      m_rewind;
     bool      m_paused;
     double    m_last_current_time;

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp

@@ -368 +368 @@
         throw std::runtime_error("av_seek_frame failed()");
 
+    m_clocks.rewind();
     m_state = REWINDING;
 }
@@ -393 +394 @@
         throw std::runtime_error("av_seek_frame failed()");
 
+    m_clocks.seek(time);
     m_state = SEEKING;    
 }

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp

@@ -323 +323 @@
         {
             avcodec_flush_buffers(m_context);
-            m_clocks.rewindAudio();
         }
 

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp

@@ -228 +228 @@
             {
                 avcodec_flush_buffers(m_context);
-                m_clocks.rewindVideo();
             }
         }