Changeset 9910 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp

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()

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp (modified) (4 diffs)

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(); 
-}