Changeset 9847

Timestamp:

03/03/09 17:51:01 (4 years ago)

Author:

robert

Message:

Introduce FFmpegAudioStream implementation

Location:

OpenSceneGraph/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• examples/osgmovie/CMakeLists.txt (modified) (1 diff)
• examples/osgmovie/osgmovie.cpp (modified) (3 diffs)
• include/osg/AudioStream (modified) (3 diffs)
• src/osg/AudioStream.cpp (modified) (1 diff)
• src/osgPlugins/CMakeLists.txt (modified) (1 diff)
• src/osgPlugins/ffmpeg/CMakeLists.txt (modified) (2 diffs)
• src/osgPlugins/ffmpeg/FFmpegAudioStream.cpp (added)
• src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp (added)
• src/osgPlugins/ffmpeg/FFmpegDecoder.hpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp (modified) (2 diffs)
• src/osgPlugins/ffmpeg/FFmpegImageStream.cpp (modified) (5 diffs)
• src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (modified) (3 diffs)

OpenSceneGraph/trunk/CMakeLists.txt

@@ -311 +311 @@
 FIND_PACKAGE(LibVNCServer)
 FIND_PACKAGE(OurDCMTK)
+FIND_PACKAGE(OpenAL)
 FIND_PACKAGE(XUL)
 FIND_PACKAGE(FFmpeg)

OpenSceneGraph/trunk/examples/osgmovie/CMakeLists.txt

@@ -1 @@
-#this file is automatically generated 
-
+# INCLUDE_DIRECTORIES( ${OPENAL_INCLUDE_DIR} )
 
 SET(TARGET_SRC osgmovie.cpp )
 SET(TARGET_ADDED_LIBRARIES osgGA )
+
+# SET(TARGET_EXTERNAL_LIBRARIES ${OPENAL_LIBRARY} alut)
+
 #### end var setup  ###
 SETUP_EXAMPLE(osgmovie)

OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

@@ -321 +321 @@
 }
 
+class CustomAudioSink : public osg::AudioSink
+{
+    public:
+    
+        CustomAudioSink(osg::AudioStream* audioStream):
+            _playing(false),
+            _audioStream(audioStream) {}
+        
+        virtual void startPlaying()
+        {
+            _playing = true; 
+            osg::notify(osg::NOTICE)<<"CustomAudioSink()::startPlaying()"<<std::endl;
+            
+            osg::notify(osg::NOTICE)<<"  audioFrequency()="<<_audioStream->audioFrequency()<<std::endl;
+            osg::notify(osg::NOTICE)<<"  audioNbChannels()="<<_audioStream->audioNbChannels()<<std::endl;
+            osg::notify(osg::NOTICE)<<"  audioSampleFormat()="<<_audioStream->audioSampleFormat()<<std::endl;
+            
+        }
+        virtual bool playing() const { return _playing; }
+
+        bool                                _playing;
+        osg::observer_ptr<osg::AudioStream> _audioStream;
+};
+
 int main(int argc, char** argv)
 {
@@ -426 +450 @@
 
     bool xyPlane = fullscreen;
+    
+    bool useOpenALAudio = false;
+    while(arguments.read("--OpenAL")) { useOpenALAudio = true; }
 
     for(int i=1;i<arguments.argc();++i)
@@ -433 +460 @@
             osg::Image* image = osgDB::readImageFile(arguments[i]);
             osg::ImageStream* imagestream = dynamic_cast<osg::ImageStream*>(image);
-            if (imagestream) imagestream->play();
+            if (imagestream) 
+            {
+                osg::ImageStream::AudioStreams& audioStreams = imagestream->getAudioStreams();
+                if (useOpenALAudio && !audioStreams.empty())
+                {
+                    osg::AudioStream* audioStream = audioStreams[0].get();
+                    osg::notify(osg::NOTICE)<<"AudioStream read ["<<audioStream->getName()<<"]"<<std::endl;
+                    audioStream->setAudioSink(new CustomAudioSink(audioStream));
+                }
+
+
+                imagestream->play();
+            }
 
             if (image)

OpenSceneGraph/trunk/include/osg/AudioStream

@@ -19 +19 @@
 namespace osg {
 
-/** Pure virtual AudioSinkInterface bass class that is used to connect the audio system with AudioStreams. */
-class OSG_EXPORT AudioSinkInterface : public osg::Object
+/** Pure virtual AudioSink bass class that is used to connect the audio system with AudioStreams. */
+class OSG_EXPORT AudioSink : public osg::Object
 {
 public:
 
-    AudioSinkInterface();
+    AudioSink();
 
     virtual void startPlaying() = 0;
@@ -37 +37 @@
 private:
 
-    virtual AudioSinkInterface * cloneType() const { return 0; }
-    virtual AudioSinkInterface * clone(const osg::CopyOp &) const { return 0; }
+    virtual AudioSink * cloneType() const { return 0; }
+    virtual AudioSink * clone(const osg::CopyOp &) const { return 0; }
 
     double  _delay;
@@ -56 +56 @@
         virtual const char* className() const { return "AudioStream"; }
 
-        virtual void setAudioSink(osg::AudioSinkInterface* audio_sink) = 0;
+        virtual void setAudioSink(osg::AudioSink* audio_sink) = 0;
         
         virtual void consumeAudioBuffer(void * const buffer, const size_t size) = 0;

OpenSceneGraph/trunk/src/osg/AudioStream.cpp

@@ -16 +16 @@
 using namespace osg;
 
-AudioSinkInterface::AudioSinkInterface() :
+AudioSink::AudioSink() :
     _delay(0.0)
 {

OpenSceneGraph/trunk/src/osgPlugins/CMakeLists.txt

@@ -201 +201 @@
 ENDIF(FFMPEG_FOUND)
 
+IF(OPENAL_FOUND)
+    ADD_SUBDIRECTORY(OpenAL)
+ENDIF(OPENAL_FOUND)
+
 IF(QUICKTIME_FOUND)
     ADD_SUBDIRECTORY(quicktime)

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/CMakeLists.txt

@@ -20 +20 @@
     FFmpegDecoderVideo.cpp
     FFmpegImageStream.cpp
+    FFmpegAudioStream.cpp
     ReaderWriterFFmpeg.cpp
 )
@@ -31 +32 @@
     FFmpegHeaders.hpp
     FFmpegPacket.hpp
+    FFmpegImageStream.hpp
+    FFmpegAudioStream.hpp
     MessageQueue.hpp
 )

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

@@ -57 +57 @@
 
 
-class FFmpegDecoder
+class FFmpegDecoder : public osg::Referenced
 {
 public:

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

@@ -107 +107 @@
 
 
-void FFmpegDecoderAudio::setAudioSink(osg::ref_ptr<osg::AudioSinkInterface> audio_sink)
+void FFmpegDecoderAudio::setAudioSink(osg::ref_ptr<osg::AudioSink> audio_sink)
 {
     // The FFmpegDecoderAudio object takes the responsability of destroying the audio_sink.
+    osg::notify(osg::NOTICE)<<"Assigning "<<audio_sink<<std::endl;
     m_audio_sink = audio_sink;
 }

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

@@ -32 +32 @@
     virtual void run();
 
-    void setAudioSink(osg::ref_ptr<osg::AudioSinkInterface> audio_sink);
+    void setAudioSink(osg::ref_ptr<osg::AudioSink> audio_sink);
     void fillBuffer(void * buffer, size_t size);
 
@@ -43 +43 @@
 
     //typedef boost::shared_ptr<AVFrame> FramePtr;
-    typedef osg::ref_ptr<osg::AudioSinkInterface> SinkPtr;
+    typedef osg::ref_ptr<osg::AudioSink> SinkPtr;
     typedef std::vector<uint8_t> Buffer;
 

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

@@ -1 +1 @@
 
 #include "FFmpegImageStream.hpp"
+#include "FFmpegAudioStream.hpp"
 
 #include <OpenThreads/ScopedLock>
 #include <osg/Notify>
-
-#include "FFmpegDecoder.hpp"
-#include "MessageQueue.hpp"
 
 #include <memory>
@@ -45 +43 @@
 
     delete m_commands;
-    delete m_decoder;
 }
 
@@ -64 +61 @@
     m_decoder->video_decoder().setUserData(this);
     m_decoder->video_decoder().setPublishCallback(publishNewFrame);
+    
+    if (m_decoder->audio_decoder().validContext())
+    {
+        osg::notify(osg::NOTICE)<<"Attaching FFmpegAudioStream"<<std::endl;
+    
+        getAudioStreams().push_back(new FFmpegAudioStream(m_decoder.get()));
+    }
 
     _status = PAUSED;
@@ -121 +125 @@
 
 
-
-void FFmpegImageStream::setAudioSink(osg::AudioSinkInterface* audio_sink)
-{ 
-    m_decoder->audio_decoder().setAudioSink(audio_sink); 
-}
-
-
-void FFmpegImageStream::consumeAudioBuffer(void * const buffer, const size_t size)
-{ 
-    m_decoder->audio_decoder().fillBuffer(buffer, size);
-}
-
-
-
 double FFmpegImageStream::duration() const
 { 
@@ -160 +150 @@
     return m_decoder->video_decoder().frameRate(); 
 }
-
-
-
-bool FFmpegImageStream::audioStream() const 
-{ 
-    return m_decoder->audio_decoder().validContext(); 
-}
-
-
-
-int FFmpegImageStream::audioFrequency() const 
-{ 
-    return m_decoder->audio_decoder().frequency(); 
-}
-
-
-
-int FFmpegImageStream::audioNbChannels() const 
-{ 
-    return m_decoder->audio_decoder().nbChannels();
-}
-
-
-
-osg::AudioStream::SampleFormat FFmpegImageStream::audioSampleFormat() const 
-{ 
-    return m_decoder->audio_decoder().sampleFormat(); 
-}
-
 
 

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

@@ -8 +8 @@
 #include <OpenThreads/Thread>
 
+#include "FFmpegDecoder.hpp"
+#include "MessageQueue.hpp"
+
 namespace osgFFmpeg
 {
 
-    class FFmpegDecoder;
-    class FFmpegDecoderAudio;
-    class FFmpegDecoderVideo;
-
     template <class T>
     class MessageQueue;
-
 
     class FFmpegImageStream : public osg::ImageStream, public OpenThreads::Thread
@@ -34 +32 @@
         virtual void rewind();
         virtual void quit(bool waitForThreadToExit = true);
-
-        virtual void setAudioSink(osg::AudioSinkInterface* audio_sink);
-        
-        void consumeAudioBuffer(void * const buffer, const size_t size);
-        
-        bool audioStream() const;
-        int audioFrequency() const;
-        int audioNbChannels() const;
-        osg::AudioStream::SampleFormat audioSampleFormat() const;
 
         double duration() const;
@@ -77 +66 @@
         static void publishNewFrame(const FFmpegDecoderVideo &, void * user_data);
 
-        FFmpegDecoder *    m_decoder;
+        osg::ref_ptr<FFmpegDecoder>    m_decoder;
         CommandQueue *    m_commands;