X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fscopewindow.h;h=74201e460f4520a88ee50be2c531c6c3550fe304;hb=6cf1b80d50c6b458241a0d43487fb8519c575c97;hp=3c645521450888cafcb94a64dfb2983ec666b352;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/scopewindow.h b/cinelerra-5.1/cinelerra/scopewindow.h index 3c645521..74201e46 100644 --- a/cinelerra-5.1/cinelerra/scopewindow.h +++ b/cinelerra-5.1/cinelerra/scopewindow.h @@ -30,6 +30,11 @@ #include "scopewindow.inc" #include "theme.inc" +enum { + SCOPE_HISTOGRAM, SCOPE_HISTOGRAM_RGB, + SCOPE_WAVEFORM, SCOPE_WAVEFORM_RGB, SCOPE_WAVEFORM_PLY, + SCOPE_VECTORSCOPE, +}; // Number of divisions in histogram. // 65536 + min and max range to speed up the tabulation @@ -47,7 +52,6 @@ #define MIN_SCOPE_H yS(320) - #define WAVEFORM_DIVISIONS 12 #define VECTORSCOPE_DIVISIONS 11 @@ -63,12 +67,6 @@ class ScopeUnit : public LoadClient { public: ScopeUnit(ScopeGUI *gui, ScopeEngine *server); - void draw_point(unsigned char **rows, - int x, - int y, - int r, - int g, - int b); void process_package(LoadPackage *package); int bins[HIST_SECTIONS][TOTAL_BINS]; ScopeGUI *gui; @@ -89,11 +87,7 @@ public: class ScopePanel : public BC_SubWindow { public: - ScopePanel(ScopeGUI *gui, - int x, - int y, - int w, - int h); + ScopePanel(ScopeGUI *gui, int x, int y, int w, int h); void create_objects(); virtual void update_point(int x, int y); virtual void draw_point(); @@ -108,11 +102,7 @@ public: class ScopeWaveform : public ScopePanel { public: - ScopeWaveform(ScopeGUI *gui, - int x, - int y, - int w, - int h); + ScopeWaveform(ScopeGUI *gui, int x, int y, int w, int h); virtual void update_point(int x, int y); virtual void draw_point(); virtual void clear_point(); @@ -124,11 +114,7 @@ public: class ScopeVectorscope : public ScopePanel { public: - ScopeVectorscope(ScopeGUI *gui, - int x, - int y, - int w, - int h); + ScopeVectorscope(ScopeGUI *gui, int x, int y, int w, int h); virtual void update_point(int x, int y); virtual void draw_point(); virtual void clear_point(); @@ -139,11 +125,7 @@ public: class ScopeHistogram : public ScopePanel { public: - ScopeHistogram(ScopeGUI *gui, - int x, - int y, - int w, - int h); + ScopeHistogram(ScopeGUI *gui, int x, int y, int w, int h); void clear_point(); void update_point(int x, int y); void draw_point(); @@ -152,32 +134,63 @@ public: int drag_x; }; -class ScopeToggle : public BC_Toggle + +class ScopeScopesOn : public BC_MenuItem +{ +public: + ScopeScopesOn(ScopeMenu *scope_menu, const char *text, int id); + int handle_event(); + + ScopeMenu *scope_menu; + int id; +}; + +class ScopeMenu : public BC_PopupMenu +{ +public: + ScopeMenu(ScopeGUI *gui, int x, int y); + void create_objects(); + void update_toggles(); + + ScopeGUI *gui; + ScopeScopesOn *hist_on; + ScopeScopesOn *hist_rgb_on; + ScopeScopesOn *wave_on; + ScopeScopesOn *wave_rgb_on; + ScopeScopesOn *wave_ply_on; + ScopeScopesOn *vect_on; +}; + +class ScopeWaveSlider : public BC_ISlider { public: - ScopeToggle(ScopeGUI *gui, - int x, - int y, - int *value); - static VFrame** get_image_set(ScopeGUI *gui, int *value); + ScopeWaveSlider(ScopeGUI *gui, int x, int y, int w); + int handle_event(); + ScopeGUI *gui; +}; + +class ScopeVectSlider : public BC_ISlider +{ +public: + ScopeVectSlider(ScopeGUI *gui, int x, int y, int w); + int handle_event(); + ScopeGUI *gui; +}; + +class ScopeSmooth : public BC_CheckBox +{ +public: + ScopeSmooth(ScopeGUI *gui, int x, int y); int handle_event(); ScopeGUI *gui; - int *value; }; class ScopeGUI : public PluginClientWindow { public: - ScopeGUI(Theme *theme, - int x, - int y, - int w, - int h, - int cpus); - ScopeGUI(PluginClient *plugin, - int w, - int h); + ScopeGUI(Theme *theme, int x, int y, int w, int h, int cpus); + ScopeGUI(PluginClient *plugin, int w, int h); virtual ~ScopeGUI(); void reset(); @@ -185,6 +198,7 @@ public: void create_panels(); virtual int resize_event(int w, int h); virtual int translation_event(); + virtual void update_scope() {} // Called for user storage when toggles change virtual void toggle_event(); @@ -192,26 +206,26 @@ public: // update toggles void update_toggles(); void calculate_sizes(int w, int h); - void allocate_bitmaps(); + void allocate_vframes(); void draw_overlays(int overlays, int borders, int flush); void process(VFrame *output_frame); void draw(int flash, int flush); void clear_points(int flash); - Theme *theme; VFrame *output_frame; + VFrame *data_frame, *temp_frame; ScopeEngine *engine; - BC_Bitmap *waveform_bitmap; - BC_Bitmap *vector_bitmap; + BoxBlur *box_blur; + VFrame *waveform_vframe; + VFrame *vector_vframe; ScopeHistogram *histogram; ScopeWaveform *waveform; ScopeVectorscope *vectorscope; - ScopeToggle *hist_parade_on; - ScopeToggle *hist_on; - ScopeToggle *waveform_parade_on; - ScopeToggle *waveform_on; - ScopeToggle *vector_on; + ScopeMenu *scope_menu; + ScopeWaveSlider *wave_slider; + ScopeVectSlider *vect_slider; + ScopeSmooth *smooth; BC_Title *value_text; int x, y, w, h; @@ -224,13 +238,49 @@ public: int use_hist_parade, use_wave_parade; int bins[HIST_SECTIONS][TOTAL_BINS]; - int frame_w; + int frame_w, use_smooth; + int use_wave_gain, use_vect_gain; }; +class BoxBlurPackage : public LoadPackage +{ +public: + BoxBlurPackage(); + int u1, u2; +}; +class BoxBlurUnit : public LoadClient +{ +public: + BoxBlurUnit(BoxBlur*server); + template + void blurt_package(LoadPackage *package); + void process_package(LoadPackage *package); +}; -#endif - - +class BoxBlur : public LoadServer +{ +public: + BoxBlur(int cpus); + virtual ~BoxBlur(); + void init_packages(); + LoadClient* new_client(); + LoadPackage* new_package(); + void process(VFrame *dst, VFrame *src, int uv, + int radius, int power, int comp); + void hblur(VFrame *dst, VFrame *src, + int radius, int power, int comp=-1); + void vblur(VFrame *dst, VFrame *src, + int radius, int power, int comp=-1); + void blur(VFrame *dst, VFrame *src, + int radius, int power, int comp=-1); + const uint8_t *src_data; + uint8_t *dst_data; + int src_ustep, dst_ustep; + int src_vstep, dst_vstep; + int radius, power; + int ulen, vlen, c0, c1; +}; +#endif