Changeset 10922 for OpenSceneGraph/trunk/src/osgPlugins/directshow/ReaderWriterDirectShow.cpp

Timestamp:

01/07/10 10:45:34 (3 years ago)

Author:

robert

Message:

From Serge Lages, "Here is a modified fix. It doesn't break the other patch for this plugin as they are for different files. I've only added the file formats handled by default with DirectShow? (based on its Wikipedia page)."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/directshow/ReaderWriterDirectShow.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgPlugins/directshow/ReaderWriterDirectShow.cpp

@@ -29 +29 @@
     ReaderWriterDirectShow()
     {
+        supportsExtension("directshow", "");
+        supportsExtension("avi",    "");
+        supportsExtension("wmv",    "Windows Media Video format");
+        supportsExtension("mpg",    "Mpeg movie format");
+        supportsExtension("mpeg",   "Mpeg movie format");
     }
 
@@ -43 +48 @@
     {
         const std::string ext = osgDB::getLowerCaseFileExtension(filename);
-        if (ext=="directshow") return readImage(osgDB::getNameLessExtension(filename),options);
+        if (ext=="directshow") return readImageStream(osgDB::getNameLessExtension(filename),options);
+        if (! acceptsExtension(ext))
+            return ReadResult::FILE_NOT_HANDLED;
         return readImageStream(filename, options);
     }
@@ -49 +56 @@
     ReadResult readImageStream(const std::string& filename, const osgDB::ReaderWriter::Options * options) const
     {
-        osg::notify(osg::INFO) << "ReaderWriterFFmpeg::readImage " << filename << std::endl;
+        osg::notify(osg::INFO) << "ReaderWriterDirectShow::readImage " << filename << std::endl;
         const std::string path = osgDB::containsServerAddress(filename) ?
             filename :