Changeset 9910

Timestamp:

03/11/09 16:12:46 (4 years ago)

Author:

robert

Message:

From Tanguy Fautre,

Clean up of the FFmpeg plugin's class API/AudioStream API.
Implementation of isImageTransparent().
Implementation of Image:g/setPixelAspectRatio()

Location:

OpenSceneGraph/trunk

Files:

• include/osg/AudioStream (modified) (1 diff)
• include/osg/Image (modified) (2 diffs)
• include/osg/ImageStream (modified) (2 diffs)
• src/osg/Image.cpp (modified) (2 diffs)
• src/osgPlugins/ffmpeg/FFmpegAudioStream.cpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegAudioStream.hpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp (modified) (3 diffs)
• src/osgPlugins/ffmpeg/FFmpegImageStream.cpp (modified) (4 diffs)
• src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/AudioStream

@@ -60 +60 @@
         virtual void consumeAudioBuffer(void * const buffer, const size_t size) = 0;
         
-        virtual bool audioStream() const = 0;
         virtual int audioFrequency() const = 0;
         virtual int audioNbChannels() const = 0;

OpenSceneGraph/trunk/include/osg/Image

@@ -186 +186 @@
         void setPacking(unsigned int packing) { _packing = packing; }
         inline unsigned int getPacking() const { return _packing; }
+
+        inline void setPixelAspectRatio(float pixelAspectRatio) { _pixelAspectRatio = pixelAspectRatio; }
+        inline float getPixelAspectRatio() const { return _pixelAspectRatio; }
         
         /** Return the number of bits required for each pixel. */
@@ -347 +350 @@
         GLenum _dataType;
         unsigned int _packing;
+        float _pixelAspectRatio;
 
         AllocationMode _allocationMode;

OpenSceneGraph/trunk/include/osg/ImageStream

@@ -79 +79 @@
 
         virtual double getLength() const { return 0.0; }
-        
+        virtual double getFrameRate() const { return 0.0; } 
+
         virtual void setReferenceTime(double) {}
         virtual double getReferenceTime() const { return 0.0; }
@@ -88 +89 @@
         virtual void setVolume(float) {}
         virtual float getVolume() const { return 0.0f; }
-
 
         typedef std::vector< osg::ref_ptr<osg::AudioStream> > AudioStreams;

OpenSceneGraph/trunk/src/osg/Image.cpp

@@ -34 +34 @@
 
 Image::Image()
-    :Object(true)
+    :Object(true),
+    _fileName(""),
+    _writeHint(NO_PREFERENCE),
+    _origin(BOTTOM_LEFT),
+    _s(0), _t(0), _r(0),
+    _internalTextureFormat(0),
+    _pixelFormat(0),
+    _dataType(0),
+    _packing(4),
+    _pixelAspectRatio(1.0),
+    _allocationMode(USE_NEW_DELETE),
+    _data(0L),
+    _modifiedCount(0)
 {
     setDataVariance(STATIC); 
-
-    _fileName               = "";
-    _writeHint              = NO_PREFERENCE;
-    _origin                 = BOTTOM_LEFT;
-    _s = _t = _r            = 0;
-    _internalTextureFormat  = 0;
-    _pixelFormat            = (unsigned int)0;
-    _dataType               = (unsigned int)0;
-    _packing                = 4;
-
-    _allocationMode         = USE_NEW_DELETE;
-    _data                   = (unsigned char *)0L;
-
-    _modifiedCount = 0;
 }
 
@@ -63 +61 @@
     _dataType(image._dataType),
     _packing(image._packing),
+    _pixelAspectRatio(image._pixelAspectRatio),
     _data(0L),
     _modifiedCount(image._modifiedCount),

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

@@ -52 +52 @@
 
 
-bool FFmpegAudioStream::audioStream() const 
-{ 
-    return m_decoder->audio_decoder().validContext(); 
-}
-
-
 
 int FFmpegAudioStream::audioFrequency() const 

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

@@ -22 +22 @@
         void consumeAudioBuffer(void * const buffer, const size_t size);
         
-        bool audioStream() const;
         int audioFrequency() const;
         int audioNbChannels() const;

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

@@ -131 +131 @@
 void FFmpegDecoderAudio::fillBuffer(void * const buffer, size_t size)
 {
-    size_t filled = 0;
     uint8_t * dst_buffer = reinterpret_cast<uint8_t*>(buffer);
 

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

@@ -223 +223 @@
 void FFmpegDecoderVideo::findAspectRatio()
 {
-    double ratio = 0.0;
+    float ratio = 0.0f;
 
     if (m_context->sample_aspect_ratio.num != 0)
-        ratio = (av_q2d(m_context->sample_aspect_ratio) * m_width) / m_height;
-
-    if (ratio <= 0.0)
-        ratio = double(m_width) / double(m_height);
-
-    m_aspect_ratio = ratio;
+        ratio = float(av_q2d(m_context->sample_aspect_ratio));
+
+    if (ratio <= 0.0f)
+        ratio = 1.0f;
+
+    m_pixel_aspect_ratio = ratio;
 }
 

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

@@ -75 +75 @@
     int width() const;
     int height() const;
-    double aspectRatio() const;
+    float pixelAspectRatio() const;
     bool alphaChannel() const;
     double frameRate() const;
@@ -115 +115 @@
 
     double                  m_frame_rate;
-    double                  m_aspect_ratio;
+    float                   m_pixel_aspect_ratio;
     int                     m_width;
     int                     m_height;
@@ -156 +156 @@
 
 
-inline double FFmpegDecoderVideo::aspectRatio() const
+inline float FFmpegDecoderVideo::pixelAspectRatio() const
 {
-    return m_aspect_ratio;
+    return m_pixel_aspect_ratio;
 }
 

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

@@ -19 +19 @@
     m_frame_published_flag(false)
 {
-    setOrigin(osg::Image::BOTTOM_LEFT);
+    setOrigin(osg::Image::TOP_LEFT);
 
     std::auto_ptr<FFmpegDecoder> decoder(new FFmpegDecoder);
@@ -72 +72 @@
         const_cast<unsigned char *>(m_decoder->video_decoder().image()), NO_DELETE
     );
-    
-    setOrigin(osg::Image::TOP_LEFT);
-
+
+    setPixelAspectRatio(m_decoder->video_decoder().pixelAspectRatio());
+    
     m_decoder->video_decoder().setUserData(this);
     m_decoder->video_decoder().setPublishCallback(publishNewFrame);
@@ -141 +141 @@
 
 
-double FFmpegImageStream::duration() const
+double FFmpegImageStream::getLength() const
 { 
     return m_decoder->duration(); 
@@ -148 +148 @@
 
 
-bool FFmpegImageStream::videoAlphaChannel() const 
+double FFmpegImageStream::getFrameRate() const
+{ 
+    return m_decoder->video_decoder().frameRate(); 
+}
+
+
+
+bool FFmpegImageStream::isImageTranslucent() const 
 { 
     return m_decoder->video_decoder().alphaChannel(); 
 }
 
-
-
-double FFmpegImageStream::videoAspectRatio() const
-{ 
-    return m_decoder->video_decoder().aspectRatio();
-}
-
-
-
-double FFmpegImageStream::videoFrameRate() const
-{ 
-    return m_decoder->video_decoder().frameRate(); 
-}
 
 

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

@@ -33 +33 @@
         virtual void quit(bool waitForThreadToExit = true);
 
-        double duration() const;
+        virtual double getLength() const;
+        virtual double getFrameRate() const;
 
-        bool videoAlphaChannel() const;
-        double videoAspectRatio() const;
-        double videoFrameRate() const;
-
+        virtual bool isImageTranslucent() const;
 
     private: