Changeset 10414

Timestamp:

06/25/09 18:02:23 (4 years ago)

Author:

robert

Message:

Fixed warnings and refactored FindFFmpeg.cmake and ffmpeg plugin CMakeLists.txt scripts to better handle different instation combinations

Location:

OpenSceneGraph/trunk

Files:

• CMakeModules/FindFFmpeg.cmake (modified) (2 diffs)
• src/osgPlugins/ffmpeg/CMakeLists.txt (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (modified) (1 diff)

OpenSceneGraph/trunk/CMakeModules/FindFFmpeg.cmake

@@ -27 +27 @@
     # old version of ffmpeg put header in $prefix/include/[ffmpeg]
     # so try to find header in include directory
-    FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS ${headername}
+
+    FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
         PATHS
-        ${FFMPEG_ROOT}/include/lib${shortname}
-        $ENV{FFMPEG_DIR}/include/lib${shortname}
-        ~/Library/Frameworks/lib${shortname}
-        /Library/Frameworks/lib${shortname}
-        /usr/local/include/lib${shortname}
-        /usr/include/lib${shortname}
-        /sw/include/lib${shortname} # Fink
-        /opt/local/include/lib${shortname} # DarwinPorts
-        /opt/csw/include/lib${shortname} # Blastwave
-        /opt/include/lib${shortname}
-        /usr/freeware/include/lib${shortname}
+        ${FFMPEG_ROOT}/include
+        $ENV{FFMPEG_DIR}/include
+        ~/Library/Frameworks
+        /Library/Frameworks
+        /usr/local/include
+        /usr/include
+        /sw/include # Fink
+        /opt/local/include # DarwinPorts
+        /opt/csw/include # Blastwave
+        /opt/include
+        /usr/freeware/include
         PATH_SUFFIXES ffmpeg
         DOC "Location of FFMPEG Headers"
@@ -132 +133 @@
     SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS})
 
+    SET(FFMPEG_INCLUDE_DIRS 
+        ${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}/libavutil
+    )
+
+    IF (${FFMPEG_STDINT_INCLUDE_DIR})
+        SET(FFMPEG_INCLUDE_DIRS
+            $PFFMPEG_INCLUDE_DIRS}
+            ${FFMPEG_STDINT_INCLUDE_DIR}/libavformat
+            ${FFMPEG_STDINT_INCLUDE_DIR}/libavdevice
+            ${FFMPEG_STDINT_INCLUDE_DIR}/libavcodec
+            ${FFMPEG_STDINT_INCLUDE_DIR}/libavutil
+        )
+    ENDIF()
+
+
     SET(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBAVFORMAT_LIBRARY_DIRS})
 

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/CMakeLists.txt

@@ -1 @@
-# INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} )
-
-
-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_STDINT_INCLUDE_DIR}
-)
-
+INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} )
 LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS})
-
 SET(TARGET_EXTERNAL_LIBRARIES ${FFMPEG_LIBRARIES} )
-
 
 

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

@@ -285 +285 @@
         if (m_packet.type == FFmpegPacket::PACKET_DATA)
         {
-            if (m_packet.packet.pts != AV_NOPTS_VALUE)
+            if (m_packet.packet.pts != int64_t(AV_NOPTS_VALUE))
             {
                 const double pts = av_q2d(m_stream->time_base) * m_packet.packet.pts;

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

@@ -168 +168 @@
             // Find out the frame pts
 
-            if (packet.packet.dts == AV_NOPTS_VALUE &&
+            if (packet.packet.dts == int64_t(AV_NOPTS_VALUE) &&
                 m_frame->opaque != 0 &&
-                *reinterpret_cast<const int64_t*>(m_frame->opaque) != AV_NOPTS_VALUE)
+                *reinterpret_cast<const int64_t*>(m_frame->opaque) != int64_t(AV_NOPTS_VALUE))
             {
                 pts = *reinterpret_cast<const int64_t*>(m_frame->opaque);
             }
-            else if (packet.packet.dts != AV_NOPTS_VALUE)
+            else if (packet.packet.dts != int64_t(AV_NOPTS_VALUE))
             {
                 pts = packet.packet.dts;