Changeset 9910 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.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/FFmpegDecoderVideo.cpp (modified) (1 diff)

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