diff options
8 files changed, 112 insertions, 75 deletions
diff --git a/source/blender/compositor/intern/COM_MetaData.cpp b/source/blender/compositor/intern/COM_MetaData.cpp index 4bc4571face..a6306f6c657 100644 --- a/source/blender/compositor/intern/COM_MetaData.cpp +++ b/source/blender/compositor/intern/COM_MetaData.cpp @@ -18,7 +18,6 @@ #include "COM_MetaData.h" -#include "BKE_cryptomatte.hh" #include "BKE_image.h" #include "RE_pipeline.h" @@ -69,3 +68,39 @@ void MetaData::addToRenderResult(RenderResult *render_result) const BKE_render_result_stamp_data(render_result, entry.key.c_str(), entry.value.c_str()); } } + +void MetaDataExtractCallbackData::addMetaData(blender::StringRef key, blender::StringRefNull value) +{ + if (!meta_data) { + meta_data = std::make_unique<MetaData>(); + } + meta_data->add(key, value); +} + +void MetaDataExtractCallbackData::setCryptomatteKeys(blender::StringRef cryptomatte_layer_name) +{ + manifest_key = blender::bke::cryptomatte::BKE_cryptomatte_meta_data_key(cryptomatte_layer_name, + "manifest"); + hash_key = blender::bke::cryptomatte::BKE_cryptomatte_meta_data_key(cryptomatte_layer_name, + "hash"); + conversion_key = blender::bke::cryptomatte::BKE_cryptomatte_meta_data_key(cryptomatte_layer_name, + "conversion"); +} + +void MetaDataExtractCallbackData::extract_cryptomatte_meta_data(void *_data, + const char *propname, + char *propvalue, + int UNUSED(len)) +{ + MetaDataExtractCallbackData *data = static_cast<MetaDataExtractCallbackData *>(_data); + blender::StringRefNull key(propname); + if (key == data->hash_key) { + data->addMetaData(META_DATA_KEY_CRYPTOMATTE_HASH, propvalue); + } + else if (key == data->conversion_key) { + data->addMetaData(META_DATA_KEY_CRYPTOMATTE_CONVERSION, propvalue); + } + else if (key == data->manifest_key) { + data->addMetaData(META_DATA_KEY_CRYPTOMATTE_MANIFEST, propvalue); + } +}
\ No newline at end of file diff --git a/source/blender/compositor/intern/COM_MetaData.h b/source/blender/compositor/intern/COM_MetaData.h index c1e34df2791..6fdd8d3945e 100644 --- a/source/blender/compositor/intern/COM_MetaData.h +++ b/source/blender/compositor/intern/COM_MetaData.h @@ -20,6 +20,7 @@ #include <string> +#include "BKE_cryptomatte.hh" #include "BLI_map.hh" #include "MEM_guardedalloc.h" @@ -54,3 +55,18 @@ class MetaData { MEM_CXX_CLASS_ALLOC_FUNCS("COM:MetaData") #endif }; + +struct MetaDataExtractCallbackData { + std::unique_ptr<MetaData> meta_data; + std::string hash_key; + std::string conversion_key; + std::string manifest_key; + + void addMetaData(blender::StringRef key, blender::StringRefNull value); + void setCryptomatteKeys(blender::StringRef cryptomatte_layer_name); + /* C type callback function (StampCallback). */ + static void extract_cryptomatte_meta_data(void *_data, + const char *propname, + char *propvalue, + int UNUSED(len)); +}; diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index 596a448e6a0..69729e018d7 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -34,12 +34,12 @@ ImageNode::ImageNode(bNode *editorNode) : Node(editorNode) /* pass */ } NodeOperation *ImageNode::doMultilayerCheck(NodeConverter &converter, - RenderLayer *rl, + RenderLayer *render_layer, + RenderPass *render_pass, Image *image, ImageUser *user, int framenumber, int outputsocketIndex, - int passindex, int view, DataType datatype) const { @@ -47,19 +47,18 @@ NodeOperation *ImageNode::doMultilayerCheck(NodeConverter &converter, MultilayerBaseOperation *operation = nullptr; switch (datatype) { case COM_DT_VALUE: - operation = new MultilayerValueOperation(passindex, view); + operation = new MultilayerValueOperation(render_layer, render_pass, view); break; case COM_DT_VECTOR: - operation = new MultilayerVectorOperation(passindex, view); + operation = new MultilayerVectorOperation(render_layer, render_pass, view); break; case COM_DT_COLOR: - operation = new MultilayerColorOperation(passindex, view); + operation = new MultilayerColorOperation(render_layer, render_pass, view); break; default: break; } operation->setImage(image); - operation->setRenderLayer(rl); operation->setImageUser(user); operation->setFramenumber(framenumber); @@ -128,16 +127,15 @@ void ImageNode::convertToOperations(NodeConverter &converter, } if (rpass) { - int passindex = BLI_findindex(&rl->passes, rpass); switch (rpass->channels) { case 1: operation = doMultilayerCheck(converter, rl, + rpass, image, imageuser, framenumber, index, - passindex, view, COM_DT_VALUE); break; @@ -146,22 +144,22 @@ void ImageNode::convertToOperations(NodeConverter &converter, case 3: operation = doMultilayerCheck(converter, rl, + rpass, image, imageuser, framenumber, index, - passindex, view, COM_DT_VECTOR); break; case 4: operation = doMultilayerCheck(converter, rl, + rpass, image, imageuser, framenumber, index, - passindex, view, COM_DT_COLOR); break; diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h index 1a811fe855d..e2053cfd3b8 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.h +++ b/source/blender/compositor/nodes/COM_ImageNode.h @@ -24,6 +24,7 @@ #include "DNA_node_types.h" #include "RE_engine.h" +#include "RE_pipeline.h" /** * \brief ImageNode @@ -33,11 +34,11 @@ class ImageNode : public Node { private: NodeOperation *doMultilayerCheck(NodeConverter &converter, RenderLayer *rl, + RenderPass *render_pass, Image *image, ImageUser *user, int framenumber, int outputsocketIndex, - int passindex, int view, DataType datatype) const; diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp index 023538ee5b1..60936ee1939 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp @@ -21,10 +21,14 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -MultilayerBaseOperation::MultilayerBaseOperation(int passindex, int view) +MultilayerBaseOperation::MultilayerBaseOperation(RenderLayer *render_layer, + RenderPass *render_pass, + int view) { - this->m_passId = passindex; + this->m_passId = BLI_findindex(&render_layer->passes, render_pass); this->m_view = view; + this->m_renderLayer = render_layer; + this->m_renderPass = render_pass; } ImBuf *MultilayerBaseOperation::getImBuf() @@ -45,6 +49,32 @@ ImBuf *MultilayerBaseOperation::getImBuf() return nullptr; } +std::unique_ptr<MetaData> MultilayerColorOperation::getMetaData() const +{ + BLI_assert(this->m_buffer); + MetaDataExtractCallbackData callback_data = {nullptr}; + RenderResult *render_result = this->m_image->rr; + if (render_result && render_result->stamp_data) { + RenderLayer *render_layer = this->m_renderLayer; + RenderPass *render_pass = this->m_renderPass; + std::string full_layer_name = + std::string(render_layer->name, + BLI_strnlen(render_layer->name, sizeof(render_layer->name))) + + "." + + std::string(render_pass->name, BLI_strnlen(render_pass->name, sizeof(render_pass->name))); + blender::StringRef cryptomatte_layer_name = + blender::bke::cryptomatte::BKE_cryptomatte_extract_layer_name(full_layer_name); + callback_data.setCryptomatteKeys(cryptomatte_layer_name); + + BKE_stamp_info_callback(&callback_data, + render_result->stamp_data, + MetaDataExtractCallbackData::extract_cryptomatte_meta_data, + false); + } + + return std::move(callback_data.meta_data); +} + void MultilayerColorOperation::executePixelSampled(float output[4], float x, float y, diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.h b/source/blender/compositor/operations/COM_MultilayerImageOperation.h index adfcc975ade..f5176b0a4db 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.h +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.h @@ -24,34 +24,34 @@ class MultilayerBaseOperation : public BaseImageOperation { private: int m_passId; int m_view; - RenderLayer *m_renderlayer; protected: + RenderLayer *m_renderLayer; + RenderPass *m_renderPass; ImBuf *getImBuf(); public: /** * Constructor */ - MultilayerBaseOperation(int passindex, int view); - void setRenderLayer(RenderLayer *renderlayer) - { - this->m_renderlayer = renderlayer; - } + MultilayerBaseOperation(RenderLayer *render_layer, RenderPass *render_pass, int view); }; class MultilayerColorOperation : public MultilayerBaseOperation { public: - MultilayerColorOperation(int passindex, int view) : MultilayerBaseOperation(passindex, view) + MultilayerColorOperation(RenderLayer *render_layer, RenderPass *render_pass, int view) + : MultilayerBaseOperation(render_layer, render_pass, view) { this->addOutputSocket(COM_DT_COLOR); } void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + std::unique_ptr<MetaData> getMetaData() const override; }; class MultilayerValueOperation : public MultilayerBaseOperation { public: - MultilayerValueOperation(int passindex, int view) : MultilayerBaseOperation(passindex, view) + MultilayerValueOperation(RenderLayer *render_layer, RenderPass *render_pass, int view) + : MultilayerBaseOperation(render_layer, render_pass, view) { this->addOutputSocket(COM_DT_VALUE); } @@ -60,7 +60,8 @@ class MultilayerValueOperation : public MultilayerBaseOperation { class MultilayerVectorOperation : public MultilayerBaseOperation { public: - MultilayerVectorOperation(int passindex, int view) : MultilayerBaseOperation(passindex, view) + MultilayerVectorOperation(RenderLayer *render_layer, RenderPass *render_pass, int view) + : MultilayerBaseOperation(render_layer, render_pass, view) { this->addOutputSocket(COM_DT_VECTOR); } diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index 19d49bc2ae7..bb1b312ffec 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -26,7 +26,6 @@ #include "BLI_path_util.h" #include "BLI_string.h" -#include "BKE_cryptomatte.hh" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_main.h" diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp index 4f4116d6faa..e32a4cdc9bc 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp @@ -20,7 +20,6 @@ #include "COM_MetaData.h" -#include "BKE_cryptomatte.hh" #include "BKE_image.h" #include "BKE_scene.h" @@ -217,62 +216,18 @@ void RenderLayersProg::determineResolution(unsigned int resolution[2], } } -struct CallbackData { - std::unique_ptr<MetaData> meta_data; - std::string hash_key; - std::string conversion_key; - std::string manifest_key; - - void addMetaData(blender::StringRef key, blender::StringRefNull value) - { - if (!meta_data) { - meta_data = std::make_unique<MetaData>(); - } - meta_data->add(key, value); - } - - void setCryptomatteKeys(blender::StringRef cryptomatte_layer_name) - { - manifest_key = blender::bke::cryptomatte::BKE_cryptomatte_meta_data_key(cryptomatte_layer_name, - "manifest"); - hash_key = blender::bke::cryptomatte::BKE_cryptomatte_meta_data_key(cryptomatte_layer_name, - "hash"); - conversion_key = blender::bke::cryptomatte::BKE_cryptomatte_meta_data_key( - cryptomatte_layer_name, "conversion"); - } -}; - -/* C type callback function (StampCallback). */ -static void extract_cryptomatte_meta_data(void *_data, - const char *propname, - char *propvalue, - int UNUSED(len)) -{ - CallbackData *data = static_cast<CallbackData *>(_data); - blender::StringRefNull key(propname); - if (key == data->hash_key) { - data->addMetaData(META_DATA_KEY_CRYPTOMATTE_HASH, propvalue); - } - else if (key == data->conversion_key) { - data->addMetaData(META_DATA_KEY_CRYPTOMATTE_CONVERSION, propvalue); - } - else if (key == data->manifest_key) { - data->addMetaData(META_DATA_KEY_CRYPTOMATTE_MANIFEST, propvalue); - } -} - std::unique_ptr<MetaData> RenderLayersProg::getMetaData() const { Scene *scene = this->getScene(); Render *re = (scene) ? RE_GetSceneRender(scene) : nullptr; - RenderResult *rr = nullptr; - CallbackData callback_data = {nullptr}; + RenderResult *render_result = nullptr; + MetaDataExtractCallbackData callback_data = {nullptr}; if (re) { - rr = RE_AcquireResultRead(re); + render_result = RE_AcquireResultRead(re); } - if (rr && rr->stamp_data) { + if (render_result && render_result->stamp_data) { ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&scene->view_layers, getLayerId()); if (view_layer) { std::string full_layer_name = std::string( @@ -283,8 +238,10 @@ std::unique_ptr<MetaData> RenderLayersProg::getMetaData() const full_layer_name); callback_data.setCryptomatteKeys(cryptomatte_layer_name); - BKE_stamp_info_callback( - &callback_data, rr->stamp_data, extract_cryptomatte_meta_data, false); + BKE_stamp_info_callback(&callback_data, + render_result->stamp_data, + MetaDataExtractCallbackData::extract_cryptomatte_meta_data, + false); } } |