X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplaybackengine.C;h=fcbeeb1d083bc79df2b01ccf077eef8a3fc04ed3;hp=16f6bd7a73c65bda3ffd6065186063eefe206f58;hb=8e67d840c5a93f77de021102a4f0bfc4e07504f4;hpb=45dd712aa4b2894f6b2390b4797262831dcdb47a diff --git a/cinelerra-5.1/cinelerra/playbackengine.C b/cinelerra-5.1/cinelerra/playbackengine.C index 16f6bd7a..fcbeeb1d 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" @@ -32,6 +33,7 @@ #include "mwindowgui.h" #include "patchbay.h" #include "tracking.h" +#include "tracks.h" #include "playbackengine.h" #include "playtransport.h" #include "preferences.h" @@ -61,6 +63,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,7 +131,11 @@ int PlaybackEngine::create_render_engine() void PlaybackEngine::delete_render_engine() { renderengine_lock->lock("PlaybackEngine::delete_render_engine"); - delete render_engine; render_engine = 0; + if( render_engine ) { + render_engine->interrupt_playback(); + render_engine->wait_done(); + delete render_engine; render_engine = 0; + } renderengine_lock->unlock(); } @@ -358,10 +365,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(); @@ -401,7 +412,11 @@ 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(); - + if( !command->single_frame() ) { + EDL *edl = command->get_edl(); + if( edl && edl->tracks->playable_video_tracks() ) + clear_output(); + } // Dispatch the command start_render_engine(); break; @@ -410,13 +425,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(); } @@ -425,13 +450,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 ) { @@ -445,17 +471,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: @@ -464,7 +490,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; @@ -486,15 +511,16 @@ void PlaybackEngine::send_command(int command, EDL *edl, int wait_tracking, int int PlaybackEngine::put_command(TransportCommand *command, int reset) { -// commands can deadlock updating tracking,meters,clock... - int mlocked = mwindow->gui->break_lock(); input_lock->lock("PlaybackEngine::put_command"); + int prev_change_type = sent_command->change_type; sent_command->copy_from(command); - if( reset ) - command->reset(); +// 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(); - if( mlocked ) - mwindow->gui->lock_window("PlaybackEngine::put_command"); + input_lock->unlock(); return 0; } @@ -517,15 +543,10 @@ 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 || change_type == CHANGE_ALL ) 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); }