Add YCbCr input. Required a bit of reworking of the sRGB extension stuff, but seems...

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index 91b8e29f2c5fe12b5405e9778a3a3c948fab1d01..67955786c9e2efd9a3bfed69021f3d7d4efb05a2 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -5,7 +5,6 @@
 #include <vector>
 
 #include "effect.h"
-#include "effect_id.h"
 #include "image_format.h"
 #include "input.h"
 
@@ -16,24 +15,27 @@ public:
        // User API:
        // input, effects, output, finalize need to come in that specific order.
 
-       Input *add_input(const ImageFormat &format);
+       // EffectChain takes ownership of the given input.
+       // input is returned back for convenience.
+       Input *add_input(Input *input);
 
-       // The returned pointer is owned by EffectChain.
-       Effect *add_effect(EffectId effect) {
+       // EffectChain takes ownership of the given effect.
+       // effect is returned back for convenience.
+       Effect *add_effect(Effect *effect) {
                return add_effect(effect, last_added_effect());
        }
-       Effect *add_effect(EffectId effect, Effect *input) {
+       Effect *add_effect(Effect *effect, Effect *input) {
                std::vector<Effect *> inputs;
                inputs.push_back(input);
                return add_effect(effect, inputs);
        }
-       Effect *add_effect(EffectId effect, Effect *input1, Effect *input2) {
+       Effect *add_effect(Effect *effect, Effect *input1, Effect *input2) {
                std::vector<Effect *> inputs;
                inputs.push_back(input1);
                inputs.push_back(input2);
                return add_effect(effect, inputs);
        }
-       Effect *add_effect(EffectId effect, const std::vector<Effect *> &inputs);
+       Effect *add_effect(Effect *effect, const std::vector<Effect *> &inputs);
 
        // Similar to add_effect, but:
        //
@@ -67,7 +69,9 @@ private:
                std::vector<Effect *> effects;  // In order.
        };
 
-       void set_use_srgb_texture_format(Effect *effect);
+       void find_all_nonlinear_inputs(Effect *effect,
+                                      std::vector<Input *> *nonlinear_inputs,
+                                      std::vector<Effect *> *intermediates);
        Effect *normalize_to_linear_gamma(Effect *input);
        Effect *normalize_to_srgb(Effect *input);