upgrade ffmpeg to 3.4.2, add proxy popup, undo/redo deadlock fix, rework nested edl

[goodguy/history.git] / cinelerra-5.1 / cinelerra / renderengine.C

diff --git a/cinelerra-5.1/cinelerra/renderengine.C b/cinelerra-5.1/cinelerra/renderengine.C
index 8ded04e44d2911a61ea53ada36f52412a49d8178..3c73709af7d1c57db02d7edd5e11bedeb4f40fd2 100644 (file)
--- a/cinelerra-5.1/cinelerra/renderengine.C
+++ b/cinelerra-5.1/cinelerra/renderengine.C
@@ -27,6 +27,7 @@
 #include "condition.h"
 #include "edl.h"
 #include "edlsession.h"
+#include "meterhistory.h"
 #include "mutex.h"
 #include "mwindow.h"
 #include "playbackengine.h"
@@ -90,7 +91,7 @@ RenderEngine::~RenderEngine()
        delete interrupt_lock;
        delete first_frame_lock;
        delete config;
-       edl->Garbage::remove_user();
+       if( edl ) edl->Garbage::remove_user();
 }
 
 EDL* RenderEngine::get_edl()
@@ -468,36 +469,31 @@ int RenderEngine::close_output()
 
 void RenderEngine::get_output_levels(double *levels, int64_t position)
 {
-       if(do_audio)
-       {
-               int history_entry = arender->get_history_number(arender->level_samples,
-                       position);
-               for(int i = 0; i < MAXCHANNELS; i++)
-               {
-                       if(arender->audio_out[i])
-                               levels[i] = arender->level_history[i][history_entry];
+       if( do_audio ) {
+               MeterHistory *meter_history = arender->meter_history;
+               int64_t tolerance = 4*arender->meter_render_fragment;
+               int pos = meter_history->get_nearest(position, tolerance);
+               for( int i=0; i<MAXCHANNELS; ++i ) {
+                       if( !arender->audio_out[i] ) continue;
+                       levels[i] = meter_history->get_peak(i, pos);
                }
        }
 }
 
 void RenderEngine::get_module_levels(ArrayList<double> *module_levels, int64_t position)
 {
-       if(do_audio)
-       {
-               for(int i = 0; i < arender->total_modules; i++)
-               {
-//printf("RenderEngine::get_module_levels %p %p\n", ((AModule*)arender->modules[i]), ((AModule*)arender->modules[i])->level_samples);
-                       int history_entry = arender->get_history_number(((AModule*)arender->modules[i])->level_samples, position);
-
-                       module_levels->append(((AModule*)arender->modules[i])->level_history[history_entry]);
+       if( do_audio ) {
+               int64_t tolerance = 4*arender->meter_render_fragment;
+               for( int i=0; i<arender->total_modules; ++i ) {
+                       AModule *amodule = (AModule *)arender->modules[i];
+                       MeterHistory *meter_history = amodule->meter_history;
+                       int pos = meter_history->get_nearest(position, tolerance);
+                       module_levels->append(meter_history->get_peak(0, pos));
                }
        }
 }
 
 
-
-
-
 void RenderEngine::run()
 {
        render_active->lock("RenderEngine::run");
@@ -520,7 +516,7 @@ void RenderEngine::run()
 // Fix the tracking position
        if(playback_engine)
        {
-               if(command->command == CURRENT_FRAME)
+               if(command->command == CURRENT_FRAME || command->command == LAST_FRAME)
                {
 //printf("RenderEngine::run 4.1 %d\n", playback_engine->tracking_position);
                        playback_engine->tracking_position = command->playbackstart;
@@ -544,6 +540,12 @@ void RenderEngine::run()
                                }
                        }
 
+                       if( playback_engine->is_playing_back && command->displacement ) {
+                               double position = playback_engine->tracking_position -
+                                       1./command->get_edl()->session->frame_rate;
+                               playback_engine->tracking_position = position >= 0 ? position : 0;
+                       }
+
                        if(!interrupted) playback_engine->command->command = STOP;
                        playback_engine->stop_tracking();