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

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.hpp (modified) (5 diffs)

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

@@ -71 +71 @@
     void seek(double time);
     void pause();
-    void resume();
 
     void loop(bool loop);
@@ -77 +76 @@
 
     double duration() const;
+    double reference();
 
     FFmpegDecoderAudio & audio_decoder();
@@ -109 +109 @@
 
     FormatContextPtr    m_format_context;
-    AVStream *            m_audio_stream;
-    AVStream *            m_video_stream;
+    AVStream *          m_audio_stream;
+    AVStream *          m_video_stream;
 
     int                 m_audio_index;
@@ -117 +117 @@
     FFmpegClocks        m_clocks;
     FFmpegPacket        m_pending_packet;
-    PacketQueue            m_audio_queue;
-    PacketQueue            m_video_queue;
+    PacketQueue         m_audio_queue;
+    PacketQueue         m_video_queue;
     
-    FFmpegDecoderAudio    m_audio_decoder;
-    FFmpegDecoderVideo    m_video_decoder;
+    FFmpegDecoderAudio  m_audio_decoder;
+    FFmpegDecoderVideo  m_video_decoder;
 
-    double                m_duration;
-    double                m_start;
+    double              m_duration;
+    double              m_start;
 
-    State                m_state;
+    State               m_state;
     bool                m_loop;
 };
@@ -149 +149 @@
 {
     return double(m_format_context->duration) / AV_TIME_BASE;    
+}
+
+inline double FFmpegDecoder::reference()
+{
+    return m_clocks.getCurrentTime();    
 }