Changeset 10851 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp

Timestamp:

12/02/09 19:58:45 (3 years ago)

Author:

robert

Message:

From Julen Garcia,"I've been lately working also with the ffmpeg plugin and I implemented pause(), seek() and getReferenceTime(). I think that I have solved the internal clock issues (maybe not in the most elegant way :?"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp (modified) (3 diffs)

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

@@ -214 +214 @@
 }
 
-void FFmpegDecoder::resume() 
-{
-    m_pending_packet.clear();
-
-    flushAudioQueue();
-    flushVideoQueue();
-    m_state = NORMAL;
-}
-
 void FFmpegDecoder::findAudioStream()
 {
@@ -295 +286 @@
             // If we reach the end of the stream, change the decoder state
             if (loop())
+            {
+                m_clocks.reset(m_start);
                 rewindButDontFlushQueues();
+            }
             else
                 m_state = END_OF_STREAM;
@@ -394 +388 @@
     const int64_t seek_target = av_rescale_q(pos, AvTimeBaseQ, m_video_stream->time_base);
 
+    m_clocks.setSeekTime(time);
+
     if (av_seek_frame(m_format_context.get(), m_video_index, seek_target, 0/*AVSEEK_FLAG_BYTE |*/ /*AVSEEK_FLAG_BACKWARD*/) < 0)
         throw std::runtime_error("av_seek_frame failed()");