]> git.sesse.net Git - movit/blobdiff - effect_chain.cpp
Fix another issue where an input was used twice. Add unit tests, again.
[movit] / effect_chain.cpp
index 5d0037cf6b4397cd9c44dcb57b1b5c3be616303a..933553c7455f47df1f45268e1e771dc01f6dad3d 100644 (file)
@@ -317,7 +317,7 @@ Phase *EffectChain::compile_glsl_program(
 // without any explicit recursion.
 void EffectChain::construct_glsl_programs(Node *output)
 {
-       // Which effects have already been completed in this phase?
+       // Which effects have already been completed?
        // We need to keep track of it, as an effect with multiple outputs
        // could otherwise be calculated multiple times.
        std::set<Node *> completed_effects;
@@ -348,10 +348,13 @@ void EffectChain::construct_glsl_programs(Node *output)
                        // This should currently only happen for effects that are inputs
                        // (either true inputs or phase outputs). We special-case inputs,
                        // and then deduplicate phase outputs in compile_glsl_program().
-                       if (node->effect->num_inputs() == 0 && completed_effects.count(node)) {
-                               continue;
+                       if (node->effect->num_inputs() == 0) {
+                               if (find(this_phase_effects.begin(), this_phase_effects.end(), node) != this_phase_effects.end()) {
+                                       continue;
+                               }
+                       } else {
+                               assert(completed_effects.count(node) == 0);
                        }
-                       assert(completed_effects.count(node) == 0);
 
                        this_phase_effects.push_back(node);
                        completed_effects.insert(node);
@@ -448,85 +451,46 @@ void EffectChain::output_dot(const char *filename)
        }
 
        fprintf(fp, "digraph G {\n");
+       fprintf(fp, "  output [shape=box label=\"(output)\"];\n");
        for (unsigned i = 0; i < nodes.size(); ++i) {
                // Find out which phase this event belongs to.
-               int in_phase = -1;
+               std::vector<int> in_phases;
                for (unsigned j = 0; j < phases.size(); ++j) {
                        const Phase* p = phases[j];
                        if (std::find(p->effects.begin(), p->effects.end(), nodes[i]) != p->effects.end()) {
-                               assert(in_phase == -1);
-                               in_phase = j;
+                               in_phases.push_back(j);
                        }
                }
 
-               if (in_phase == -1) {
+               if (in_phases.empty()) {
                        fprintf(fp, "  n%ld [label=\"%s\"];\n", (long)nodes[i], nodes[i]->effect->effect_type_id().c_str());
-               } else {
+               } else if (in_phases.size() == 1) {
                        fprintf(fp, "  n%ld [label=\"%s\" style=\"filled\" fillcolor=\"/accent8/%d\"];\n",
                                (long)nodes[i], nodes[i]->effect->effect_type_id().c_str(),
-                               (in_phase % 8) + 1);
+                               (in_phases[0] % 8) + 1);
+               } else {
+                       // If we had new enough Graphviz, style="wedged" would probably be ideal here.
+                       // But alas.
+                       fprintf(fp, "  n%ld [label=\"%s [in multiple phases]\" style=\"filled\" fillcolor=\"/accent8/%d\"];\n",
+                               (long)nodes[i], nodes[i]->effect->effect_type_id().c_str(),
+                               (in_phases[0] % 8) + 1);
                }
-               for (unsigned j = 0; j < nodes[i]->outgoing_links.size(); ++j) {
-                       std::vector<std::string> labels;
 
-                       if (nodes[i]->outgoing_links[j]->effect->needs_texture_bounce()) {
-                               labels.push_back("needs_bounce");
-                       }
-                       if (nodes[i]->effect->changes_output_size()) {
-                               labels.push_back("resize");
-                       }
+               char from_node_id[256];
+               snprintf(from_node_id, 256, "n%ld", (long)nodes[i]);
 
-                       switch (nodes[i]->output_color_space) {
-                       case COLORSPACE_INVALID:
-                               labels.push_back("spc[invalid]");
-                               break;
-                       case COLORSPACE_REC_601_525:
-                               labels.push_back("spc[rec601-525]");
-                               break;
-                       case COLORSPACE_REC_601_625:
-                               labels.push_back("spc[rec601-625]");
-                               break;
-                       default:
-                               break;
-                       }
-
-                       switch (nodes[i]->output_gamma_curve) {
-                       case GAMMA_INVALID:
-                               labels.push_back("gamma[invalid]");
-                               break;
-                       case GAMMA_sRGB:
-                               labels.push_back("gamma[sRGB]");
-                               break;
-                       case GAMMA_REC_601:  // and GAMMA_REC_709
-                               labels.push_back("gamma[rec601/709]");
-                               break;
-                       default:
-                               break;
-                       }
+               for (unsigned j = 0; j < nodes[i]->outgoing_links.size(); ++j) {
+                       char to_node_id[256];
+                       snprintf(to_node_id, 256, "n%ld", (long)nodes[i]->outgoing_links[j]);
 
-                       switch (nodes[i]->output_alpha_type) {
-                       case ALPHA_INVALID:
-                               labels.push_back("alpha[invalid]");
-                               break;
-                       case ALPHA_BLANK:
-                               labels.push_back("alpha[blank]");
-                               break;
-                       case ALPHA_POSTMULTIPLIED:
-                               labels.push_back("alpha[postmult]");
-                               break;
-                       default:
-                               break;
-                       }
+                       std::vector<std::string> labels = get_labels_for_edge(nodes[i], nodes[i]->outgoing_links[j]);
+                       output_dot_edge(fp, from_node_id, to_node_id, labels);
+               }
 
-                       if (labels.empty()) {
-                               fprintf(fp, "  n%ld -> n%ld;\n", (long)nodes[i], (long)nodes[i]->outgoing_links[j]);
-                       } else {
-                               std::string label = labels[0];
-                               for (unsigned k = 1; k < labels.size(); ++k) {
-                                       label += ", " + labels[k];
-                               }
-                               fprintf(fp, "  n%ld -> n%ld [label=\"%s\"];\n", (long)nodes[i], (long)nodes[i]->outgoing_links[j], label.c_str());
-                       }
+               if (nodes[i]->outgoing_links.empty() && !nodes[i]->disabled) {
+                       // Output node.
+                       std::vector<std::string> labels = get_labels_for_edge(nodes[i], NULL);
+                       output_dot_edge(fp, from_node_id, "output", labels);
                }
        }
        fprintf(fp, "}\n");
@@ -534,6 +498,78 @@ void EffectChain::output_dot(const char *filename)
        fclose(fp);
 }
 
+std::vector<std::string> EffectChain::get_labels_for_edge(const Node *from, const Node *to)
+{
+       std::vector<std::string> labels;
+
+       if (to != NULL && to->effect->needs_texture_bounce()) {
+               labels.push_back("needs_bounce");
+       }
+       if (from->effect->changes_output_size()) {
+               labels.push_back("resize");
+       }
+
+       switch (from->output_color_space) {
+       case COLORSPACE_INVALID:
+               labels.push_back("spc[invalid]");
+               break;
+       case COLORSPACE_REC_601_525:
+               labels.push_back("spc[rec601-525]");
+               break;
+       case COLORSPACE_REC_601_625:
+               labels.push_back("spc[rec601-625]");
+               break;
+       default:
+               break;
+       }
+
+       switch (from->output_gamma_curve) {
+       case GAMMA_INVALID:
+               labels.push_back("gamma[invalid]");
+               break;
+       case GAMMA_sRGB:
+               labels.push_back("gamma[sRGB]");
+               break;
+       case GAMMA_REC_601:  // and GAMMA_REC_709
+               labels.push_back("gamma[rec601/709]");
+               break;
+       default:
+               break;
+       }
+
+       switch (from->output_alpha_type) {
+       case ALPHA_INVALID:
+               labels.push_back("alpha[invalid]");
+               break;
+       case ALPHA_BLANK:
+               labels.push_back("alpha[blank]");
+               break;
+       case ALPHA_POSTMULTIPLIED:
+               labels.push_back("alpha[postmult]");
+               break;
+       default:
+               break;
+       }
+
+       return labels;
+}
+
+void EffectChain::output_dot_edge(FILE *fp,
+                                  const std::string &from_node_id,
+                                  const std::string &to_node_id,
+                                  const std::vector<std::string> &labels)
+{
+       if (labels.empty()) {
+               fprintf(fp, "  %s -> %s;\n", from_node_id.c_str(), to_node_id.c_str());
+       } else {
+               std::string label = labels[0];
+               for (unsigned k = 1; k < labels.size(); ++k) {
+                       label += ", " + labels[k];
+               }
+               fprintf(fp, "  %s -> %s [label=\"%s\"];\n", from_node_id.c_str(), to_node_id.c_str(), label.c_str());
+       }
+}
+
 unsigned EffectChain::fit_rectangle_to_aspect(unsigned width, unsigned height)
 {
        if (float(width) * aspect_denom >= float(height) * aspect_nom) {
@@ -699,6 +735,10 @@ void EffectChain::find_color_spaces_for_inputs()
                        default:
                                assert(false);
                        }
+
+                       if (node->output_alpha_type == ALPHA_PREMULTIPLIED) {
+                               assert(node->output_gamma_curve == GAMMA_LINEAR);
+                       }
                }
        }
 }