Color: Assume Rec 709 in remaining comp nodes
authorAaron Carlisle <carlisle.b3d@gmail.com>
Thu, 17 May 2018 21:20:32 +0000 (17:20 -0400)
committerAaron Carlisle <carlisle.b3d@gmail.com>
Thu, 17 May 2018 21:20:32 +0000 (17:20 -0400)
Part of T54798

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

index cc573274c34fc8f5ced4b48f0944a9f2ce0e6a4b..d1cf7b66fd05fd37ff9d819d615d4b8b814b89cc 100644 (file)
@@ -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;
index 6324ca9a3ca86f4e2a896cc86db5599efd8e569e..2c985cd5bd10d68f98bfeab7d7ab0f67945671f3 100644 (file)
@@ -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);
        
index 99061cf88244d8b489d8dd2d9dfd55eeff2f4775..52c764f2223219d294e856363d79ee0e4a27113e 100644 (file)
@@ -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));
index e896b7144e5b7008e5d174c95d04c9bb4e614bbf..ddfba07d9f7572e034e96977af343b1a3bd07f33 100644 (file)
@@ -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));