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

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)."

Browse Source
This commit is contained in:
Robert Osfield
2010-01-07 09:45:34 +00:00
parent 4352dee4ce
commit 3d4169689d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgPlugins/directshow/ReaderWriterDirectShow.cpp
View File

@@ -28,6 +28,11 @@ public:
ReaderWriterDirectShow()
{
supportsExtension("directshow", "");
supportsExtension("avi", "");
supportsExtension("wmv", "Windows Media Video format");
supportsExtension("mpg", "Mpeg movie format");
supportsExtension("mpeg", "Mpeg movie format");
}
virtual ~ReaderWriterDirectShow()
@@ -42,13 +47,15 @@ public:
virtual ReadResult readImage(const std::string & filename, const osgDB::ReaderWriter::Options * options) const
{
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);
}
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 :
osgDB::findDataFile(filename, options);