blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Color: Assume Rec 709 in remaining comp nodes 

Part of T54798
This commit is contained in:
Aaron Carlisle 2018-05-17 17:20:32 -04:00
parent 0e0d99161a
commit 96fba1e101
Notes: blender-bot 2023-02-14 05:58:19 +01:00 
Referenced by issue #54798, Color Management: Areas we still assume REC.601
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
View 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;

4
source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
View 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);

6
source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
View 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));

4
source/blender/compositor/nodes/COM_KeyingNode.cpp
View 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));