[Bf-blender-cvs] [96fba1e1016] master: Color: Assume Rec 709 in remaining comp nodes

[Aaron Carlisle]

Commit: 96fba1e101659cc5f63a5095ab652c6a0b019aa0
Author: Aaron Carlisle
Date:   Thu May 17 17:20:32 2018 -0400
Branches: master
https://developer.blender.org/rB96fba1e101659cc5f63a5095ab652c6a0b019aa0

Color: Assume Rec 709 in remaining comp nodes

Part of T54798

===================================================================

M       source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
M       source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
M       source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
M       source/blender/compositor/nodes/COM_KeyingNode.cpp

===================================================================

diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp 
b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
index cc573274c34..d1cf7b66fd0 100644
--- a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
@@ -53,9 +53,9 @@ void ChannelMatteNode::convertToOperations(NodeConverter 
&converter, const Compo
                        break;
                case CMP_NODE_CHANNEL_MATTE_CS_YCC: /* YCC */
                        convert = new ConvertRGBToYCCOperation();
-                       ((ConvertRGBToYCCOperation *)convert)->setMode(0); /* 
BLI_YCC_ITU_BT601 */
+                       ((ConvertRGBToYCCOperation 
*)convert)->setMode(BLI_YCC_ITU_BT709);
                        inv_convert = new ConvertYCCToRGBOperation();
-                       ((ConvertYCCToRGBOperation *)inv_convert)->setMode(0); 
/* BLI_YCC_ITU_BT601 */
+                       ((ConvertYCCToRGBOperation 
*)inv_convert)->setMode(BLI_YCC_ITU_BT709);
                        break;
                default:
                        break;
diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp 
b/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
index 6324ca9a3ca..2c985cd5bd1 100644
--- a/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
@@ -41,8 +41,8 @@ void ChromaMatteNode::convertToOperations(NodeConverter 
&converter, const Compos
        
        ConvertRGBToYCCOperation *operationRGBToYCC_Image = new 
ConvertRGBToYCCOperation();
        ConvertRGBToYCCOperation *operationRGBToYCC_Key = new 
ConvertRGBToYCCOperation();
-       operationRGBToYCC_Image->setMode(0); /* BLI_YCC_ITU_BT601 */
-       operationRGBToYCC_Key->setMode(0); /* BLI_YCC_ITU_BT601 */
+       operationRGBToYCC_Image->setMode(BLI_YCC_ITU_BT709);
+       operationRGBToYCC_Key->setMode(BLI_YCC_ITU_BT709);
        converter.addOperation(operationRGBToYCC_Image);
        converter.addOperation(operationRGBToYCC_Key);
        
diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp 
b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
index 99061cf8824..52c764f2223 100644
--- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
@@ -66,8 +66,8 @@ void DistanceMatteNode::convertToOperations(NodeConverter 
&converter, const Comp
                
                ConvertRGBToYCCOperation *operationYCCImage = new 
ConvertRGBToYCCOperation();
                ConvertRGBToYCCOperation *operationYCCMatte = new 
ConvertRGBToYCCOperation();
-               operationYCCImage->setMode(0);  /* BLI_YCC_ITU_BT601 */
-               operationYCCMatte->setMode(0);  /* BLI_YCC_ITU_BT601 */
+               operationYCCImage->setMode(BLI_YCC_ITU_BT709);
+               operationYCCMatte->setMode(BLI_YCC_ITU_BT709);
                converter.addOperation(operationYCCImage);
                converter.addOperation(operationYCCMatte);
                
@@ -86,7 +86,7 @@ void DistanceMatteNode::convertToOperations(NodeConverter 
&converter, const Comp
        
        if (storage->channel != 1) {
                ConvertYCCToRGBOperation *inv_convert = new 
ConvertYCCToRGBOperation();
-               inv_convert->setMode(0); /* BLI_YCC_ITU_BT601 */
+               inv_convert->setMode(BLI_YCC_ITU_BT709);
 
                converter.addOperation(inv_convert);
                converter.addLink(operationAlpha->getOutputSocket(0), 
inv_convert->getInputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cpp 
b/source/blender/compositor/nodes/COM_KeyingNode.cpp
index e896b7144e5..ddfba07d9f7 100644
--- a/source/blender/compositor/nodes/COM_KeyingNode.cpp
+++ b/source/blender/compositor/nodes/COM_KeyingNode.cpp
@@ -50,7 +50,7 @@ KeyingNode::KeyingNode(bNode *editorNode) : Node(editorNode)
 NodeOperationOutput *KeyingNode::setupPreBlur(NodeConverter &converter, 
NodeInput *inputImage, int size) const
 {
        ConvertRGBToYCCOperation *convertRGBToYCCOperation = new 
ConvertRGBToYCCOperation();
-       convertRGBToYCCOperation->setMode(0);  /* ITU 601 */
+       convertRGBToYCCOperation->setMode(BLI_YCC_ITU_BT709);
        converter.addOperation(convertRGBToYCCOperation);
        
        converter.mapInputSocket(inputImage, 
convertRGBToYCCOperation->getInputSocket(0));
@@ -86,7 +86,7 @@ NodeOperationOutput *KeyingNode::setupPreBlur(NodeConverter 
&converter, NodeInpu
        }
        
        ConvertYCCToRGBOperation *convertYCCToRGBOperation = new 
ConvertYCCToRGBOperation();
-       convertYCCToRGBOperation->setMode(0);  /* ITU 601 */
+       convertYCCToRGBOperation->setMode(BLI_YCC_ITU_BT709);
        converter.addOperation(convertYCCToRGBOperation);
        
        converter.addLink(combineOperation->getOutputSocket(0), 
convertYCCToRGBOperation->getInputSocket(0));

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs