Changeset 10161 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp

Timestamp:

05/08/09 09:46:46 (4 years ago)

Author:

robert

Message:

From Jean-Sebastien Guay, changed the timing control for when no audio layer is supplied.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (modified) (3 diffs)

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

@@ -191 +191 @@
                 const double frame_delay = m_clocks.videoRefreshSchedule(synched_pts);
 
-                publishFrame(frame_delay);
+                publishFrame(frame_delay, m_clocks.audioDisabled());
             }
         }
@@ -269 +269 @@
 
 
-void FFmpegDecoderVideo::publishFrame(const double delay)
+void FFmpegDecoderVideo::publishFrame(const double delay, bool audio_disabled)
 {
     // If no publishing function, just ignore the frame
@@ -275 +275 @@
         return;
 
+#if 1
+    // new code from Jean-Sebasiten Guay - needs testing as we're unclear on the best solution
+    // If the display delay is too small, we better skip the frame.
+    if (!audio_disabled && delay < -0.010)
+        return;
+#else
+    // original solution that hung on video stream over web.
     // If the display delay is too small, we better skip the frame.
     if (delay < -0.010)
         return;
-        
+#endif
+
     AVPicture * const src = (AVPicture *) m_frame.get();
     AVPicture * const dst = (AVPicture *) m_frame_rgba.get();