proxy cpus usage, unlock win before render_proxy, snap tweaks

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

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index a0e9b955f510417dadc2bcd999bb0681b15b6938..9d1a9dfcca130969e55d69b7a0ed56ebc02e7c63 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -2274,40 +2274,87 @@ void MWindow::remap_audio(int pattern)
        }
 }
 
-void MWindow::set_proxy(int new_scale,
-        ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
+void MWindow::set_proxy(int use_scaler, int new_scale, int auto_scale,
+               ArrayList<Indexable*> *orig_assets,
+               ArrayList<Indexable*> *proxy_assets)
 {
+       int orig_use_scaler = edl->session->proxy_use_scaler;
        int orig_scale = edl->session->proxy_scale;
+// rescale to full size asset in read_frame
+       edl->session->proxy_use_scaler = use_scaler;
        edl->session->proxy_scale = new_scale;
+       edl->session->proxy_auto_scale = auto_scale;
 
+       if( use_scaler ) {
+               for( int i=0; i<proxy_assets->size(); ++i ) {
+                       Asset *proxy_asset = (Asset *)proxy_assets->get(i);
+                       proxy_asset->width = orig_assets->get(i)->get_w();
+                       proxy_asset->height = orig_assets->get(i)->get_h();
+               }
+               new_scale = 1;
+       }
+
+       if( !orig_use_scaler && new_scale != orig_scale ) {
 // project size
-       float orig_w = (float)edl->session->output_w * orig_scale;
-       float orig_h = (float)edl->session->output_h * orig_scale;
-       edl->session->output_w = Units::round(orig_w / new_scale);
-       edl->session->output_h = Units::round(orig_h / new_scale);
+               float orig_w = (float)edl->session->output_w * orig_scale;
+               float orig_h = (float)edl->session->output_h * orig_scale;
+               edl->session->output_w = Units::round(orig_w / new_scale);
+               edl->session->output_h = Units::round(orig_h / new_scale);
 
 // track sizes
-       for( Track *track=edl->tracks->first; track; track=track->next ) {
-               if( track->data_type != TRACK_VIDEO ) continue;
-               orig_w = (float)track->track_w * orig_scale;
-               orig_h = (float)track->track_h * orig_scale;
-               track->track_w = Units::round(orig_w / new_scale);
-               track->track_h = Units::round(orig_h / new_scale);
-               ((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->
-                       set_proxy(orig_scale, new_scale);
-               ((FloatAutos*)track->automation->autos[AUTOMATION_CAMERA_X])->
-                       set_proxy(orig_scale, new_scale);
-               ((FloatAutos*)track->automation->autos[AUTOMATION_CAMERA_Y])->
-                       set_proxy(orig_scale, new_scale);
-               ((FloatAutos*)track->automation->autos[AUTOMATION_PROJECTOR_X])->
-                       set_proxy(orig_scale, new_scale);
-               ((FloatAutos*)track->automation->autos[AUTOMATION_PROJECTOR_Y])->
-                       set_proxy(orig_scale, new_scale);
+               for( Track *track=edl->tracks->first; track; track=track->next ) {
+                       if( track->data_type != TRACK_VIDEO ) continue;
+                       orig_w = (float)track->track_w * orig_scale;
+                       orig_h = (float)track->track_h * orig_scale;
+                       track->track_w = Units::round(orig_w / new_scale);
+                       track->track_h = Units::round(orig_h / new_scale);
+                       ((MaskAutos*)track->automation->autos[AUTOMATION_MASK])->
+                               set_proxy(orig_scale, new_scale);
+                       ((FloatAutos*)track->automation->autos[AUTOMATION_CAMERA_X])->
+                               set_proxy(orig_scale, new_scale);
+                       ((FloatAutos*)track->automation->autos[AUTOMATION_CAMERA_Y])->
+                               set_proxy(orig_scale, new_scale);
+                       ((FloatAutos*)track->automation->autos[AUTOMATION_PROJECTOR_X])->
+                               set_proxy(orig_scale, new_scale);
+                       ((FloatAutos*)track->automation->autos[AUTOMATION_PROJECTOR_Y])->
+                               set_proxy(orig_scale, new_scale);
+               }
+       }
+
+// change original assets to proxy assets
+       int awindow_folder = use_scaler || new_scale != 1 ? AW_PROXY_FOLDER : AW_MEDIA_FOLDER;
+       for( int i=0,n=proxy_assets->size(); i<n; ++i ) {
+               Asset *proxy_asset = edl->assets->update((Asset *)proxy_assets->get(i));
+               proxy_asset->awindow_folder = awindow_folder;
+// replace track contents
+               for( Track *track = edl->tracks->first; track; track = track->next ) {
+                       if( track->data_type != TRACK_VIDEO ) continue;
+                       for( Edit *edit = track->edits->first; edit; edit = edit->next ) {
+                               if( !edit->asset ) continue;
+                               if( !strcmp(edit->asset->path, orig_assets->get(i)->path) ) {
+                                       edit->asset = proxy_asset;
+                               }
+                       }
+               }
+       }
+}
+
+void MWindow::add_proxy(int use_scaler,
+               ArrayList<Indexable*> *orig_assets,
+               ArrayList<Indexable*> *proxy_assets)
+{
+       if( use_scaler ) {
+               for( int i=0,n=proxy_assets->size(); i<n; ++i ) {
+                       Asset *proxy_asset = (Asset *)proxy_assets->get(i);
+                       proxy_asset->width = orig_assets->get(i)->get_w();
+                       proxy_asset->height = orig_assets->get(i)->get_h();
+               }
        }
 
-// assets
-       for( int i=0; i<proxy_assets->size(); i++ ) {
-               Asset *proxy_asset = edl->assets->update((Asset*)proxy_assets->get(i));
+// change original assets to proxy assets
+       for( int i=0,n=proxy_assets->size(); i<n; ++i ) {
+               Asset *proxy_asset = edl->assets->update((Asset *)proxy_assets->get(i));
+               proxy_asset->awindow_folder = AW_PROXY_FOLDER;
 // replace track contents
                for( Track *track = edl->tracks->first; track; track = track->next ) {
                        if( track->data_type != TRACK_VIDEO ) continue;