Changeset 9846

Timestamp:

03/03/09 17:36:31 (4 years ago)

Author:

shuber

Message:

merging from trunk using

svn merge -r 9837:9843 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk

Location:

OpenSceneGraph/branches/osg-cocoa-dev

Files:

• . (modified) (1 prop)
• CMakeModules/FindFFmpeg.cmake (modified) (4 diffs)
• src/OpenThreads/win32 (modified) (1 prop)
• src/osgPlugins/ffmpeg/CMakeLists.txt (modified) (2 diffs)
• src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (modified) (2 diffs)
• src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp (modified) (1 diff)

OpenSceneGraph/branches/osg-cocoa-dev/CMakeModules/FindFFmpeg.cmake

@@ -1 @@
-# Locate gdal
+# Locate ffmpeg
 # This module defines
 # FFMPEG_LIBRARIES
-# FFMPEG_FOUND, if false, do not try to link to gdal 
+# FFMPEG_FOUND, if false, do not try to link to ffmpeg 
 # FFMPEG_INCLUDE_DIR, where to find the headers
 #
@@ -10 +10 @@
 # Created by Robert Osfield. 
 
-#use pkg-config to find various modues
+#use pkg-config to find various modes
 INCLUDE(FindPkgConfig OPTIONAL)
 
@@ -30 +30 @@
 
     SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS})
-    
+
+    SET(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBAVFORMAT_LIBRARY_DIRS})
+
     SET(FFMPEG_LIBRARIES
         ${FFMPEG_LIBAVFORMAT_LIBRARIES}
@@ -36 +38 @@
         ${FFMPEG_LIBAVCODEC_LIBRARIES}
         ${FFMPEG_LIBAVUTIL_LIBRARIES})
-    
+   
 ENDIF(FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND)
 

OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/CMakeLists.txt

@@ -2 +2 @@
 
 INCLUDE_DIRECTORIES( 
-    ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat
-    ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice
-    ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec
-    ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavcodec
+    ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/ffmpeg
+    ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/ffmpeg
+    ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/ffmpeg
+    ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavcodec ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/ffmpeg
 )
 
-MESSAGE("FFMPEG_INCLUDE_DIRS = "  ${FFMPEG_INCLUDE_DIRS} )
-MESSAGE("FFMPEG_LIBRARIES = "  ${FFMPEG_LIBRARIES} )
+# MESSAGE("FFMPEG_LIBAVFORMAT_INCLUDE_DIRS = "  ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} )
+# MESSAGE("FFMPEG_LIBAVDEVICE_INCLUDE_DIRS = "  ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} )
+# MESSAGE("FFMPEG_LIBAVCODEC_INCLUDE_DIRS = "  ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} )
+# MESSAGE("FFMPEG_LIBAVUTIL_INCLUDE_DIRS = "  ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} )
+# MESSAGE("FFMPEG_LIBRARIES = "  ${FFMPEG_LIBRARIES} )
 
 SET(TARGET_SRC 
@@ -31 +34 @@
 )
 
+LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS})
+
 SET(TARGET_EXTERNAL_LIBRARIES ${FFMPEG_LIBRARIES} )
 
 
 #### end var setup  ###
-SETUP_PLUGIN(ffmpeg)
+SETUP_PLUGIN(ffmpeg ffmpeg)

OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp

@@ -4 +4 @@
 
 
+#include "FFmpegHeaders.hpp"
 #include "BoundedMessageQueue.hpp"
 #include "FFmpegClocks.hpp"

OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp

@@ -7 +7 @@
 #include <OpenThreads/Condition>
 #include <OpenThreads/Thread>
-
-
-#ifdef _WIN32
-    #if defined OSG_LIBRARY_STATIC
-    #define OSGFFMPEG_EXPORT_API
-    #elif defined OSG_LIBRARY || defined osgFFmpeg_EXPORTS
-    #define OSGFFMPEG_EXPORT_API  __declspec(dllexport)
-    #else
-    #define OSGFFMPEG_EXPORT_API  __declspec(dllimport);
-    #endif
-#else
-    #define OSGFFMPEG_EXPORT_API
-#endif
-
-
 
 namespace osgFFmpeg
@@ -34 +19 @@
 
 
-    class OSGFFMPEG_EXPORT_API FFmpegImageStream : public osg::ImageStream, public OpenThreads::Thread
+    class FFmpegImageStream : public osg::ImageStream, public OpenThreads::Thread
     {
     public:

OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp

@@ -20 +20 @@
         supportsExtension("flv", "");
         supportsExtension("mov", "");
+        supportsExtension("ogg", "Theora movie format");
         supportsExtension("mpg", "Mpeg movie format");
         supportsExtension("mpv", "Mpeg movie format");