Merge branch 'multiplane2'

MrKepzie · Jul 3, 2017 · 97fe5c2 · 97fe5c2
2 parents 58afe36 + bea27eb
commit 97fe5c2
Show file tree

Hide file tree

Showing 21 changed files with 202 additions and 473 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,11 @@
 [submodule "openfx"]
 	path = openfx
 	url = https://github.com/devernay/openfx.git
+	branch = multiplane2
 [submodule "IOSupport/SequenceParsing"]
 	path = IOSupport/SequenceParsing
 	url = https://github.com/MrKepzie/SequenceParsing
 [submodule "SupportExt"]
 	path = SupportExt
 	url = https://github.com/devernay/openfx-supportext.git
+	branch = multiplane2
diff --git a/IOSupport/GenericReader.cpp b/IOSupport/GenericReader.cpp
@@ -49,6 +49,7 @@
 #include <tuttle/ofxReadWrite.h>
 #endif
 #include <ofxNatron.h>
+#include <ofxsMultiPlane.h>
 
 #include "SequenceParsing/SequenceParsing.h"
 #ifdef OFX_IO_USING_OCIO
@@ -1696,11 +1697,16 @@ GenericReaderPlugin::render(const RenderArguments &args)
         // if components are custom, remap it to a OFX components with the same number of channels
         PixelComponentEnum remappedComponents;
 
-        bool isColor;
+        bool isColor = true;
         bool isCustom;
         if (it->comps == ePixelComponentCustom) {
-            std::vector<string> channelNames = mapPixelComponentCustomToLayerChannels(it->rawComps);
-            isColor = channelNames.size() >= 4 && channelNames[1] == "R" && channelNames[2] == "G" && channelNames[3] == "B";
+
+            MultiPlane::ImagePlaneDesc plane, pairedPlane;
+            MultiPlane::ImagePlaneDesc::mapOFXComponentsTypeStringToPlanes(it->rawComps, &plane, &pairedPlane);
+            const std::vector<std::string>& channels = plane.getChannels();
+            if (channels.size() < 3 || (channels[0] != "R" && channels[1] != "G" && channels[2] != "B")) {
+                isColor = false;
+            }
             isCustom = true;
             if (isColor) {
 #ifdef OFX_IO_USING_OCIO
@@ -1722,7 +1728,6 @@ GenericReaderPlugin::render(const RenderArguments &args)
                 remappedComponents = ePixelComponentAlpha;
             }
         } else {
-            isColor = true;
             isCustom = false;
 #ifdef OFX_IO_USING_OCIO
             isOCIOIdentity = _ocio->isIdentity(args.time);
@@ -2439,7 +2444,8 @@ GenericReaderPlugin::purgeCaches()
 bool
 GenericReaderPlugin::isIdentity(const IsIdentityArguments &args,
                                 Clip * &identityClip,
-                                double &identityTime)
+                                double &identityTime
+                                , int& /*view*/, std::string& /*plane*/)
 {
     if ( !kSupportsRenderScale && ( (args.renderScale.x != 1.) || (args.renderScale.y != 1.) ) ) {
         throwSuiteStatusException(kOfxStatFailed);

diff --git a/IOSupport/GenericReader.h b/IOSupport/GenericReader.h
@@ -104,7 +104,7 @@ class GenericReaderPlugin
     virtual void changedParam(const OFX::InstanceChangedArgs &args, const std::string &paramName) OVERRIDE;
 
     /* override is identity */
-    virtual bool isIdentity(const OFX::IsIdentityArguments &args, OFX::Clip * &identityClip, double &identityTime) OVERRIDE;
+    virtual bool isIdentity(const OFX::IsIdentityArguments &args, OFX::Clip * &identityClip, double &identityTime, int& view, std::string& plane) OVERRIDE;
 
     /**
      * @brief Set the output components and premultiplication state for the input image automatically.

diff --git a/IOSupport/GenericWriter.cpp b/IOSupport/GenericWriter.cpp
@@ -308,7 +308,8 @@ GenericWriterPlugin::checkExtension(const string& ext)
 bool
 GenericWriterPlugin::isIdentity(const IsIdentityArguments &args,
                                 Clip * & /*identityClip*/,
-                                double & /*identityTime*/)
+                                double & /*identityTime*/
+                                , int& /*view*/, std::string& /*plane*/)
 {
     if ( !kSupportsRenderScale && ( (args.renderScale.x != 1.) || (args.renderScale.y != 1.) ) ) {
         throwSuiteStatusException(kOfxStatFailed);
@@ -349,9 +350,9 @@ getPixelsComponentsCount(const string& rawComponents,
 {
     string layer, pairedLayer;
 
-    vector<string> channels;
-    MultiPlane::Utils::extractChannelsFromComponentString(rawComponents, &layer, &pairedLayer, &channels);
-    switch ( channels.size() ) {
+    MultiPlane::ImagePlaneDesc plane, pairedPlane;
+    MultiPlane::ImagePlaneDesc::mapOFXComponentsTypeStringToPlanes(rawComponents, &plane, &pairedPlane);
+    switch ( plane.getNumComponents() ) {
     case 0:
         *mappedComponents = ePixelComponentNone;
         break;
@@ -372,7 +373,7 @@ getPixelsComponentsCount(const string& rawComponents,
         break;
     }
 
-    return (int)channels.size();
+    return (int)plane.getNumComponents();
 }
 
 void
@@ -417,10 +418,13 @@ GenericWriterPlugin::fetchPlaneConvertAndCopy(const string& plane,
         if (failIfNoSrcImg) {
             stringstream ss;
             ss << "Input layer ";
-            string layerName, pairedLayer;
-            vector<string> channels;
-            MultiPlane::Utils::extractChannelsFromComponentString(plane, &layerName, &pairedLayer, &channels);
-            ss << layerName;
+            MultiPlane::ImagePlaneDesc planeToFetch;
+            if (plane == kFnOfxImagePlaneColour) {
+                planeToFetch = MultiPlane::ImagePlaneDesc::mapNCompsToColorPlane(_inputClip->getPixelComponentCount());
+            } else {
+                planeToFetch = MultiPlane::ImagePlaneDesc::mapOFXPlaneStringToPlane(plane);
+            }
+            ss << planeToFetch.getPlaneLabel();
             ss << " could not be fetched";
 
             setPersistentMessage( Message::eMessageError, "", ss.str() );
@@ -2113,6 +2117,8 @@ GenericWriterPlugin::changedParam(const InstanceChangedArgs &args,
 #ifdef OFX_IO_USING_OCIO
     _ocio->changedParam(args, paramName);
 #endif
+
+    MultiPlaneEffect::changedParam(args, paramName);
 } // GenericWriterPlugin::changedParam
 
 void
@@ -2121,6 +2127,7 @@ GenericWriterPlugin::changedClip(const InstanceChangedArgs &args,
 {
     // must clear persistent message, or render() is not called by Nuke after an error
     clearPersistentMessage();
+    MultiPlaneEffect::changedClip(args, clipName);
     if ( (clipName == kOfxImageEffectSimpleSourceClipName) && _inputClip && (args.reason == eChangeUserEdit) ) {
         PreMultiplicationEnum premult = _inputClip->getPreMultiplication();
 #     ifdef DEBUG
@@ -2157,6 +2164,7 @@ GenericWriterPlugin::changedClip(const InstanceChangedArgs &args,
 void
 GenericWriterPlugin::getClipPreferences(ClipPreferencesSetter &clipPreferences)
 {
+    MultiPlaneEffect::getClipPreferences(clipPreferences);
     if ( !_outputComponents->getIsSecret() ) {
         int index;
         _outputComponents->getValue(index);

diff --git a/IOSupport/GenericWriter.h b/IOSupport/GenericWriter.h
@@ -76,7 +76,7 @@ class GenericWriterPlugin
     virtual void render(const OFX::RenderArguments &args) OVERRIDE FINAL;
 
     /* override is identity */
-    virtual bool isIdentity(const OFX::IsIdentityArguments &args, OFX::Clip * &identityClip, double &identityTime) OVERRIDE;
+    virtual bool isIdentity(const OFX::IsIdentityArguments &args, OFX::Clip * &identityClip, double &identityTime, int& view, std::string& plane) OVERRIDE;
 
     /** @brief client begin sequence render function */
     virtual void beginSequenceRender(const OFX::BeginSequenceRenderArguments &args) OVERRIDE;

diff --git a/OCIO/OCIOCDLTransform.cpp b/OCIO/OCIOCDLTransform.cpp
@@ -149,7 +149,7 @@ class OCIOCDLTransformPlugin
     virtual void render(const RenderArguments &args) OVERRIDE FINAL;
 
     /* override is identity */
-    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime) OVERRIDE FINAL;
+    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime, int& view, std::string& plane) OVERRIDE FINAL;
 
     /** @brief the effect is about to be actively edited by a user, called when the first user interface is opened on an instance */
     virtual void beginEdit(void) OVERRIDE FINAL;
@@ -975,7 +975,8 @@ OCIOCDLTransformPlugin::render(const RenderArguments &args)
 bool
 OCIOCDLTransformPlugin::isIdentity(const IsIdentityArguments &args,
                                    Clip * &identityClip,
-                                   double & /*identityTime*/)
+                                   double & /*identityTime*/
+                                   , int& /*view*/, std::string& /*plane*/)
 {
     const double time = args.time;
     float sop[9];

diff --git a/OCIO/OCIOColorSpace.cpp b/OCIO/OCIOColorSpace.cpp
@@ -83,7 +83,7 @@ class OCIOColorSpacePlugin
     virtual void render(const RenderArguments &args) OVERRIDE FINAL;
 
     /* override is identity */
-    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime) OVERRIDE FINAL;
+    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime, int& view, std::string& plane) OVERRIDE FINAL;
 
     /* override changedParam */
     virtual void changedParam(const InstanceChangedArgs &args, const string &paramName) OVERRIDE FINAL;
@@ -760,7 +760,8 @@ OCIOColorSpacePlugin::render(const RenderArguments &args)
 bool
 OCIOColorSpacePlugin::isIdentity(const IsIdentityArguments &args,
                                  Clip * &identityClip,
-                                 double & /*identityTime*/)
+                                 double & /*identityTime*/
+                                 , int& /*view*/, std::string& /*plane*/)
 {
     if ( _ocio->isIdentity(args.time) ) {
         identityClip = _srcClip;

diff --git a/OCIO/OCIODisplay.cpp b/OCIO/OCIODisplay.cpp
@@ -171,7 +171,8 @@ class OCIODisplayPlugin
     /* override is identity */
     virtual bool isIdentity(const IsIdentityArguments & /*args*/,
                             Clip * & /*identityClip*/,
-                            double & /*identityTime*/) OVERRIDE FINAL
+                            double & /*identityTime*/
+                           , int& /*view*/, std::string& /*plane*/) OVERRIDE FINAL
     {
         return false;
     }

diff --git a/OCIO/OCIOFileTransform.cpp b/OCIO/OCIOFileTransform.cpp
@@ -128,7 +128,7 @@ class OCIOFileTransformPlugin
     virtual void render(const RenderArguments &args) OVERRIDE FINAL;
 
     /* override is identity */
-    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime) OVERRIDE FINAL;
+    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime, int& view, std::string& plane) OVERRIDE FINAL;
 
     /* override changedParam */
     virtual void changedParam(const InstanceChangedArgs &args, const string &paramName) OVERRIDE FINAL;
@@ -891,7 +891,8 @@ OCIOFileTransformPlugin::render(const RenderArguments &args)
 bool
 OCIOFileTransformPlugin::isIdentity(const IsIdentityArguments &args,
                                     Clip * &identityClip,
-                                    double & /*identityTime*/)
+                                    double & /*identityTime*/
+                                    , int& /*view*/, std::string& /*plane*/)
 {
     string file;
     _file->getValue(file);

diff --git a/OCIO/OCIOLogConvert.cpp b/OCIO/OCIOLogConvert.cpp
@@ -89,7 +89,7 @@ class OCIOLogConvertPlugin
     virtual void render(const RenderArguments &args) OVERRIDE FINAL;
 
     /* override is identity */
-    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime) OVERRIDE FINAL;
+    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime, int& view, std::string& plane) OVERRIDE FINAL;
 
     /* override changedParam */
     virtual void changedParam(const InstanceChangedArgs &args, const string &paramName) OVERRIDE FINAL;
@@ -844,7 +844,8 @@ OCIOLogConvertPlugin::render(const RenderArguments &args)
 bool
 OCIOLogConvertPlugin::isIdentity(const IsIdentityArguments &args,
                                  Clip * &identityClip,
-                                 double & /*identityTime*/)
+                                 double & /*identityTime*/
+                                 , int& /*view*/, std::string& /*plane*/)
 {
     double mix;
     _mix->getValueAtTime(args.time, mix);

diff --git a/OCIO/OCIOLookTransform.cpp b/OCIO/OCIOLookTransform.cpp
@@ -141,7 +141,7 @@ class OCIOLookTransformPlugin
     virtual void render(const RenderArguments &args) OVERRIDE FINAL;
 
     /* override is identity */
-    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime) OVERRIDE FINAL;
+    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime, int& view, std::string& plane) OVERRIDE FINAL;
 
     /* override changedParam */
     virtual void changedParam(const InstanceChangedArgs &args, const string &paramName) OVERRIDE FINAL;
@@ -931,7 +931,8 @@ OCIOLookTransformPlugin::render(const RenderArguments &args)
 bool
 OCIOLookTransformPlugin::isIdentity(const IsIdentityArguments &args,
                                     Clip * &identityClip,
-                                    double & /*identityTime*/)
+                                    double & /*identityTime*/
+                                    , int& /*view*/, std::string& /*plane*/)
 {
     if ( _ocio->isIdentity(args.time) ) {
         bool singleLook;

diff --git a/OIIO/OIIOResize.cpp b/OIIO/OIIOResize.cpp
@@ -127,7 +127,7 @@ class OIIOResizePlugin
     virtual void render(const RenderArguments &args) OVERRIDE FINAL;
 
     /* override is identity */
-    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime) OVERRIDE FINAL;
+    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime, int& view, std::string& plane) OVERRIDE FINAL;
 
     /* override changedParam */
     virtual void changedParam(const InstanceChangedArgs &args, const string &paramName) OVERRIDE FINAL;
@@ -502,7 +502,8 @@ OIIOResizePlugin::fillWithBlack(PixelProcessorFilterBase & processor,
 bool
 OIIOResizePlugin::isIdentity(const IsIdentityArguments &args,
                              Clip * &identityClip,
-                             double & /*identityTime*/)
+                             double & /*identityTime*/
+                             , int& /*view*/, std::string& /*plane*/)
 {
     int type_i;
     _type->getValue(type_i);

diff --git a/OIIO/OIIOText.cpp b/OIIO/OIIOText.cpp
@@ -124,7 +124,7 @@ class OIIOTextPlugin
     virtual void render(const RenderArguments &args) OVERRIDE FINAL;
 
     /* override is identity */
-    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime) OVERRIDE FINAL;
+    virtual bool isIdentity(const IsIdentityArguments &args, Clip * &identityClip, double &identityTime, int& view, std::string& plane) OVERRIDE FINAL;
 
     /* override changedParam */
     virtual void changedParam(const InstanceChangedArgs &args, const string &paramName) OVERRIDE FINAL;
@@ -474,7 +474,8 @@ OIIOTextPlugin::render(const RenderArguments &args)
 bool
 OIIOTextPlugin::isIdentity(const IsIdentityArguments &args,
                            Clip * &identityClip,
-                           double & /*identityTime*/)
+                           double & /*identityTime*/
+                           , int& /*view*/, std::string& /*plane*/)
 {
     if ( !kSupportsRenderScale && ( (args.renderScale.x != 1.) || (args.renderScale.y != 1.) ) ) {
         throwSuiteStatusException(kOfxStatFailed);