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

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

diff --git a/cinelerra-5.1/plugins/holo/holo.C b/cinelerra-5.1/plugins/holo/holo.C
index fb034b4d00e933d430f1b4f87b9bb2a9f7dda677..717f0f362be7df2c2f941c571a478dc1c7d9170e 100644 (file)
--- a/cinelerra-5.1/plugins/holo/holo.C
+++ b/cinelerra-5.1/plugins/holo/holo.C
@@ -26,7 +26,7 @@
 #include "holo.h"
 #include "holowindow.h"
 #include "language.h"
-#include "cicolors.h"
+#include "bccolors.h"
 
 #include <stdint.h>
 #include <stdio.h>
@@ -60,24 +60,17 @@ HoloMain::HoloMain(PluginServer *server)
        effecttv = 0;
        bgimage = 0;
        do_reconfigure = 1;
-       yuv = new YUV;
-
 }
 
 HoloMain::~HoloMain()
 {
-
-
-
-       if(effecttv)
-       {
+       if(effecttv) {
                delete holo_server;
                delete effecttv;
        }
 
        if(bgimage)
                delete bgimage;
-       delete yuv;
 }
 
 const char* HoloMain::plugin_title() { return _("HolographicTV"); }
@@ -195,10 +188,8 @@ total = 0;
        {
                case 0:
 /* step 1: grab frame-1 to buffer-1 */
-//                     tmp = new VFrame(0,
-//                             input_ptr->get_w(),
-//                             input_ptr->get_h(),
-//                             project_color_model);
+//                     tmp = new VFrame(input_ptr->get_w(),input_ptr->get_h(),
+//                             project_color_model, 0);
                        bgimage->copy_from(input_ptr);
                        break;
 
@@ -247,12 +238,8 @@ int HoloMain::process_realtime(VFrame *input_ptr, VFrame *output_ptr)
                if(!effecttv)
                {
                        effecttv = new EffectTV(input_ptr->get_w(), input_ptr->get_h());
-                       bgimage = new VFrame(0,
-                               -1,
-                               input_ptr->get_w(),
-                               input_ptr->get_h(),
-                               input_ptr->get_color_model(),
-                               -1);
+                       bgimage = new VFrame(input_ptr->get_w(), input_ptr->get_h(),
+                               input_ptr->get_color_model(), 0);
 
                        for(int i = 0; i < 256; i++)
                        {
@@ -367,7 +354,7 @@ if(sizeof(type) == 2) \
                int r = (int)src[0] >> 8; \
                int g = (int)src[1] >> 8; \
                int b = (int)src[2] >> 8; \
-               plugin->yuv->yuv_to_rgb_8(r, g, b); \
+               YUV::yuv.yuv_to_rgb_8(r, g, b); \
                dest = (r << 16) | (g << 8) | b; \
        } \
        else \
@@ -384,7 +371,7 @@ else \
                int r = (int)src[0]; \
                int g = (int)src[1]; \
                int b = (int)src[2]; \
-               plugin->yuv->yuv_to_rgb_8(r, g, b); \
+               YUV::yuv.yuv_to_rgb_8(r, g, b); \
                dest = (r << 16) | (g << 8) | b; \
        } \
        else \
@@ -441,7 +428,7 @@ else \
                                        if(g > 255) g = 255; \
                                        if(b > 255) b = 255; \
  \
-                                       if(is_yuv) plugin->yuv->rgb_to_yuv_8(r, g, b); \
+                                       if(is_yuv) YUV::yuv.rgb_to_yuv_8(r, g, b); \
                                        if(sizeof(type) == 4) \
                                        { \
                                                dest[0] = (type)r / 0xff; \
@@ -508,7 +495,7 @@ else \
                                        if(g > 255) g = 255; \
                                        if(b > 255) b = 255; \
  \
-                                       if(is_yuv) plugin->yuv->rgb_to_yuv_8(r, g, b); \
+                                       if(is_yuv) YUV::yuv.rgb_to_yuv_8(r, g, b); \
                                        if(sizeof(type) == 4) \
                                        { \
                                                dest[0] = (type)r / 0xff; \