X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=f7d43ee92b14de8a9743ab8a2d4eae658b1de55f;hp=f9f92900ff170c47d9001b384116e876fc21a2f8;hb=33aae273918725085d841a8af927bfccd2aa9364;hpb=a2ebbc5e88800bd740652a32285f8145a1acfdc6

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index f9f92900..f7d43ee9 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -511,12 +511,10 @@ int MWindow::copy_default_keyframe()
 	return 0;
 }
 
-
 // Uses cropping coordinates in edl session to crop and translate video.
 // We modify the projector since camera automation depends on the track size.
-void MWindow::crop_video()
+void MWindow::crop_video(int mode)
 {
-
 	undo_before();
 // Clamp EDL crop region
 	if( edl->session->crop_x1 > edl->session->crop_x2 ) {
@@ -529,22 +527,54 @@ void MWindow::crop_video()
 		edl->session->crop_y2 ^= edl->session->crop_y1;
 		edl->session->crop_y1 ^= edl->session->crop_y2;
 	}
-
-	float old_projector_x = (float)edl->session->output_w / 2;
-	float old_projector_y = (float)edl->session->output_h / 2;
-	float new_projector_x = (float)(edl->session->crop_x1 + edl->session->crop_x2) / 2;
-	float new_projector_y = (float)(edl->session->crop_y1 + edl->session->crop_y2) / 2;
-	float projector_offset_x = -(new_projector_x - old_projector_x);
-	float projector_offset_y = -(new_projector_y - old_projector_y);
-
-	edl->tracks->translate_projector(projector_offset_x, projector_offset_y);
-
-	edl->session->output_w = edl->session->crop_x2 - edl->session->crop_x1;
-	edl->session->output_h = edl->session->crop_y2 - edl->session->crop_y1;
-	edl->session->crop_x1 = 0;
-	edl->session->crop_y1 = 0;
-	edl->session->crop_x2 = edl->session->output_w;
-	edl->session->crop_y2 = edl->session->output_h;
+	switch( mode ) {
+	case CROP_REFORMAT: {
+		float ctr_x = edl->session->output_w / 2.;
+		float ctr_y = edl->session->output_h / 2.;
+		float new_x = (edl->session->crop_x1 + edl->session->crop_x2) / 2.;
+		float new_y = (edl->session->crop_y1 + edl->session->crop_y2) / 2.;
+		float dx = -(new_x - ctr_x), dy = -(new_y - ctr_y);
+		edl->tracks->translate_projector(dx, dy, 1);
+
+		edl->session->output_w = edl->session->crop_x2 - edl->session->crop_x1;
+		edl->session->output_h = edl->session->crop_y2 - edl->session->crop_y1;
+		edl->session->crop_x1 = edl->session->crop_y1 = 0;
+		edl->session->crop_x2 = edl->session->output_w;
+		edl->session->crop_y2 = edl->session->output_h;
+		break; }
+	case CROP_RESIZE: {
+		float old_w = edl->session->output_w;
+		float old_h = edl->session->output_h;
+		float new_w = edl->session->crop_x2 - edl->session->crop_x1;
+		float new_h = edl->session->crop_y2 - edl->session->crop_y1;
+		if( !new_w ) new_w = 1;
+		if( !new_h ) new_h = 1;
+		float xzoom = old_w / new_w, yzoom = old_h / new_h;
+		float new_z = bmin(xzoom, yzoom);
+		float new_x = (edl->session->crop_x1 + edl->session->crop_x2) / 2.;
+		float new_y = (edl->session->crop_y1 + edl->session->crop_y2) / 2.;
+		edl->tracks->crop_resize(new_x, new_y, new_z);
+
+		edl->session->crop_x1 = 0;
+		edl->session->crop_y1 = 0;
+		edl->session->crop_x2 = edl->session->output_w;
+		edl->session->crop_y2 = edl->session->output_h;
+		break; }
+	case CROP_SHRINK: {
+		float old_w = edl->session->output_w;
+		float old_h = edl->session->output_h;
+		float new_w = edl->session->crop_x2 - edl->session->crop_x1;
+		float new_h = edl->session->crop_y2 - edl->session->crop_y1;
+		if( !new_w ) new_w = 1;
+		if( !new_h ) new_h = 1;
+		float xzoom = old_w / new_w, yzoom = old_h / new_h;
+		float new_z = bmin(xzoom, yzoom);
+
+		float new_x = (edl->session->crop_x1 + edl->session->crop_x2) / 2.;
+		float new_y = (edl->session->crop_y1 + edl->session->crop_y2) / 2.;
+		edl->tracks->crop_shrink(new_x, new_y, new_z);
+		break; }
+	}
 
 // Recalculate aspect ratio
 	if( defaults->get("AUTOASPECT", 0) ) {