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

Timestamp:

02/11/09 18:14:53 (4 years ago)

Author:

robert

Message:

From Riccardo Corsi, "in attach you'll find a patch to cleanup a little bit the (de)initialization code of QuickTime? environment from the quickTime pluging.
It basically removes the static init() and exit() functions,and move them inside the observer class (the one that cleans everything up when the last media is unloaded).

It also add an extra check to clean up on exit if the QuickTime? env is initialized, but no media is succesfully loaded / written (it might happens with streaming resources).

I tested it under WinXP with zero, one and multiple videos.

Stephan reads in copy: could you kindly check if everything runs smooth under OSX as well? Also, have you got a chance to test it with streaming media?
"

Files:

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

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

@@ -37 +37 @@
 using namespace osg;
 
-// This class is used as a helper to de-initialize
-// properly quicktime, when the last media loaded 
-// with the quicktime plugin is released. 
-// All loaded media must be added to the observer 
-// (see ReaderWriterQT::readImage() function) 
-class QuicktimeExitObserver : public osg::Observer
-{
-public:
-
-   QuicktimeExitObserver () : _instanceCount(0)
-   {
-   }
-   virtual ~QuicktimeExitObserver()
-   {
-   };
-
-   void addMedia(Image* ptr)
-   {
-      ptr->addObserver(this);
-      ++ _instanceCount;
-   }
-   
-   virtual void objectDeleted(void*) 
-   {
-      -- _instanceCount;
-      if(_instanceCount== 0)
-         exitQuicktime();
-   }
-
-private:
-   unsigned int _instanceCount;
-};
-
-
 
 class ReaderWriterQT : public osgDB::ReaderWriter
 {
 public:
+
+
+    // This class is used as a helper to de-initialize
+    // properly quicktime, when the last media loaded 
+    // with the quicktime plugin is released. 
+    // All loaded media must be added to the observer 
+    // (see ReaderWriterQT::readImage() function) 
+    class QuicktimeInitializer : public osg::Observer
+    {
+    public:
+
+       QuicktimeInitializer (): 
+          _instanceCount(0),
+             _setup(false)
+          {}
+
+          virtual ~QuicktimeInitializer()
+          {
+             // When we get here, the exit() function 
+             // should have been called, when last media was released. 
+             // In case no media has been added after initialization, 
+             // let's perform an extra check
+             if (_setup && _instanceCount == 0)
+             {
+                exit();
+             }
+          };
+
+          void addMedia(Image* ptr)
+          {
+             ptr->addObserver(this);
+             ++ _instanceCount;
+          }
+
+          virtual void objectDeleted(void*) 
+          {
+             -- _instanceCount;
+             if(_instanceCount== 0)
+                exit();
+          }
+
+          void init()
+          {
+             if (!_setup)
+             {
+                #ifndef __APPLE__
+                InitializeQTML(0);
+                #endif
+
+                OSErr err = EnterMovies();
+                if (err!=0)
+                   osg::notify(osg::FATAL) << "Error while initializing quicktime: " << err << std::endl; 
+                else
+                   osg::notify(osg::DEBUG_INFO) << "Quicktime initialized successfully"  << std::endl;            
+
+                _setup = true;            
+             }
+          }
+
+          void exit()
+          {
+             #ifndef __APPLE__
+             ExitMovies();
+             #endif
+
+             _setup = false;
+          }
+
+    private:
+       unsigned int _instanceCount;
+       bool _setup;
+
+    };
+
+
+
+
+
     ReaderWriterQT::ReaderWriterQT()
     {
+
+       registerQtReader();
+
+
         supportsExtension("mov","Movie format");
         supportsExtension("mpg","Movie format");
@@ -229 +277 @@
                   // and before any image or movie is loaded. 
                   // After the first call the function does nothing. 
-                  // The cleaning up is left to the QuicktimeExitObserver (see below)
-                  initQuicktime();
+                  // The cleaning up is left to the QuicktimeInitializer (see below)
+                  _qtExitObserver.init();
+
                   //
                   QuicktimeLiveImageStream* p_qt_image_stream = new QuicktimeLiveImageStream(osgDB::getNameLessExtension(file));
@@ -253 +302 @@
       // and before any image or movie is loaded. 
       // After the first call the function does nothing. 
-      // The cleaning up is left to the QuicktimeExitObserver (see below)
-      initQuicktime();
+      // The cleaning up is left to the QuicktimeInitializer (see below)
+      _qtExitObserver.init();
 
 
@@ -317 +366 @@
             }
         }
+
+        _qtExitObserver.init();
         
         QuicktimeImportExport importer;
@@ -335 +386 @@
         if (!acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED;
 
-        initQuicktime();
+        _qtExitObserver.init();
 
         //Buidl map  of extension <-> osFileTypes
@@ -387 +438 @@
         }
         
+        _qtExitObserver.init();
+
         QuicktimeImportExport exporter;
         exporter.writeToStream(os, const_cast<osg::Image*>(&img), filename);
@@ -396 +449 @@
     }
 
-
-    mutable QuicktimeExitObserver _qtExitObserver;
+protected:
+
+   //internal utils
+   void registerQtReader() const
+   {
+      osgDB::Registry* r = osgDB::Registry::instance();
+      r->addFileExtensionAlias("mov",  "qt");
+
+      #ifdef QT_HANDLE_IMAGES_ALSO
+      r->addFileExtensionAlias("jpg",  "qt");
+      r->addFileExtensionAlias("jpe",  "qt");
+      r->addFileExtensionAlias("jpeg", "qt");
+      r->addFileExtensionAlias("tif",  "qt");
+      r->addFileExtensionAlias("tiff", "qt");
+      r->addFileExtensionAlias("gif",  "qt");
+      r->addFileExtensionAlias("png",  "qt");
+      r->addFileExtensionAlias("psd",  "qt");
+      r->addFileExtensionAlias("tga",  "qt");
+      r->addFileExtensionAlias("mov",  "qt");
+      r->addFileExtensionAlias("avi",  "qt");
+      r->addFileExtensionAlias("mpg",  "qt");
+      r->addFileExtensionAlias("mpv",  "qt");
+      r->addFileExtensionAlias("dv",   "qt");
+      r->addFileExtensionAlias("mp4",  "qt");
+      r->addFileExtensionAlias("m4v",  "qt");         
+      #endif
+   }
+
+    mutable QuicktimeInitializer _qtExitObserver;
 };