yuv colorspace/range + prefs, ffmpeg colorrange probe, x11 direct force colormodel...

[goodguy/history.git] / cinelerra-5.1 / plugins / crikey / crikey.C

diff --git a/cinelerra-5.1/plugins/crikey/crikey.C b/cinelerra-5.1/plugins/crikey/crikey.C
index 6b942d5d95d13bc4f52b069260db568adfe8791f..6c110c43a1361c7d9c6d688ac727c51ab3a2ad09 100644 (file)
--- a/cinelerra-5.1/plugins/crikey/crikey.C
+++ b/cinelerra-5.1/plugins/crikey/crikey.C
@@ -25,7 +25,7 @@
 
 #include "arraylist.h"
 #include "bccmodels.h"
-#include "cicolors.h"
+#include "bccolors.h"
 #include "clip.h"
 #include "edlsession.h"
 #include "filexml.h"
@@ -255,7 +255,7 @@ void CriKeyConfig::set_target(int is_yuv, int color, float *target)
        float b = ((color>> 0) & 0xff) / 255.0f;
        if( is_yuv ) {
                float y, u, v;
-               YUV::rgb_to_yuv_f(r,g,b, y,u,v);
+               YUV::yuv.rgb_to_yuv_f(r,g,b, y,u,v);
                target[0] = y;
                target[1] = u + 0.5f;
                target[2] = v + 0.5f;
@@ -273,7 +273,7 @@ void CriKeyConfig::set_color(int is_yuv, float *target, int &color)
        float b = target[2];
        if( is_yuv ) {
                float y = r, u = g-0.5f, v = b-0.5f;
-               YUV::yuv_to_rgb_f(y,u,v, r,g,b);
+               YUV::yuv.yuv_to_rgb_f(y,u,v, r,g,b);
        }
        int ir = r >= 1 ? 0xff : r < 0 ? 0 : (int)(r * 256);
        int ig = g >= 1 ? 0xff : g < 0 ? 0 : (int)(g * 256);
@@ -558,7 +558,7 @@ int CriKey::process_buffer(VFrame *frame, int64_t start_position, double frame_r
                delete dst;  dst = 0;
         }
         if( !dst )
-               dst = new VFrame(w, h, BC_A8);
+               dst = new VFrame(w, h, BC_A8, 0);
        dst->clear_frame();
 
        if( !engine )
@@ -578,7 +578,7 @@ int CriKey::process_buffer(VFrame *frame, int64_t start_position, double frame_r
                        delete msk;  msk = 0;
                }
                if( !msk )
-                       msk = new VFrame(w, h, BC_A8);
+                       msk = new VFrame(w, h, BC_A8, 0);
                memset(msk->get_data(), 0xff, msk->get_data_size());
 
                FillRegion fill_region(dst, msk);