projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Andrew fixed Attach Transitions and added english tips
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
pluginfclient.C
diff --git
a/cinelerra-5.1/cinelerra/pluginfclient.C
b/cinelerra-5.1/cinelerra/pluginfclient.C
index 03ad7e25df9f1e7e8cbe51f310a8c9a45a9e36a5..a0756e73ab630dec12a803e6e8a22432f1c0fe21 100644
(file)
--- a/
cinelerra-5.1/cinelerra/pluginfclient.C
+++ b/
cinelerra-5.1/cinelerra/pluginfclient.C
@@
-8,6
+8,7
@@
#include "bcwindowbase.h"
#include "bctitle.h"
#include "cstrdup.h"
#include "bcwindowbase.h"
#include "bctitle.h"
#include "cstrdup.h"
+#include "keys.h"
#include "language.h"
#include "mwindow.h"
#include "pluginfclient.h"
#include "language.h"
#include "mwindow.h"
#include "pluginfclient.h"
@@
-186,6
+187,10
@@
PluginFClientText::
int PluginFClientText::handle_event()
{
int PluginFClientText::handle_event()
{
+ if( get_keypress() == RETURN ) {
+ fwin->update();
+ activate();
+ }
return 0;
}
return 0;
}
@@
-884,7
+889,7
@@
int PluginFVClient::activate(int width, int height, int color_model)
char args[BCTEXTLEN];
snprintf(args, sizeof(args),
"video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
char args[BCTEXTLEN];
snprintf(args, sizeof(args),
"video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
- width, height, pix_fmt, best_rate.
num, best_rate.den
, aspect_w, aspect_h);
+ width, height, pix_fmt, best_rate.
den, best_rate.num
, aspect_w, aspect_h);
ret = avfilter_graph_create_filter(&fsrc, avfilter_get_by_name("buffer"),
"in", args, NULL, graph);
}
ret = avfilter_graph_create_filter(&fsrc, avfilter_get_by_name("buffer"),
"in", args, NULL, graph);
}
@@
-942,7
+947,7
@@
int PluginFAClient::process_buffer(int64_t size, Samples **buffer, int64_t start
frame->format = AV_SAMPLE_FMT_FLTP;
frame->channel_layout = (1<<in_channels)-1;
frame->sample_rate = sample_rate;
frame->format = AV_SAMPLE_FMT_FLTP;
frame->channel_layout = (1<<in_channels)-1;
frame->sample_rate = sample_rate;
- frame->pts =
local_to_edl(filter_position)
;
+ frame->pts =
filter_position
;
}
int retry = 10;
}
int retry = 10;
@@
-1002,7
+1007,9
@@
int PluginFAClient::process_buffer(int64_t size, Samples **buffer, int64_t start
PluginFVClient::PluginFVClient(PluginServer *server, const char *name)
PluginFVClient::PluginFVClient(PluginServer *server, const char *name)
- : PluginVClient(server), PluginFClient(this, name)
+ : PluginVClient(server),
+ PluginFClient(this, name),
+ FFVideoConvert(server->preferences)
{
}
{
}
@@
-1041,11
+1048,11
@@
int PluginFVClient::process_buffer(VFrame **frames, int64_t position, double fra
ret = av_buffersink_get_frame(fsink, frame);
if( ret >= 0 || ret != AVERROR(EAGAIN) ) break;
if( !fsrc ) { ret = AVERROR(EIO); break; }
ret = av_buffersink_get_frame(fsink, frame);
if( ret >= 0 || ret != AVERROR(EAGAIN) ) break;
if( !fsrc ) { ret = AVERROR(EIO); break; }
- read_frame(vframe, 0, filter_position
++
, frame_rate, 0);
+ read_frame(vframe, 0, filter_position, frame_rate, 0);
frame->format = pix_fmt;
frame->width = width;
frame->height = height;
frame->format = pix_fmt;
frame->width = width;
frame->height = height;
- frame->pts =
local_to_edl(position)
;
+ frame->pts =
filter_position++
;
ret = av_frame_get_buffer(frame, 32);
if( ret < 0 ) break;
ret = transfer_pixfmt(vframe, frame);
ret = av_frame_get_buffer(frame, 32);
if( ret < 0 ) break;
ret = transfer_pixfmt(vframe, frame);