projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dynamic keyframes, textbox rework, andrea ffmpeg.opts, perpetual chkpt undo, lv2...
[goodguy/history.git]
/
cinelerra-5.1
/
plugins
/
moveobj
/
moveobj.C
diff --git
a/cinelerra-5.1/plugins/moveobj/moveobj.C
b/cinelerra-5.1/plugins/moveobj/moveobj.C
index 4f5fd0fd36dcf0b6fad250308a466606cd251e6c..a3c9a89684552c6d38447f13c8c5bc23dd33fe89 100644
(file)
--- a/
cinelerra-5.1/plugins/moveobj/moveobj.C
+++ b/
cinelerra-5.1/plugins/moveobj/moveobj.C
@@
-101,7
+101,7
@@
void MoveObj::save_data(KeyFrame *keyframe)
FileXML output;
// cause data to be stored directly in text
FileXML output;
// cause data to be stored directly in text
- output.set_shared_output(keyframe->
get_data(), MESSAGESIZE
);
+ output.set_shared_output(keyframe->
xbuf
);
output.tag.set_title("MOVEOBJ");
output.tag.set_property("DRAW_VECTORS", config.draw_vectors);
output.tag.set_property("DO_STABILIZATION", config.do_stabilization);
output.tag.set_title("MOVEOBJ");
output.tag.set_property("DRAW_VECTORS", config.draw_vectors);
output.tag.set_property("DO_STABILIZATION", config.do_stabilization);
@@
-119,7
+119,7
@@
void MoveObj::save_data(KeyFrame *keyframe)
void MoveObj::read_data(KeyFrame *keyframe)
{
FileXML input;
void MoveObj::read_data(KeyFrame *keyframe)
{
FileXML input;
- input.set_shared_input(keyframe->
get_data(), strlen(keyframe->get_data())
);
+ input.set_shared_input(keyframe->
xbuf
);
int result = 0;
while( !(result = input.read_tag()) ) {
int result = 0;
while( !(result = input.read_tag()) ) {
@@
-255,7
+255,7
@@
int MoveObj::process_buffer(VFrame *frame, int64_t start_position, double frame_
goodFeaturesToTrack(next_mat,
*next_corners, corner_count, 0.01, // quality_level
min_distance, noArray(), block_size,
goodFeaturesToTrack(next_mat,
*next_corners, corner_count, 0.01, // quality_level
min_distance, noArray(), block_size,
-
0,
// use_harris
+
false,
// use_harris
0.04); // k
ptV pt1, pt2;
0.04); // k
ptV pt1, pt2;
@@
-334,7
+334,7
@@
int MoveObj::process_buffer(VFrame *frame, int64_t start_position, double frame_
// interpolate with identity matrix
accum_matrix = w0*identity + w1*accum_matrix;
// interpolate with identity matrix
accum_matrix = w0*identity + w1*accum_matrix;
- AffineMatrix matrix;
+ AffineMatrix
&matrix = affine->
matrix;
for( int i=0,k=0; i<3; ++i )
for( int j=0; j<3; ++j )
matrix.values[i][j] = amat[k++];
for( int i=0,k=0; i<3; ++i )
for( int j=0; j<3; ++j )
matrix.values[i][j] = amat[k++];
@@
-342,7
+342,6
@@
int MoveObj::process_buffer(VFrame *frame, int64_t start_position, double frame_
//printf("MoveObj::process_buffer %d %jd matrix=\n", __LINE__, start_position);
//matrix.dump();
//printf("MoveObj::process_buffer %d %jd matrix=\n", __LINE__, start_position);
//matrix.dump();
- affine->set_matrix(&matrix);
// iframe is always temp, if we get here
output->clear_frame();
affine->process(output, iframe, 0, AffineEngine::TRANSFORM,
// iframe is always temp, if we get here
output->clear_frame();
affine->process(output, iframe, 0, AffineEngine::TRANSFORM,