Optimize away duplicate conversion nodes.

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 8767f7e28a2bdcfa757ae45e8b9ca3bd9f0a6570..a8c2e52c564679872ad92d31c48f391a45e699be 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -947,7 +947,7 @@ void EffectChain::fix_internal_color_spaces()
                        }
 
                        // Go through each input that is not sRGB, and insert
-                       // a colorspace conversion before it.
+                       // a colorspace conversion after it.
                        for (unsigned j = 0; j < node->incoming_links.size(); ++j) {
                                Node *input = node->incoming_links[j];
                                assert(input->output_color_space != COLORSPACE_INVALID);
@@ -958,7 +958,8 @@ void EffectChain::fix_internal_color_spaces()
                                CHECK(conversion->effect->set_int("source_space", input->output_color_space));
                                CHECK(conversion->effect->set_int("destination_space", COLORSPACE_sRGB));
                                conversion->output_color_space = COLORSPACE_sRGB;
-                               insert_node_between(input, conversion, node);
+                               replace_sender(input, conversion);
+                               connect_nodes(input, conversion);
                        }
 
                        // Re-sort topologically, and propagate the new information.
@@ -1038,7 +1039,8 @@ void EffectChain::fix_internal_alpha(unsigned step)
                                        conversion = add_node(new AlphaDivisionEffect());
                                }
                                conversion->output_alpha_type = desired_type;
-                               insert_node_between(input, conversion, node);
+                               replace_sender(input, conversion);
+                               connect_nodes(input, conversion);
                        }
 
                        // Re-sort topologically, and propagate the new information.
@@ -1221,7 +1223,7 @@ void EffectChain::fix_internal_gamma_by_inserting_nodes(unsigned step)
                        }
 
                        // If not, go through each input that is not linear gamma,
-                       // and insert a gamma conversion before it.
+                       // and insert a gamma conversion after it.
                        for (unsigned j = 0; j < node->incoming_links.size(); ++j) {
                                Node *input = node->incoming_links[j];
                                assert(input->output_gamma_curve != GAMMA_INVALID);
@@ -1231,7 +1233,8 @@ void EffectChain::fix_internal_gamma_by_inserting_nodes(unsigned step)
                                Node *conversion = add_node(new GammaExpansionEffect());
                                CHECK(conversion->effect->set_int("source_curve", input->output_gamma_curve));
                                conversion->output_gamma_curve = GAMMA_LINEAR;
-                               insert_node_between(input, conversion, node);
+                               replace_sender(input, conversion);
+                               connect_nodes(input, conversion);
                        }
 
                        // Re-sort topologically, and propagate the new information.