projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix mask vframe setup, add unshared vframe constructor
[goodguy/history.git]
/
cinelerra-5.1
/
plugins
/
rgbshift
/
rgbshift.C
diff --git
a/cinelerra-5.1/plugins/rgbshift/rgbshift.C
b/cinelerra-5.1/plugins/rgbshift/rgbshift.C
index d76f4d46fea77957e5d2e8e00977d0cdee2c3f4f..165680a2f7b5c821dd0c648b32c0b744d2b9b7f1 100644
(file)
--- a/
cinelerra-5.1/plugins/rgbshift/rgbshift.C
+++ b/
cinelerra-5.1/plugins/rgbshift/rgbshift.C
@@
-25,7
+25,7
@@
#include "filexml.h"
#include "guicast.h"
#include "language.h"
#include "filexml.h"
#include "guicast.h"
#include "language.h"
-#include "
ci
colors.h"
+#include "
bc
colors.h"
#include "pluginvclient.h"
#include "vframe.h"
#include "pluginvclient.h"
#include "vframe.h"
@@
-268,9
+268,6
@@
void RGBShiftEffect::read_data(KeyFrame *keyframe)
}
}
}
}
-
-static YUV yuv_static;
-
#define RGB_MACRO(type, temp_type, components) \
{ \
for(int i = 0; i < h; i++) { \
#define RGB_MACRO(type, temp_type, components) \
{ \
for(int i = 0; i < h; i++) { \
@@
-310,11
+307,11
@@
static YUV yuv_static;
temp_type g = gp ? gp[1] : 0; \
temp_type b = bp ? bp[2] : 0; \
if( sizeof(type) == 4 ) \
temp_type g = gp ? gp[1] : 0; \
temp_type b = bp ? bp[2] : 0; \
if( sizeof(type) == 4 ) \
-
yuv_static
.rgb_to_yuv_f(r, g, b, y, u, v); \
+
YUV::yuv
.rgb_to_yuv_f(r, g, b, y, u, v); \
else if( sizeof(type) == 2 ) \
else if( sizeof(type) == 2 ) \
-
yuv_static
.rgb_to_yuv_16(r, g, b, y, u, v); \
+
YUV::yuv
.rgb_to_yuv_16(r, g, b, y, u, v); \
else \
else \
-
yuv_static
.rgb_to_yuv_8(r, g, b, y, u, v); \
+
YUV::yuv
.rgb_to_yuv_8(r, g, b, y, u, v); \
out_row[0] = y; \
out_row[1] = u; \
out_row[2] = v; \
out_row[0] = y; \
out_row[1] = u; \
out_row[2] = v; \
@@
-345,7
+342,7
@@
int RGBShiftEffect::process_realtime(VFrame *input, VFrame *output)
delete temp_frame; temp_frame = 0;
}
if( !temp_frame )
delete temp_frame; temp_frame = 0;
}
if( !temp_frame )
- temp_frame = new VFrame(w, h, color_model);
+ temp_frame = new VFrame(w, h, color_model
, 0
);
frame = temp_frame;
if( color_model != input->get_color_model() )
BC_CModels::transfer(frame->get_rows(), input->get_rows(),
frame = temp_frame;
if( color_model != input->get_color_model() )
BC_CModels::transfer(frame->get_rows(), input->get_rows(),