Changeset 13173

Timestamp:

05/24/13 19:16:57 (6 hours ago)

Author:

robert

Message:

Resrtuctured the use of static's in the Uniform::getNameID() method to avoid problems under Android.

Location:

OpenSceneGraph/trunk

Files:

• include/osg/ImageStream (modified) (2 diffs)
• src/osgPlugins/QTKit/OSXCoreVideoTexture.cpp (modified) (1 diff)
• src/osgPlugins/QTKit/OSXQTKitVideo.h (modified) (1 diff)
• src/osgPlugins/QTKit/OSXQTKitVideo.mm (modified) (5 diffs)
• src/osgPlugins/QTKit/ReaderWriterQTKit.cpp (modified) (2 diffs)
• src/osgPlugins/avfoundation/OSXAVFoundationVideo.h (modified) (2 diffs)
• src/osgPlugins/avfoundation/OSXAVFoundationVideo.mm (modified) (14 diffs)
• src/osgPlugins/avfoundation/ReaderWriterAVFoundation.cpp (modified) (2 diffs)
• src/osgPlugins/imageio/ReaderWriterImageIO.cpp (modified) (1 diff)
• src/osgPresentation/SlideShowConstructor.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/include/osg/ImageStream

@@ -19 +19 @@
 
 namespace osg {
+
+// forward declare of osg::Texture
+class Texture;
 
 /**
@@ -99 +102 @@
         AudioStreams& getAudioStreams() { return _audioStreams; }
         const AudioStreams& getAudioStreams() const { return _audioStreams; }
-
-
+        
+        /** create a suitable texture for this imagestream, return NULL, if not supported
+         *  implement this method in subclasses to use special technologies like CoreVideo
+         *  or similar.
+         */
+        virtual osg::Texture* createSuitableTexture() { return NULL; }
+        
     protected:
         virtual void applyLoopingMode() {}

OpenSceneGraph/trunk/src/osgPlugins/QTKit/OSXCoreVideoTexture.cpp

@@ -139 +139 @@
             _adapter = new OSXCoreVideoAdapter(state, _image.get());
     }
+    
     _adapter->getFrame();
     _textureTarget = _adapter->getTextureTarget();
-
     glBindTexture(_textureTarget, _adapter->getTextureName());
 }

OpenSceneGraph/trunk/src/osgPlugins/QTKit/OSXQTKitVideo.h

@@ -82 +82 @@
     }
     
+    static void initializeQTKit();
+    
+    virtual osg::Texture* createSuitableTexture();
+    
 protected:
     

OpenSceneGraph/trunk/src/osgPlugins/QTKit/OSXQTKitVideo.mm

@@ -20 +20 @@
 #include "OSXQTKitVideo.h"
 #include "OSXCoreVideoAdapter.h"
+#include "OSXCoreVideoTexture.h"
 
 namespace {
@@ -89 +90 @@
 
 
+void OSXQTKitVideo::initializeQTKit()
+{
+    static bool inited(false);
+    if (!inited)
+    {
+        inited = true;
+        // force initialization of QTKit on the main-thread!
+        if (![NSThread isMainThread]) {
+            dispatch_apply(1, dispatch_get_main_queue(), ^(size_t n) {
+                EnterMovies();
+                QTMovie* movie = [QTMovie movie];
+                // release missing by intent, gets released by the block!
+            });
+        }
+        else
+        {
+            EnterMovies();
+            QTMovie* movie = [QTMovie movie];
+            [movie release];
+        }
+    }
+}
+
 
 OSXQTKitVideo::OSXQTKitVideo()
@@ -95 +119 @@
     , _coreVideoAdapter(NULL)
 {
+    initializeQTKit();
+    
     _status = INVALID;
     _data = new Data();
@@ -212 +238 @@
     applyLoopingMode();
     
-     _waitForFirstFrame = true;
+    _waitForFirstFrame = true;
     requestNewFrame(true);
-
+    _fileName = file_name;
     _status = (valid) ? PAUSED : INVALID;
 }
@@ -368 +394 @@
     }
 }
- 
+
+
+osg::Texture* OSXQTKitVideo::createSuitableTexture()
+{
+    return new OSXCoreVideoTexture(this);
+}

OpenSceneGraph/trunk/src/osgPlugins/QTKit/ReaderWriterQTKit.cpp

@@ -68 +68 @@
             supportsOption("disableCoreVideo", "disable the usage of coreVideo when using readObjectFile, returns an ImageStream instead");
             supportsOption("disableMultiThreadedFrameDispatching", "disable the usage of the multithreade VideoFrameDispatcher to decode video frames");
-                      
+            
         }
         
@@ -95 +95 @@
                 if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
             }
+            
+            static OpenThreads::Mutex mutex;
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mutex);
 
             OSG_INFO<<"ReaderWriterQTKit::readImage "<< fileName<< std::endl;

OpenSceneGraph/trunk/src/osgPlugins/avfoundation/OSXAVFoundationVideo.h

@@ -58 +58 @@
     virtual void seek(double pos);
     
+    virtual void rewind() {
+        seek(0);
+    }
+    
       
     /// returns the current playing position
@@ -92 +96 @@
     void lazyInitCoreVideoTextureCache(osg::State& state);
     bool getCurrentCoreVideoTexture(GLenum& target, GLint& name, int& width, int& height) const;
+    
+    virtual osg::Texture* createSuitableTexture();
+
 protected:
    

OpenSceneGraph/trunk/src/osgPlugins/avfoundation/OSXAVFoundationVideo.mm

@@ -4 +4 @@
 #include <osgViewer/api/Cocoa/GraphicsWindowCocoa>
 #include <iostream>
+#include <deque>
 
 #import <AVFoundation/AVFoundation.h>
 #import <Cocoa/Cocoa.h>
 
+#include "OSXAVFoundationCoreVideoTexture.h"
 
 
@@ -100 +102 @@
 public:
     AVPlayer* avplayer;
-    AVPlayerItem* avplayeritem;
     AVPlayerItemVideoOutput* output;
     OSXAVFoundationVideoDelegate* delegate;
@@ -109 +110 @@
     Data()
         : avplayer(NULL)
-        , avplayeritem(NULL)
         , output(NULL)
         , delegate(NULL)
@@ -118 +118 @@
     {
     }
+    
+    void clear()
+    {
+        if (delegate) {
+            [[NSNotificationCenter defaultCenter] removeObserver: delegate
+                name:AVPlayerItemDidPlayToEndTimeNotification
+                object:avplayer.currentItem
+            ];
+            [delegate release];
+        }
+        
+        if (avplayer) {
+            [avplayer cancelPendingPrerolls];
+            [avplayer.currentItem.asset cancelLoading];
+            [avplayer.currentItem removeOutput:output];
+        }
+        
+        [output release];
+        [avplayer release];
+        
+        
+        avplayer = NULL;
+        output = NULL;
+        delegate = NULL;
+    }
+    
     ~Data() {
-        [output release];
-        [avplayeritem release];
-        [avplayer release];
-        
-        [delegate release];
+        
+        clear();
         
         for(unsigned int i=0; i< lastFrames.size(); ++i)
@@ -138 +161 @@
             coreVideoTextureCache = NULL;
         }
-        output = NULL;
-        avplayer = NULL;
-        avplayeritem = NULL;
-        delegate = NULL;
     }
     
@@ -189 +208 @@
     _status = INVALID;
     setOrigin(TOP_LEFT);
+    
+    // std::cout << " OSXAVFoundationVideo " << this << std::endl;
 }
 
@@ -194 +215 @@
 OSXAVFoundationVideo::~OSXAVFoundationVideo()
 {
+    // std::cout << "~OSXAVFoundationVideo " << this << " " << _data->avplayer << std::endl;
     quit();
+    clear();
     if (_data)
         delete _data;
@@ -227 +250 @@
 void OSXAVFoundationVideo::pause()
 {
+    setNeedsDispatching(StopUpdate);
+    
+    NSAutoreleasePoolHelper helper;
+
     if (_data->avplayer) {
         [_data->avplayer pause];
         _status = PAUSED;
-        setNeedsDispatching(StopUpdate);
     }
 }
@@ -237 +263 @@
 void OSXAVFoundationVideo::clear()
 {
-    [_data->output release];
-    [_data->avplayeritem release];
-    [_data->avplayer release];
-    
-    if (_data->delegate) {
-        [[NSNotificationCenter defaultCenter] removeObserver: _data->delegate
-            name:AVPlayerItemDidPlayToEndTimeNotification
-            object:[_data->avplayer currentItem]
-        ];
-    }
-    
-    [_data->delegate release];
-    
-    _data->output = NULL;
-    _data->avplayer = NULL;
-    _data->avplayeritem = NULL;
-    _data->delegate = NULL;
+    if (_data)
+        _data->clear();
 }
 
@@ -278 +289 @@
 void OSXAVFoundationVideo::open(const std::string& filename)
 {
+    NSAutoreleasePoolHelper helper;
+    
     clear();
     
@@ -304 +317 @@
     }
     
-    _data->avplayeritem = [[AVPlayerItem alloc] initWithURL: url];
-    _data->avplayer = [AVPlayer playerWithPlayerItem: _data->avplayeritem];
+    _data->avplayer = [AVPlayer playerWithURL: url]; // AVPlayerFactory::instance()->getOrCreate(url);
+    [_data->avplayer retain];
+    
     _data->avplayer.actionAtItemEnd = AVPlayerActionAtItemEndNone;
     
-    [[_data->avplayer currentItem] addOutput:_data->output];
+    [_data->avplayer.currentItem addOutput:_data->output];
+    
     
     [[NSNotificationCenter defaultCenter] addObserver: _data->delegate
         selector:@selector(playerItemDidReachEnd:)
         name:AVPlayerItemDidPlayToEndTimeNotification
-        object:[_data->avplayer currentItem]];
-    
-    _videoDuration = CMTimeGetSeconds([[_data->avplayer currentItem] duration]);
+        object:_data->avplayer.currentItem];
+    
+    
+    _videoDuration = CMTimeGetSeconds([_data->avplayer.currentItem duration]);
     
     // get the max size of the video-tracks
-    NSArray* tracks = [_data->avplayeritem.asset tracksWithMediaType: AVMediaTypeVideo];
+    NSArray* tracks = [_data->avplayer.currentItem.asset tracksWithMediaType: AVMediaTypeVideo];
     CGSize size;
     for(unsigned int i=0; i < [tracks count]; ++i)
@@ -330 +346 @@
     _t = size.height;
     _r = 1;
-    
+    unsigned char* buffer = (unsigned char*)calloc(_s*_t*4, 1);
+    setImage(_s, _t, 1, GL_RGBA, GL_BGRA, GL_UNSIGNED_BYTE, buffer, USE_MALLOC_FREE);
+    
+    _fileName = filename;
+        
     requestNewFrame();
     
@@ -345 +365 @@
 void OSXAVFoundationVideo::setVolume(float v)
 {
+    NSAutoreleasePoolHelper helper;
     _volume = v;
     if (_data->avplayer)
@@ -512 +533 @@
     }
 }
-    
+
+
+osg::Texture* OSXAVFoundationVideo::createSuitableTexture()
+{
+    return NULL; // new OSXAVFoundationCoreVideoTexture(this);
+}
+
+    

OpenSceneGraph/trunk/src/osgPlugins/avfoundation/ReaderWriterAVFoundation.cpp

@@ -60 +60 @@
                 if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
             }
-
+            
+            static OpenThreads::Mutex mutex;
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mutex);
+            
             OSG_INFO<<"ReaderWriterAVFoundation::readImage "<< fileName<< std::endl;
 
@@ -66 +69 @@
             
             bool disable_multi_threaded_frame_dispatching = options ? (options->getPluginStringData("disableMultiThreadedFrameDispatching") == "true") : false;
-            bool disable_core_video                       = true; // options ? (options->getPluginStringData("disableCoreVideo") == "true") : false;
+            bool disable_core_video                       = options ? (options->getPluginStringData("disableCoreVideo") == "true") : false;
             OSG_INFO << "disableMultiThreadedFrameDispatching: " << disable_multi_threaded_frame_dispatching << std::endl;
             OSG_INFO << "disableCoreVideo                    : " << disable_core_video << std::endl;

OpenSceneGraph/trunk/src/osgPlugins/imageio/ReaderWriterImageIO.cpp

@@ -337 +337 @@
         case 16:
         case 32:
+        case 64:
         {
 

OpenSceneGraph/trunk/src/osgPresentation/SlideShowConstructor.cpp

@@ -60 +60 @@
 
 #define USE_CLIENT_STORAGE_HINT 0
+#define USE_TEXTURE_FROM_VIDEO_PLUGIN 1
 
 class SetToTransparentBin : public osg::NodeVisitor
@@ -771 +772 @@
 {
     osg::Geometry* pictureQuad = 0;
-    osg::Texture* texture = 0;
+    osg::ref_ptr<osg::Texture> texture = 0;
     osg::StateSet* stateset = 0;
 
@@ -783 +784 @@
 
     osg::ImageStream* imageStream = dynamic_cast<osg::ImageStream*>(image);
-
+    
+    // let the video-plugin create a texture for us, if supported
+    #if USE_TEXTURE_FROM_VIDEO_PLUGIN
+    if(imageStream)
+    {
+        texture = imageStream->createSuitableTexture();
+    }
+    #endif
+    
     bool flipYAxis = image->getOrigin()==osg::Image::TOP_LEFT;
 
@@ -799 +808 @@
     usedTextureRectangle = useTextureRectangle;
 
-    if (useTextureRectangle)
-    {
+    if (!texture)
+    {
+        if (useTextureRectangle)
+        {
+            texture = new osg::TextureRectangle(image);
+        }
+        else
+        {
+            texture = new osg::Texture2D(image);
+
+            texture->setResizeNonPowerOfTwoHint(false);
+            texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
+            texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
+    #if USE_CLIENT_STORAGE_HINT        
+            texture->setClientStorageHint(true);
+    #endif
+            
+        }
+    }
+    if (texture)
+    {
+        float t(0), l(0);
+        float r = (texture->getTextureTarget() == GL_TEXTURE_RECTANGLE) ? image->s() : 1;
+        float b = (texture->getTextureTarget() == GL_TEXTURE_RECTANGLE) ? image->t() : 1;
+        
+        if (flipYAxis)
+            std::swap(t,b);
+        
         pictureQuad = osg::createTexturedQuadGeometry(positionVec,
-                                           widthVec,
-                                           heightVec,
-                                           0.0f, flipYAxis ? image->t() : 0.0f,
-                                           image->s(), flipYAxis ? 0.0f : image->t());
-
+                                               widthVec,
+                                               heightVec,
+                                               l, t, r, b);
+        
         stateset = pictureQuad->getOrCreateStateSet();
-
-        texture = new osg::TextureRectangle(image);
         stateset->setTextureAttributeAndModes(0,
-                    texture,
-                    osg::StateAttribute::ON);
-
-
-
-    }
-    else
-    {
-        pictureQuad = osg::createTexturedQuadGeometry(positionVec,
-                                           widthVec,
-                                           heightVec,
-                                           0.0f, flipYAxis ? 1.0f : 0.0f,
-                                           1.0f, flipYAxis ? 0.0f : 1.0f);
-
-        stateset = pictureQuad->getOrCreateStateSet();
-
-        texture = new osg::Texture2D(image);
-
-        texture->setResizeNonPowerOfTwoHint(false);
-        texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
-        texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
-#if USE_CLIENT_STORAGE_HINT        
-        texture->setClientStorageHint(true);
-#endif
-        stateset->setTextureAttributeAndModes(0,
-                    texture,
-                    osg::StateAttribute::ON);
-
-    }
-
+                        texture,
+                        osg::StateAttribute::ON);
+    }
+    
     if (!pictureQuad) return 0;
-
+    
     if (imageStream)
     {