Changeset 10030

Timestamp:

04/11/09 08:16:37 (4 years ago)

Author:

robert

Message:

From Jean Sebastien Guay, added error reporting handling of wider range of video formats.

Location:

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg

Files:

• FFmpegDecoder.cpp (modified) (3 diffs)
• FFmpegHeaders.hpp (modified) (1 diff)
• ReaderWriterFFmpeg.cpp (modified) (1 diff)

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

@@ -3 +3 @@
 
 #include <osg/Notify>
+#include <osgDB/FileNameUtils>
 
 #include <cassert>
@@ -8 +9 @@
 #include <stdexcept>
 #include <string.h>
-
+#include <iostream>
 
 
@@ -65 +66 @@
             formatParams.time_base.den = 30;
 
-            iformat = av_find_input_format("video4linux2");
+            std::string format = "video4linux2";
+            iformat = av_find_input_format(format.c_str());
             
             if (iformat)
             {
-                osg::notify(osg::NOTICE)<<"Found input format"<<std::endl;
+                osg::notify(osg::NOTICE)<<"Found input format: "<<format<<std::endl;
             }
             else
             {
-                osg::notify(osg::NOTICE)<<"Failed to find input_format"<<std::endl;
-            }
-
-            if (av_open_input_file(&p_format_context, filename.c_str(), iformat, 0, &formatParams) != 0)
-                throw std::runtime_error("av_open_input_file() failed");
+                osg::notify(osg::NOTICE)<<"Failed to find input format: "<<format<<std::endl;
+            }
+
+            int error = av_open_input_file(&p_format_context, filename.c_str(), iformat, 0, &formatParams);
+            if (error != 0)
+            {
+                std::string error_str;
+                switch (error)
+                {
+                    //case AVERROR_UNKNOWN: error_str = "AVERROR_UNKNOWN"; break;   // same value as AVERROR_INVALIDDATA
+                    case AVERROR_IO: error_str = "AVERROR_IO"; break;
+                    case AVERROR_NUMEXPECTED: error_str = "AVERROR_NUMEXPECTED"; break;
+                    case AVERROR_INVALIDDATA: error_str = "AVERROR_INVALIDDATA"; break;
+                    case AVERROR_NOMEM: error_str = "AVERROR_NOMEM"; break;
+                    case AVERROR_NOFMT: error_str = "AVERROR_NOFMT"; break;
+                    case AVERROR_NOTSUPP: error_str = "AVERROR_NOTSUPP"; break;
+                    case AVERROR_NOENT: error_str = "AVERROR_NOENT"; break;
+                    case AVERROR_PATCHWELCOME: error_str = "AVERROR_PATCHWELCOME"; break;
+                    default: error_str = "Unknown error"; break;
+                }
+
+                throw std::runtime_error("av_open_input_file() failed : " + error_str);
+            }
         }
         else

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

@@ -7 +7 @@
 {
 #define __STDC_CONSTANT_MACROS
+#ifdef WIN32
+#include <errno.h>    // for error codes defined in avformat.h
+#endif
 #include <stdint.h>
 #include <avcodec.h>

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

@@ -30 +30 @@
     {
         supportsProtocol("http","Read video/audio from http using ffmpeg.");
+        supportsProtocol("rtsp","Read video/audio from rtsp using ffmpeg.");
 
         supportsExtension("ffmpeg", "");
-        supportsExtension("avi", "");
-        supportsExtension("flv", "");
-        supportsExtension("mov", "");
-        supportsExtension("ogg", "Theora movie format");
-        supportsExtension("mpg", "Mpeg movie format");
-        supportsExtension("mpv", "Mpeg movie format");
-        supportsExtension("wmv", "Windows Media Video format");
-        supportsExtension("mkv", "Matroska");
+        supportsExtension("avi",    "");
+        supportsExtension("flv",    "Flash video");
+        supportsExtension("mov",    "Quicktime");
+        supportsExtension("ogg",    "Theora movie format");
+        supportsExtension("mpg",    "Mpeg movie format");
+        supportsExtension("mpv",    "Mpeg movie format");
+        supportsExtension("wmv",    "Windows Media Video format");
+        supportsExtension("mkv",    "Matroska");
+        supportsExtension("mjpeg",  "Motion JPEG");
+        supportsExtension("mp4",    "MPEG-4");
+        supportsExtension("sav",    "MPEG-4");
+        supportsExtension("3gp",    "MPEG-4");
+        supportsExtension("sdp",    "MPEG-4");
 
         // Register all FFmpeg formats/codecs