X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fproxy.C;h=420592ea7e7ec7268928f51a687ff9e8b7d70615;hp=aa9c834300225aebf9843178ec40cbf83008d5c1;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=d54e2016ca0bea24cd4371058d0f75aeebdb044f

diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C
index aa9c8343..420592ea 100644
--- a/cinelerra-5.1/cinelerra/proxy.C
+++ b/cinelerra-5.1/cinelerra/proxy.C
@@ -24,7 +24,6 @@
 #include "bcsignals.h"
 #include "cache.h"
 #include "clip.h"
-#include "confirmsave.h"
 #include "cstrdup.h"
 #include "edl.h"
 #include "edlsession.h"
@@ -49,7 +48,7 @@
 #include "vrender.h"
 
 #define WIDTH 400
-#define HEIGHT 300
+#define HEIGHT 330
 #define MAX_SCALE 16
 
 ProxyMenuItem::ProxyMenuItem(MWindow *mwindow)
@@ -88,12 +87,10 @@ ProxyDialog::ProxyDialog(MWindow *mwindow)
 	size_text[0] = cstrdup(_("Original size"));
 	size_factors[0] = 1;
 	total_sizes = 1;
-	proxy_beep = 0;
 }
 
 ProxyDialog::~ProxyDialog()
 {
-	delete proxy_beep;
 	close_window();
 	for( int i=0; i<MAX_SIZES; ++i ) delete [] size_text[i];
 	asset->remove_user();
@@ -163,148 +160,27 @@ void ProxyDialog::calculate_sizes()
 
 void ProxyDialog::handle_close_event(int result)
 {
-	asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0); 
-
-	if( !result && (result=to_proxy()) >= 0 && beep && new_scale != 1 )
-		if( result > 0 )
-			mwindow->beep(2000., 1.5, 0.5);
-		else
-			mwindow->beep(4000., 0.25, 0.5);
-}
-
-int ProxyDialog::to_proxy()
-{
-	ArrayList<Indexable*> orig_idxbls;
-	ArrayList<Indexable*> proxy_assets;
-
-	EDL *edl = mwindow->edl;
-	mwindow->edl->Garbage::add_user();
-	mwindow->save_backup();
-	mwindow->undo->update_undo_before(_("proxy"), this);
-	ProxyRender proxy_render(mwindow, asset);
-
-// revert project to original size from current size
-// remove all session proxy assets at the at the current proxy_scale
-	int proxy_scale = edl->session->proxy_scale;
-	if( proxy_scale > 1 ) {
-		Asset *orig_asset = edl->assets->first;
-		for( ; orig_asset; orig_asset=orig_asset->next ) {
-			char new_path[BCTEXTLEN];
-			proxy_render.to_proxy_path(new_path, orig_asset, proxy_scale);
-// test if proxy asset was already added to proxy_assets
-			int got_it = 0;
-			for( int i = 0; !got_it && i<proxy_assets.size(); ++i )
-				got_it = !strcmp(proxy_assets[i]->path, new_path);
-			if( got_it ) continue;
-			Asset *proxy_asset = edl->assets->get_asset(new_path);
-			if( !proxy_asset ) continue;
-// add pointer to existing EDL asset if it exists
-// EDL won't delete it unless it's the same pointer.
-			proxy_assets.append(proxy_asset);
-			proxy_asset->add_user();
-			orig_idxbls.append(orig_asset);
-			orig_asset->add_user();
-		}
-		for( int i=0,n=edl->nested_edls.size(); i<n; ++i ) {
-			EDL *orig_nested = edl->nested_edls[i];
-			char new_path[BCTEXTLEN];
-			if( !ProxyRender::from_proxy_path(new_path, orig_nested, proxy_scale) )
-				continue;
-			proxy_render.to_proxy_path(new_path, orig_nested, proxy_scale);
-// test if proxy asset was already added to proxy_assets
-			int got_it = 0;
-			for( int i = 0; !got_it && i<proxy_assets.size(); ++i )
-				got_it = !strcmp(proxy_assets[i]->path, new_path);
-			if( got_it ) continue;
-			Asset *proxy_nested = edl->assets->get_asset(new_path);
-			if( !proxy_nested ) continue;
-// add pointer to existing EDL asset if it exists
-// EDL won't delete it unless it's the same pointer.
-			proxy_assets.append(proxy_nested);
-			proxy_nested->add_user();
-			orig_idxbls.append(orig_nested);
-			orig_nested->add_user();
-		}
-
-// convert from the proxy assets to the original assets
-		int auto_scale = edl->session->proxy_auto_scale;
-		int beep = edl->session->proxy_beep;
-		mwindow->set_proxy(0, 1, auto_scale, beep, &proxy_assets, &orig_idxbls);
-
-// remove the references
-		for( int i=0; i<proxy_assets.size(); ++i ) {
-			Asset *proxy = (Asset *) proxy_assets[i];
-			proxy->width = proxy->actual_width;
-			proxy->height = proxy->actual_height;
-			proxy->remove_user();
-			mwindow->edl->assets->remove_pointer(proxy);
-			proxy->remove_user();
-		}
-		proxy_assets.remove_all();
-		for( int i = 0; i < orig_idxbls.size(); i++ )
-			orig_idxbls[i]->remove_user();
-		orig_idxbls.remove_all();
-	}
-
-	ArrayList<char *> confirm_paths;    // test for new files
-	confirm_paths.set_array_delete();
-
-// convert to new size if not original size
-	if( new_scale != 1 ) {
-		FileSystem fs;
-		Asset *orig = mwindow->edl->assets->first;
-		for( ; orig; orig=orig->next ) {
-			Asset *proxy = proxy_render.add_original(orig, new_scale);
-			if( !proxy ) continue;
-			int exists = fs.get_size(proxy->path) > 0 ? 1 : 0;
-			int got_it = exists && // if proxy exists, and is newer than orig
-			    fs.get_date(proxy->path) > fs.get_date(orig->path) ? 1 : 0;
-			if( !got_it ) {
-				if( exists ) // prompt user to overwrite
-					confirm_paths.append(cstrdup(proxy->path));
-				proxy_render.add_needed(orig, proxy);
-			}
-		}
-		for( int i=0,n=edl->nested_edls.size(); i<n; ++i ) {
-			EDL *orig_nested = edl->nested_edls[i];
-			Asset *proxy = proxy_render.add_original(orig_nested, new_scale);
-			if( !proxy ) continue;
-			int exists = fs.get_size(proxy->path) > 0 ? 1 : 0;
-			int got_it = exists && // if proxy exists, and is newer than orig_nested
-			    fs.get_date(proxy->path) > fs.get_date(orig_nested->path) ? 1 : 0;
-			if( !got_it ) {
-				if( exists ) // prompt user to overwrite
-					confirm_paths.append(cstrdup(proxy->path));
-				proxy_render.add_needed(orig_nested, proxy);
-			}
-		}
-	}
-
-	int result = 0;
-// test for existing files
-	if( confirm_paths.size() ) {
-		result = ConfirmSave::test_files(mwindow, &confirm_paths);
-		confirm_paths.remove_all_objects();
+	if( result ) return;
+	if( !File::renders_video(asset) ) {
+		eprintf("Specified format does not render video");
+		return;
 	}
-
-	if( !result )
-		result = proxy_render.create_needed_proxies(new_scale);
-
-	if( !result ) // resize project
-		mwindow->set_proxy(use_scaler, new_scale, auto_scale, beep,
-			&proxy_render.orig_idxbls, &proxy_render.orig_proxies);
-
-	mwindow->undo->update_undo_after(_("proxy"), LOAD_ALL);
-	mwindow->edl->Garbage::remove_user();
-	mwindow->restart_brender();
-
-	mwindow->gui->lock_window("ProxyDialog::to_proxy");
-	mwindow->update_project(LOADMODE_REPLACE);
+	mwindow->edl->session->proxy_auto_scale = auto_scale;
+	mwindow->edl->session->proxy_beep = beep;
+	mwindow->edl->session->proxy_disabled_scale = 1;
+	mwindow->gui->lock_window("ProxyDialog::handle_close_event");
+	mwindow->gui->update_proxy_toggle();
 	mwindow->gui->unlock_window();
-	return !result ? proxy_render.needed_proxies.size() : -1;
+	asset->save_defaults(mwindow->defaults, "PROXY_", 1, 1, 0, 0, 0); 
+	result = mwindow->to_proxy(asset, new_scale, use_scaler);
+	if( result >= 0 && beep && new_scale != 1 ) {
+		static struct { double freq, secs, gain; }
+		    tone[2] = { { 2000., 1.5, 0.5 }, { 4000., 0.25, 0.5 } };
+		int i = result > 0 ? 0 : 1;
+		mwindow->beep(tone[i].freq, tone[i].secs, tone[i].gain);
+	}
 }
 
-
 void ProxyRender::to_proxy_path(char *new_path, Indexable *indexable, int scale)
 {
 // path is already a proxy
@@ -324,9 +200,11 @@ void ProxyRender::to_proxy_path(char *new_path, Indexable *indexable, int scale)
 		sfx = ep;  ep += n;
 	}
 	for( char *cp=prxy; --n>=0; ++cp ) *sfx++ = *cp;
-	const char *ext = format_asset->format == FILE_FFMPEG ?
-		format_asset->fformat : File::get_tag(format_asset->format);
 	*ep++ = '.';
+	const char *ext = indexable->get_video_frames() < 0 ?  "png" :
+		format_asset->format == FILE_FFMPEG ?
+			format_asset->fformat :
+			File::get_tag(format_asset->format);
 	while( *ext ) *ep++ = *ext++;
 	*ep = 0;
 //printf("ProxyRender::to_proxy_path %d %s %s\n", __LINE__, new_path), asset->path);
@@ -372,7 +250,6 @@ ProxyRender::~ProxyRender()
 Asset *ProxyRender::add_original(Indexable *idxbl, int new_scale)
 {
 	if( !idxbl->have_video() ) return 0;
-	if( idxbl->get_video_frames() <= 0 ) return 0;
 // don't proxy proxies
 	if( strstr(idxbl->path,".proxy") ) return 0;
 	char new_path[BCTEXTLEN];
@@ -389,7 +266,16 @@ Asset *ProxyRender::add_original(Indexable *idxbl, int new_scale)
 	if( !proxy ) {
 		proxy = new Asset(new_path);
 // new compression parameters
-		proxy->copy_format(format_asset, 0);
+		int64_t video_frames = idxbl->get_video_frames();
+		if( video_frames < 0 ) {
+			proxy->format = FILE_PNG;
+			proxy->png_use_alpha = 1;
+			proxy->video_length = -1;
+		}
+		else {
+			proxy->copy_format(format_asset, 0);
+			proxy->video_length = video_frames;
+		}
 		proxy->awindow_folder = AW_PROXY_FOLDER;
 		proxy->audio_data = 0;
 		proxy->video_data = 1;
@@ -401,10 +287,7 @@ Asset *ProxyRender::add_original(Indexable *idxbl, int new_scale)
 		if( proxy->height & 1 ) ++proxy->height;
 		proxy->actual_height = proxy->height;
 		proxy->frame_rate = idxbl->get_frame_rate();
-		proxy->video_length = idxbl->get_video_frames();
-		edl_assets->append(proxy);
 	}
-	proxy->add_user();
 	orig_proxies.append(proxy);
 	idxbl->add_user();
 	orig_idxbls.append(idxbl);
@@ -516,6 +399,12 @@ void ProxyWindow::create_objects()
 	add_subwindow(new_dimensions = new BC_Title(x, y, ""));
 	y += new_dimensions->get_h() + margin;
 
+	x = margin;
+	add_subwindow(text = new BC_Title(x, y, _("Active Scale: ")));
+	x += text->get_w() + margin;
+	add_subwindow(active_scale = new BC_Title(x, y, ""));
+	y += active_scale->get_h() + margin;
+
 	x = margin;  y += 25;
 	format_tools = new ProxyFormatTools(mwindow, this, dialog->asset);
 	format_tools->create_objects(x, y, 0, 1, 0, 0, 0, 1, 0, 1, // skip the path
@@ -549,11 +438,7 @@ void ProxyFormatTools::update_format()
 
 void ProxyWindow::update()
 {
-// preview the new size
-	char string[BCTEXTLEN];
-//printf("ProxyWindow::update %d %d %d %d %d\n", 
-// __LINE__, mwindow->edl->session->output_w, mwindow->edl->session->output_h,
-// dialog->orig_scale, dialog->new_scale);
+	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;
@@ -566,6 +451,10 @@ void ProxyWindow::update()
 	scale_factor->set_text(string);
 	use_scaler->update();
 	auto_scale->update();
+	int scale = mwindow->edl->session->proxy_scale;
+	if( scale == 1 ) scale = mwindow->edl->session->proxy_disabled_scale;
+	sprintf(string, scale>1 ? "1/%d" : "%d", scale);
+	active_scale->update(string);
 }
 
 
@@ -775,6 +664,7 @@ void ProxyClient::process_package(LoadPackage *ptr)
 	result = dst_file.open_file(preferences, proxy, 0, 1);
 	if( result ) {
 		proxy_render->failed = 1;
+		::remove(proxy->path);
 		return;
 	}
 
@@ -785,8 +675,10 @@ void ProxyClient::process_package(LoadPackage *ptr)
 	VFrame src_frame(src_w,src_h, edl->session->color_model);
 
 	OverlayFrame scaler(processors);
+	int64_t video_length = orig->get_video_frames();
+	if( video_length < 0 ) video_length = 1;
 
-	for( int64_t i=0, length=orig->get_video_frames(); i<length &&
+	for( int64_t i=0; i<video_length &&
 	     !proxy_render->failed && !proxy_render->is_canceled(); ++i ) {
 		if( orig->is_asset ) {
 			src_file->set_video_position(i, 0);
@@ -822,6 +714,8 @@ void ProxyClient::process_package(LoadPackage *ptr)
 		mwindow->mainindexes->add_next_asset(0, asset);
 		mwindow->mainindexes->start_build();
 	}
+	else
+		::remove(proxy->path);
 }