X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fproxy.C;h=fd1ba562cb725aaebee1b41fce341f0710483d87;hp=e368c17c0a860c3d2e56918c0855de2af39bb49c;hb=8e67d840c5a93f77de021102a4f0bfc4e07504f4;hpb=e23393f4ff9f772ac8f47926cf490dc87a630ed4

diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C
index e368c17c..fd1ba562 100644
--- a/cinelerra-5.1/cinelerra/proxy.C
+++ b/cinelerra-5.1/cinelerra/proxy.C
@@ -50,7 +50,6 @@
 #define WIDTH 400
 #define HEIGHT 330
 #define MAX_SCALE 16
-#define PROXY_DEFAULT_VCODEC "h265.mp4"
 
 ProxyMenuItem::ProxyMenuItem(MWindow *mwindow)
  : BC_MenuItem(_("Proxy settings..."),  _("Alt-r"), 'r')
@@ -83,7 +82,13 @@ ProxyDialog::ProxyDialog(MWindow *mwindow)
 	this->mwindow = mwindow;
 	gui = 0;
 	asset = new Asset;
-	strcpy(asset->vcodec, PROXY_DEFAULT_VCODEC);
+
+// quicker than some, not as good as others
+	asset->format = FILE_FFMPEG;
+	strcpy(asset->fformat, "mpeg");
+	strcpy(asset->vcodec, "mpeg.mpeg");
+	asset->ff_video_bitrate = 2000000;
+
 	bzero(size_text, sizeof(char*) * MAX_SIZES);
 	bzero(size_factors, sizeof(int) * MAX_SIZES);
 	size_text[0] = cstrdup(_("Original size"));
@@ -132,9 +137,6 @@ void ProxyDialog::calculate_sizes()
 	}
 	total_sizes = 1;
 
-	int orig_w = mwindow->edl->session->output_w * orig_scale;
-	int orig_h = mwindow->edl->session->output_h * orig_scale;
-
 	if( !use_scaler ) {
 // w,h should stay even for yuv
 		int ow = orig_w, oh = orig_h;
@@ -335,7 +337,7 @@ int ProxyRender::create_needed_proxies(int new_scale)
 
 	ProxyFarm engine(mwindow, this, &needed_idxbls, &needed_proxies);
 	engine.process_packages();
-printf("failed=%d canceled=%d\n", failed, progress->is_cancelled());
+printf("proxy: failed=%d canceled=%d\n", failed, progress->is_cancelled());
 
 // stop progress bar
 	canceled = progress->is_cancelled();
@@ -376,6 +378,12 @@ void ProxyWindow::create_objects()
 	dialog->auto_scale = mwindow->edl->session->proxy_auto_scale;
 	dialog->beep = mwindow->edl->session->proxy_beep;
 	dialog->new_scale = dialog->orig_scale;
+	dialog->orig_w = mwindow->edl->session->output_w;
+	dialog->orig_h = mwindow->edl->session->output_h;
+	if( !dialog->use_scaler ) {
+		dialog->orig_w *= dialog->orig_scale;
+		dialog->orig_h *= dialog->orig_scale;
+	}
 
 	int x = margin;
 	int y = margin+10;
@@ -386,7 +394,7 @@ void ProxyWindow::create_objects()
 	add_subwindow(text = new BC_Title(x, y, _("Scale factor:")));
 	x += text->get_w() + margin;
 
-	int popupmenu_w = BC_PopupMenu::calculate_w(get_text_width(MEDIUMFONT, dialog->size_text[0]));
+	int popupmenu_w = BC_PopupMenu::calculate_w(get_text_width(MEDIUMFONT, dialog->size_text[0])+15);
 	add_subwindow(scale_factor = new ProxyMenu(mwindow, this, x, y, popupmenu_w, ""));
 	scale_factor->update_sizes();
 	x += scale_factor->get_w() + margin;
@@ -441,11 +449,9 @@ void ProxyFormatTools::update_format()
 void ProxyWindow::update()
 {
 	char string[BCSTRLEN];
-	int orig_w = mwindow->edl->session->output_w * dialog->orig_scale;
-	int orig_h = mwindow->edl->session->output_h * dialog->orig_scale;
-	int new_w = orig_w / dialog->new_scale;
+	int new_w = dialog->orig_w / dialog->new_scale;
 	if( new_w & 1 ) ++new_w;
-	int new_h = orig_h / dialog->new_scale;
+	int new_h = dialog->orig_h / dialog->new_scale;
 	if( new_h & 1 ) ++new_h;
 	sprintf(string, "%dx%d", new_w, new_h);
 	new_dimensions->update(string);
@@ -545,7 +551,6 @@ int ProxyMenu::handle_event()
 	for( int i = 0; i < dialog->total_sizes; i++ ) {
 		if( !strcmp(get_text(), pwindow->dialog->size_text[i]) ) {
 			dialog->new_scale = pwindow->dialog->size_factors[i];
-			if( dialog->new_scale == 1 ) dialog->use_scaler = 0;
 			pwindow->update();
 			break;
 		}
@@ -632,6 +637,11 @@ void ProxyClient::process_package(LoadPackage *ptr)
 	int jobs = proxy_render->needed_proxies.size();
 	int processors = preferences->project_smp / jobs + 1, result = 0;
 
+// each cpu should process at least about 1 MB, or it thrashes
+	int size = edl->session->output_w * edl->session->output_h * 4;
+	int cpus = size / 0x100000 + 1;
+	if( processors > cpus ) processors = cpus;
+
 	if( orig->is_asset ) {
 		src_file = new File;
 		src_file->set_processors(processors);