FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Stephan Huber, clean up of Quicktime plugin

Browse Source
This commit is contained in:
Robert Osfield
2009-03-13 15:56:19 +00:00
parent e153c9fbd8
commit 628990e0a4
5 changed files with 76 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/osgPlugins/quicktime/ReaderWriterQT.cpp
View File

@@ -131,11 +131,15 @@ public:
supportsExtension("m4v","Movie format");
supportsExtension("dv","Movie format");
supportsExtension("avi","Movie format");
supportsExtension("sdp","RTSP Movie format");
supportsExtension("flv","Movie format");
supportsExtension("swf","Movie format");
supportsExtension("3gp","Mobile movie format");
supportsExtension("live","Live video streaming");
supportsProtocol("http", "streaming media per http");
supportsProtocol("rtsp", "streaming media per rtsp");
#ifdef QT_HANDLE_IMAGES_ALSO
supportsExtension("jpg","jpg image format");
@@ -167,6 +171,7 @@ public:
osgDB::equalCaseInsensitive(extension,"m4v") ||
osgDB::equalCaseInsensitive(extension,"dv") ||
osgDB::equalCaseInsensitive(extension,"avi") ||
osgDB::equalCaseInsensitive(extension,"sdp") ||
osgDB::equalCaseInsensitive(extension,"flv") ||
osgDB::equalCaseInsensitive(extension,"swf") ||
osgDB::equalCaseInsensitive(extension,"3gp");
@@ -294,9 +299,10 @@ public:
}
// 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
// and before any image or movie is loaded.
@@ -308,6 +314,12 @@ public:
// if the file is a movie file then load as an ImageStream.
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
// the constructor to a seperate load method, and have a valid
@@ -321,7 +333,13 @@ public:
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;
std::ifstream is;