Changeset 9932 for OpenSceneGraph/trunk/src/osgPlugins/quicktime/ReaderWriterQT.cpp

Timestamp:

03/13/09 16:56:19 (4 years ago)

Author:

robert

Message:

From Stephan Huber, clean up of Quicktime plugin

Files:

• OpenSceneGraph/trunk/src/osgPlugins/quicktime/ReaderWriterQT.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/src/osgPlugins/quicktime/ReaderWriterQT.cpp

@@ -132 +132 @@
         supportsExtension("dv","Movie format");
         supportsExtension("avi","Movie format");
+        supportsExtension("sdp","RTSP Movie format");
         supportsExtension("flv","Movie format");
         supportsExtension("swf","Movie format");
@@ -137 +138 @@
 
         supportsExtension("live","Live video streaming");
+        
+        supportsProtocol("http", "streaming media per http");
+        supportsProtocol("rtsp", "streaming media per rtsp");
 
         #ifdef QT_HANDLE_IMAGES_ALSO
@@ -168 +172 @@
          osgDB::equalCaseInsensitive(extension,"dv")  ||
          osgDB::equalCaseInsensitive(extension,"avi") ||
+         osgDB::equalCaseInsensitive(extension,"sdp") ||
          osgDB::equalCaseInsensitive(extension,"flv") ||
          osgDB::equalCaseInsensitive(extension,"swf") ||
@@ -295 +300 @@
 
       // Not an encoded "live" psuedo file - so check a real file exists
-      std::string fileName = osgDB::findDataFile( file,  options);
-      if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
-
+      // only find the file if it isn't a URL
+      std::string fileName = file;
+      
+      
       // Note from Riccardo Corsi 
       // Quicktime initialization is done here, when a media is found
@@ -309 +315 @@
       if (acceptsMovieExtension(ext))
       {
+         // quicktime supports playing movies from URLs
+         if (!osgDB::containsServerAddress(fileName)) {
+             fileName = osgDB::findDataFile( file,  options);
+            if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
+         }
+         
          // note from Robert Osfield when integrating, we should probably have so
          // error handling mechanism here.  Possibly move the load from
@@ -322 +334 @@
          return moov;
       }
- 
+        
+        
+        // no live-video, no movie-file, so try to load as an image
+        
+        fileName = osgDB::findDataFile( file,  options);
+        if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
+            
         QuicktimeImportExport importer;