X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplaybackengine.C;h=71126cf82810c6fce05b7c2a1aa9dae7ce4c273b;hp=0dd9b37f1e943dfd5db3406cc84779fc61e8c83a;hb=aa9374b902768107ebda0cffe739325ffed372f6;hpb=2778975bea06a53d8165a5e37bdacde1ae5f3320 diff --git a/cinelerra-5.1/cinelerra/playbackengine.C b/cinelerra-5.1/cinelerra/playbackengine.C index 0dd9b37f..71126cf8 100644 --- a/cinelerra-5.1/cinelerra/playbackengine.C +++ b/cinelerra-5.1/cinelerra/playbackengine.C @@ -22,6 +22,7 @@ #include "bchash.h" #include "bcsignals.h" #include "cache.h" +#include "canvas.h" #include "condition.h" #include "edl.h" #include "edlsession.h" @@ -61,6 +62,7 @@ PlaybackEngine::PlaybackEngine(MWindow *mwindow, Canvas *output) stop_command->realtime = 1; sent_command = new TransportCommand(); sent_command->command = -1; + send_active = 0; tracking_lock = new Mutex("PlaybackEngine::tracking_lock"); renderengine_lock = new Mutex("PlaybackEngine::renderengine_lock"); tracking_done = new Condition(1, "PlaybackEngine::tracking_done"); @@ -128,26 +130,25 @@ int PlaybackEngine::create_render_engine() void PlaybackEngine::delete_render_engine() { renderengine_lock->lock("PlaybackEngine::delete_render_engine"); - delete render_engine; - render_engine = 0; + delete render_engine; render_engine = 0; renderengine_lock->unlock(); } void PlaybackEngine::arm_render_engine() { - if(render_engine) + if( render_engine ) render_engine->arm_command(command); } void PlaybackEngine::start_render_engine() { - if(render_engine) render_engine->start_command(); + if( render_engine ) + render_engine->start_command(); } void PlaybackEngine::wait_render_engine() { - if(command->realtime && render_engine) - { + if( command->realtime && render_engine ) { render_engine->join(); } } @@ -180,14 +181,14 @@ void PlaybackEngine::sync_parameters(EDL *edl) { // TODO: lock out render engine from keyframe deletions command->get_edl()->synchronize_params(edl); - if(render_engine) render_engine->get_edl()->synchronize_params(edl); + if( render_engine ) + render_engine->get_edl()->synchronize_params(edl); } - void PlaybackEngine::interrupt_playback(int wait_tracking) { renderengine_lock->lock("PlaybackEngine::interrupt_playback"); - if(render_engine) + if( render_engine ) render_engine->interrupt_playback(); renderengine_lock->unlock(); @@ -195,22 +196,19 @@ void PlaybackEngine::interrupt_playback(int wait_tracking) pause_lock->unlock(); // Wait for tracking to finish if it is running - if(wait_tracking) - { + if( wait_tracking ) { tracking_done->lock("PlaybackEngine::interrupt_playback"); tracking_done->unlock(); } } - // Return 1 if levels exist int PlaybackEngine::get_output_levels(double *levels, long position) { int result = 0; - if(render_engine && render_engine->do_audio) - { - result = 1; + if( render_engine && render_engine->do_audio ) { render_engine->get_output_levels(levels, position); + result = 1; } return result; } @@ -219,10 +217,9 @@ int PlaybackEngine::get_output_levels(double *levels, long position) int PlaybackEngine::get_module_levels(ArrayList *module_levels, long position) { int result = 0; - if(render_engine && render_engine->do_audio) - { - result = 1; + if( render_engine && render_engine->do_audio ) { render_engine->get_module_levels(module_levels, position); + result = 1; } return result; } @@ -287,10 +284,8 @@ double PlaybackEngine::get_tracking_position() // Don't interpolate when every frame is played. - if(command->get_edl()->session->video_every_frame && - render_engine && - render_engine->do_video) - { + if( command->get_edl()->session->video_every_frame && + render_engine && render_engine->do_video ) { result = tracking_position; } else @@ -365,10 +360,14 @@ void PlaybackEngine::run() // Wait for current command to finish output_lock->lock("PlaybackEngine::run"); if( done ) break; -//printf("sent command=%d\n", sent_command->command); // Read the new command + input_lock->lock("PlaybackEngine::run"); command->copy_from(sent_command); +//printf("sent command=%d\n", sent_command->command); + int active = this->send_active; + this->send_active = 0; input_lock->unlock(); + if( !active ) continue; interrupt_playback(0); wait_render_engine(); @@ -408,7 +407,7 @@ void PlaybackEngine::run() // Start tracking after arming so the tracking position doesn't change. // The tracking for a single frame command occurs during PAUSE init_tracking(); - + clear_output(); // Dispatch the command start_render_engine(); break; @@ -417,13 +416,23 @@ void PlaybackEngine::run() } } +void PlaybackEngine::clear_output() +{ + BC_WindowBase *cwdw = output->get_canvas(); + if( !cwdw ) return; + cwdw->lock_window("PlaybackEngine::clear_output"); + output->clear(); + cwdw->unlock_window(); +} void PlaybackEngine::stop_playback(int wait_tracking) { transport_stop(wait_tracking); renderengine_lock->lock("PlaybackEngine::stop_playback"); - if(render_engine) + if( render_engine ) { + render_engine->interrupt_playback(); render_engine->wait_done(); + } renderengine_lock->unlock(); } @@ -432,13 +441,14 @@ void PlaybackEngine::send_command(int command, EDL *edl, int wait_tracking, int { //printf("PlaybackEngine::send_command 1 %d\n", command); // Stop requires transferring the output buffer to a refresh buffer. - int do_stop = 0, do_resume = 0; - int curr_command = this->command->command; + int do_stop = 0; + int curr_command = is_playing_back ? this->command->command : STOP; int curr_single_frame = TransportCommand::single_frame(curr_command); int curr_audio = this->command->toggle_audio ? !curr_single_frame : curr_single_frame; int single_frame = TransportCommand::single_frame(command); int next_audio = next_command->toggle_audio ? !single_frame : single_frame; + float next_speed = next_command->speed; // Dispatch command switch( command ) { @@ -452,17 +462,17 @@ void PlaybackEngine::send_command(int command, EDL *edl, int wait_tracking, int case FAST_FWD: case CURRENT_FRAME: case LAST_FRAME: - if( curr_command == command && !next_command->speed && - !curr_single_frame && curr_audio == next_audio ) { +// run shuttle as no prev command + if( next_speed ) curr_command = COMMAND_NONE; // Same direction pressed twice, not shuttle, and no change in audio state, Stop - do_stop = 1; - break; - } + if( curr_command == command && !curr_single_frame && + curr_audio == next_audio ) { do_stop = 1; break; } + // Resume or change direction switch( curr_command ) { default: transport_stop(0); - do_resume = 1; + next_command->resume = 1; // fall through case STOP: case COMMAND_NONE: @@ -471,7 +481,6 @@ void PlaybackEngine::send_command(int command, EDL *edl, int wait_tracking, int case CURRENT_FRAME: case LAST_FRAME: next_command->realtime = 1; - next_command->resume = do_resume; // Start from scratch transport_command(command, CHANGE_NONE, edl, use_inout); break; @@ -491,12 +500,24 @@ void PlaybackEngine::send_command(int command, EDL *edl, int wait_tracking, int } } -int PlaybackEngine::transport_stop(int wait_tracking) +int PlaybackEngine::put_command(TransportCommand *command, int reset) { - interrupt_playback(0); - input_lock->lock("PlaybackEngine::transport_stop"); - sent_command->copy_from(stop_command); + input_lock->lock("PlaybackEngine::put_command"); + int prev_change_type = sent_command->change_type; + sent_command->copy_from(command); +// run only last command, sum change type + if( send_active ) + sent_command->change_type |= prev_change_type; + send_active = 1; + if( reset ) command->reset(); output_lock->unlock(); + input_lock->unlock(); + return 0; +} + +int PlaybackEngine::transport_stop(int wait_tracking) +{ + put_command(stop_command, 0); if( wait_tracking ) { tracking_done->lock("PlaybackEngine::transport_stop"); tracking_done->unlock(); @@ -513,25 +534,14 @@ int PlaybackEngine::transport_command(int command, int change_type, EDL *new_edl // Just change the EDL if the change requires it because renderengine // structures won't point to the new EDL otherwise and because copying the // EDL for every cursor movement is slow. - switch( change_type ) { - case CHANGE_EDL: - case CHANGE_ALL: + if( change_type & CHANGE_EDL ) next_command->get_edl()->copy_all(new_edl); - break; - case CHANGE_PARAMS: + else if( change_type & CHANGE_PARAMS ) next_command->get_edl()->synchronize_params(new_edl); - break; - } next_command->set_playback_range(new_edl, use_inout, preferences->forward_render_displacement); } - - interrupt_playback(0); - input_lock->lock("PlaybackEngine::transport_command"); - sent_command->copy_from(next_command); - next_command->reset(); - output_lock->unlock(); - + put_command(next_command, 1); //static const char *types[] = { "NONE", // "FRAME_FWD", "NORMAL_FWD", "FAST_FWD", "FRAME_REV", "NORMAL_REV", "FAST_REV", // "STOP", "PAUSE", "SLOW_FWD", "SLOW_REV", "REWIND", "GOTO_END", "CURRENT_FRAME",