From Jeffrey Kinross, "I ran into an issue with case sensitivity on OS X and the OSXAVFoundation code.

In CMakeList.txt there is a case sensitivity issue which a fix was posted by Robert Osfield in the users forum. I also had to rename the files OSXAvFoundationCoreVideoTexture.h and OSXAvFoundationCoreVideoTexture.cpp to OSXAVFoundationCoreVideoTexture.h and OSXAVFoundationCoreVideoTexture.cpp Finally in OSXAvFoundationCoreVideoTexture.cpp the include OSXAVFoundationVideo.H was updated to OSXAVFoundationVideo.h"
2013-09-30 18:32:41 +00:00
parent d304ed7d73
commit c626b0e1f6
3 changed files with 2 additions and 2 deletions
--- a/src/osgPlugins/avfoundation/OSXAVFoundationCoreVideoTexture.cpp
+++ b/src/osgPlugins/avfoundation/OSXAVFoundationCoreVideoTexture.cpp
@@ -0,0 +1,161 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+
+#import "TargetConditionals.h" 
+#if (TARGET_OS_IPHONE)
+#define COREVIDEO_TEXTURE_TARGET GL_TEXTURE_2D
+#else
+#define COREVIDEO_TEXTURE_TARGET GL_TEXTURE_RECTANGLE_EXT
+#endif
+
+#include "OSXAVFoundationCoreVideoTexture.h"
+#include "OSXAVFoundationVideo.h"
+#include <CoreVideo/CoreVideo.h>
+
+
+
+OSXAVFoundationCoreVideoTexture::OSXAVFoundationCoreVideoTexture()
+    : osg::Texture()
+    , _textureTarget(COREVIDEO_TEXTURE_TARGET)
+    , _textureWidth(0)
+    , _textureHeight(0)
+    , _inited(false)
+{
+}
+
+
+OSXAVFoundationCoreVideoTexture::OSXAVFoundationCoreVideoTexture(osg::Image* image)
+    : osg::Texture()
+    , _textureTarget(COREVIDEO_TEXTURE_TARGET)
+    , _textureWidth(0)
+    , _textureHeight(0)
+    , _inited(false)
+{
+    setImage(image);
+}
+    
+
+OSXAVFoundationCoreVideoTexture::OSXAVFoundationCoreVideoTexture(const OSXAVFoundationCoreVideoTexture& text,const osg::CopyOp& copyop)
+    : osg::Texture(text, copyop)
+    , _textureTarget(text._textureTarget)
+    , _textureWidth(text._textureWidth)
+    , _textureHeight(text._textureHeight)
+    , _inited(text._inited)
+    , _image(text._image)
+{
+}
+
+
+OSXAVFoundationCoreVideoTexture::~OSXAVFoundationCoreVideoTexture() {
+}
+
+
+int OSXAVFoundationCoreVideoTexture::compare(const osg::StateAttribute& sa) const {
+    COMPARE_StateAttribute_Types(OSXAVFoundationCoreVideoTexture,sa)
+
+    if (_image!=rhs._image) // smart pointer comparison.
+    {
+        if (_image.valid())
+        {
+            if (rhs._image.valid())
+            {
+                int result = _image->compare(*rhs._image);
+                if (result!=0) return result;
+            }
+            else
+            {
+                return 1; // valid lhs._image is greater than null. 
+            }
+        }
+        else if (rhs._image.valid()) 
+        {
+            return -1; // valid rhs._image is greater than null. 
+        }
+    }
+
+    if (!_image && !rhs._image)
+    {
+        // no image attached to either Texture2D
+        // but could these textures already be downloaded?
+        // check the _textureObjectBuffer to see if they have been
+        // downloaded
+
+        int result = compareTextureObjects(rhs);
+        if (result!=0) return result;
+    }
+
+    int result = compareTexture(rhs);
+    if (result!=0) return result;
+
+    // compare each paramter in turn against the rhs.
+#if 1    
+    if (_textureWidth != 0 && rhs._textureWidth != 0)
+    {
+        COMPARE_StateAttribute_Parameter(_textureWidth)
+    }
+    if (_textureHeight != 0 && rhs._textureHeight != 0)
+    {
+        COMPARE_StateAttribute_Parameter(_textureHeight)
+    }
+#endif
+    return 0; // passed all the above comparison macro's, must be equal.
+}
+
+
+
+void OSXAVFoundationCoreVideoTexture::setImage(osg::Image* image)
+{
+    if (_image == image) return;
+
+    if (_image.valid() && _image->requiresUpdateCall())
+    {
+        setUpdateCallback(0);
+        setDataVariance(osg::Object::STATIC);
+    }
+
+    _image = image;
+    _modifiedCount.setAllElementsTo(0);
+
+    if (_image.valid() && _image->requiresUpdateCall())
+    {
+        setUpdateCallback(new osg::Image::UpdateCallback());
+        setDataVariance(osg::Object::DYNAMIC);
+    }
+    OSXAVFoundationVideo* m = dynamic_cast<OSXAVFoundationVideo*>(_image.get());
+    if (m)
+        m->setUseCoreVideo(true);
+}
+
+
+
+
+
+void OSXAVFoundationCoreVideoTexture::apply(osg::State& state) const
+{
+    if (!_image.valid())
+        return;
+    
+    OSXAVFoundationVideo* m = dynamic_cast<OSXAVFoundationVideo*>(_image.get());
+    if ((m) && (m->isCoreVideoUsed()))
+    {
+        m->lazyInitCoreVideoTextureCache(state);
+        GLint texture_name;
+        if (m->getCurrentCoreVideoTexture(_textureTarget, texture_name, _textureWidth, _textureHeight))
+        {
+            glBindTexture(_textureTarget, texture_name);
+        }
+    }
+}
+
+