X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fplugins%2Ffindobj%2Ffindobj.h;fp=cinelerra-5.1%2Fplugins%2Ffindobject%2Ffindobject.h;h=8c291b28ba701f903a706948fe245dd0ecffd091;hb=9f682a609a1817808682efa68cb96a296815bf80;hp=7825d25f9dd69acf0d3aed4450ad40cd82252530;hpb=6312e51ae978bac56b9c1ba8dfd31dd7fd99c704;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/findobject/findobject.h b/cinelerra-5.1/plugins/findobj/findobj.h similarity index 91% rename from cinelerra-5.1/plugins/findobject/findobject.h rename to cinelerra-5.1/plugins/findobj/findobj.h index 7825d25f..8c291b28 100644 --- a/cinelerra-5.1/plugins/findobject/findobject.h +++ b/cinelerra-5.1/plugins/findobj/findobj.h @@ -26,8 +26,8 @@ -#ifndef FINDOBJECT_H -#define FINDOBJECT_H +#ifndef FINDOBJ_H +#define FINDOBJ_H //#include "config.h" @@ -40,7 +40,7 @@ #include "bchash.inc" #include "filexml.inc" #include "keyframe.inc" -#include "findobject.inc" +#include "findobj.inc" #include "overlayframe.inc" #include "pluginvclient.h" #include "vframe.inc" @@ -88,14 +88,14 @@ using namespace cvflann; #define ALGORITHM_AKAZE 4 #define ALGORITHM_BRISK 5 -class FindObjectConfig +class FindObjConfig { public: - FindObjectConfig(); + FindObjConfig(); - int equivalent(FindObjectConfig &that); - void copy_from(FindObjectConfig &that); - void interpolate(FindObjectConfig &prev, FindObjectConfig &next, + int equivalent(FindObjConfig &that); + void copy_from(FindObjConfig &that); + void interpolate(FindObjConfig &prev, FindObjConfig &next, int64_t prev_frame, int64_t next_frame, int64_t current_frame); void boundaries(); @@ -114,11 +114,11 @@ public: int blend; }; -class FindObjectMain : public PluginVClient +class FindObjMain : public PluginVClient { public: - FindObjectMain(PluginServer *server); - ~FindObjectMain(); + FindObjMain(PluginServer *server); + ~FindObjMain(); int process_buffer(VFrame **frame, int64_t start_position, double frame_rate); #ifdef _SIFT @@ -145,7 +145,7 @@ public: void read_data(KeyFrame *keyframe); void update_gui(); - PLUGIN_CLASS_MEMBERS2(FindObjectConfig) + PLUGIN_CLASS_MEMBERS2(FindObjConfig) AffineEngine *affine; OverlayFrame *overlayer;