Changeset 10851 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.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/FFmpegDecoderAudio.hpp (modified) (3 diffs)

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

@@ -4 +4 @@
 
 #include <OpenThreads/Thread>
+
+#include <osg/Timer>
 
 #include "FFmpegClocks.hpp"
@@ -30 +32 @@
 
     void open(AVStream * stream);
+    void pause(bool pause);
     void close(bool waitForThreadToExit);
     
@@ -52 +55 @@
 
 
-    PacketQueue &        m_packets;
-    FFmpegClocks &        m_clocks;
-    AVStream *            m_stream;
-    AVCodecContext *    m_context;
-    FFmpegPacket        m_packet;
-    const uint8_t *        m_packet_data;
-    int                    m_bytes_remaining;
+    PacketQueue &                       m_packets;
+    FFmpegClocks &                      m_clocks;
+    AVStream *                          m_stream;
+    AVCodecContext *                    m_context;
+    FFmpegPacket                        m_packet;
+    const uint8_t *                     m_packet_data;
+    int                                 m_bytes_remaining;
 
-    Buffer                m_audio_buffer;
-    size_t                m_audio_buf_size;
-    size_t                m_audio_buf_index;
+    Buffer                              m_audio_buffer;
+    size_t                              m_audio_buf_size;
+    size_t                              m_audio_buf_index;
 
-    int                    m_frequency;
-    int                    m_nb_channels;
-    osg::AudioStream::SampleFormat    m_sample_format;
+    int                                 m_frequency;
+    int                                 m_nb_channels;
+    osg::AudioStream::SampleFormat      m_sample_format;
 
-    SinkPtr                m_audio_sink;
+    SinkPtr                             m_audio_sink;
 
-    bool                m_end_of_stream;
-    volatile bool        m_exit;
+    osg::Timer                          m_pause_timer;
+
+    bool                                m_end_of_stream;
+    bool                                m_paused;
+    volatile bool                       m_exit;
 };