Changeset 9960

Timestamp:

03/23/09 17:45:10 (4 years ago)

Author:

robert

Message:

From Wang Rui, "Attached is a very small fix for the ffmpeg plugin, to build it without compiling errors on MSVC. The ffmpeg win32 pre-built tarball is downloaded at http://ffmpeg.arrozcru.org/builds/. Tested on Windows XP SP3 and Visual Studio 9, but don't know if it still workable for Unix and Mac users. :)

Please look at the .diff files for details. I have already enjoyed the latest Chinese *big* movie "Red Cliff" with the fixed ffmpeg plugin and osgmovie. :D"

Location:

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg

Files:

• FFmpegDecoderVideo.cpp (modified) (4 diffs)
• FFmpegDecoderVideo.hpp (modified) (1 diff)

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

@@ -234 +234 @@
 }
 
-int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, const AVPicture *src,
+int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, AVPicture *src,
             int src_pix_fmt, int src_width, int src_height)
 {
@@ -248 +248 @@
 
     osg::notify(osg::INFO)<<"Using sws_scale ";
-
+    
     int result =  sws_scale(m_swscale_ctx,
-                            (const uint8_t**)(src->data), (src->linesize), 0, src_height,
+                            (src->data), (src->linesize), 0, src_height,
                             (dst->data), (dst->linesize));
 #else
@@ -277 +277 @@
         return;
         
-    const AVPicture * const src = (const AVPicture *) m_frame.get();
+    AVPicture * const src = (AVPicture *) m_frame.get();
     AVPicture * const dst = (AVPicture *) m_frame_rgba.get();
 
@@ -313 +313 @@
 
 
-void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, const AVPicture * const src, int width, int height)
+void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const src, int width, int height)
 {
     convert(dst, PIX_FMT_RGB32, src, m_context->pix_fmt, width, height);

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

@@ -88 +88 @@
     void publishFrame(double delay);
     double synchronizeVideo(double pts);
-    void yuva420pToRgba(AVPicture *dst, const AVPicture *src, int width, int height);
+    void yuva420pToRgba(AVPicture *dst, AVPicture *src, int width, int height);
 
-    int convert(AVPicture *dst, int dst_pix_fmt, const AVPicture *src,
+    int convert(AVPicture *dst, int dst_pix_fmt, AVPicture *src,
                 int src_pix_fmt, int src_width, int src_height);