projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework ffmpeg a/v filter setup, rework ffmpeg hw decode with vid filters, rework...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
vrender.C
diff --git
a/cinelerra-5.1/cinelerra/vrender.C
b/cinelerra-5.1/cinelerra/vrender.C
index 9e6bbc1cbfbfe7bc37609b6afd6ad4aeab83996e..6438443019e6bc9bfee9a12395663a8d56d08ae2 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vrender.C
+++ b/
cinelerra-5.1/cinelerra/vrender.C
@@
-22,6
+22,7
@@
#include "asset.h"
#include "bcsignals.h"
#include "cache.h"
#include "asset.h"
#include "bcsignals.h"
#include "cache.h"
+#include "canvas.h"
#include "clip.h"
#include "condition.h"
#include "datatype.h"
#include "clip.h"
#include "condition.h"
#include "datatype.h"
@@
-74,9
+75,10
@@
VRender::VRender(RenderEngine *renderengine)
VRender::~VRender()
{
VRender::~VRender()
{
- if(input_temp) delete input_temp;
- if(transition_temp) delete transition_temp;
- if(overlayer) delete overlayer;
+ renderengine->wait_done();
+ delete overlayer;
+ delete input_temp;
+ delete transition_temp;
}
}
@@
-97,10
+99,9
@@
Module* VRender::new_module(Track *track)
int VRender::flash_output()
{
int VRender::flash_output()
{
- if(video_out)
- return renderengine->video->write_buffer(video_out, renderengine->get_edl());
- else
- return 0;
+ if( !video_out ) return 0;
+ renderengine->update_scope(video_out);
+ return renderengine->video->write_buffer(video_out, renderengine->get_edl());
}
int VRender::process_buffer(VFrame *video_out,
}
int VRender::process_buffer(VFrame *video_out,
@@
-287,7
+288,7
@@
int VRender::get_colormodel(VEdit *playable_edit, int use_vconsole, int use_bren
void VRender::run()
{
void VRender::run()
{
- int reconfigure;
+ int reconfigure
= 1
;
const int debug = 0;
// Want to know how many samples rendering each frame takes.
const int debug = 0;
// Want to know how many samples rendering each frame takes.
@@
-321,13
+322,13
@@
void VRender::run()
// Want the condition before, since only 1 frame is rendered
// and the number of frames skipped after this frame varies.
current_input_length = 1;
// Want the condition before, since only 1 frame is rendered
// and the number of frames skipped after this frame varies.
current_input_length = 1;
-
- reconfigure = vconsole->test_reconfigure(current_position,
- current_input_length);
-
-
+ if( !reconfigure ) reconfigure =
+ vconsole->test_reconfigure(current_position, current_input_length);
if(debug) printf("VRender::run %d\n", __LINE__);
if(debug) printf("VRender::run %d\n", __LINE__);
- if(reconfigure) restart_playback();
+ if( reconfigure ) {
+ restart_playback();
+ reconfigure = 0;
+ }
if(debug) printf("VRender::run %d\n", __LINE__);
process_buffer(current_position, use_opengl);
if(debug) printf("VRender::run %d\n", __LINE__);
process_buffer(current_position, use_opengl);