Add fallbacks for systems without proper monotonic clocks (e.g. OS X).

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 3ccab448f17a4ae85a3055d2cab375c6c41e6a0d..623d64aad936e081e0b6d9e7f7ee26346a82107f 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -14,6 +14,7 @@
 #include "lift_gamma_gain_effect.h"
 #include "colorspace_conversion_effect.h"
 #include "saturation_effect.h"
+#include "vignette_effect.h"
 #include "texture_enum.h"
 
 EffectChain::EffectChain(unsigned width, unsigned height)
@@ -38,10 +39,14 @@ Effect *instantiate_effect(EffectId effect)
                return new GammaExpansionEffect();
        case EFFECT_GAMMA_COMPRESSION:
                return new GammaCompressionEffect();
+       case EFFECT_COLOR_SPACE_CONVERSION:
+               return new ColorSpaceConversionEffect();
        case EFFECT_LIFT_GAMMA_GAIN:
                return new LiftGammaGainEffect();
        case EFFECT_SATURATION:
                return new SaturationEffect();
+       case EFFECT_VIGNETTE:
+               return new VignetteEffect();
        }
        assert(false);
 }
@@ -132,7 +137,13 @@ std::string replace_prefix(const std::string &text, const std::string &prefix)
 
 void EffectChain::finalize()
 {
-       // TODO: If we want a non-sRGB output color space, convert.
+       if (current_color_space != output_format.color_space) {
+               ColorSpaceConversionEffect *colorspace_conversion = new ColorSpaceConversionEffect();
+               colorspace_conversion->set_int("source_space", current_color_space);
+               colorspace_conversion->set_int("destination_space", output_format.color_space);
+               effects.push_back(colorspace_conversion);
+               current_color_space = output_format.color_space;
+       }
 
        if (current_gamma_curve != output_format.gamma_curve) {
                if (current_gamma_curve != GAMMA_LINEAR) {