X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.C;h=1ad030702c7170985d9f13a67098eb22d8ef50d6;hb=8d1431081df60da0719db2c77e4c56830521c7e8;hp=1a83545e063cccf443973b9c7f4583074cd922e4;hpb=3ac8199743f244669cc87ceef9c3cd23710552f3;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index 1a83545e..1ad03070 100644
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -98,6 +98,8 @@ EDLSession::EDLSession(EDL *edl)
 	playback_buffer = 4096;
 	playback_cursor_visible = 0;
 	playback_preload = 0;
+	proxy_use_scaler = 0;
+	proxy_scale = 1;
 	decode_subtitles = 0;
 	subtitle_number = 0;
 	label_cells = 0;
@@ -165,21 +167,25 @@ int EDLSession::need_rerender(EDLSession *ptr)
 		(decode_subtitles != ptr->decode_subtitles) ||
 		(subtitle_number != ptr->subtitle_number) ||
 		(interpolate_raw != ptr->interpolate_raw) ||
-		(white_balance_raw != ptr->white_balance_raw));
+		(white_balance_raw != ptr->white_balance_raw) ||
+		(proxy_use_scaler != ptr->proxy_use_scaler) ||
+		(proxy_scale != ptr->proxy_scale));
 }
 
 void EDLSession::equivalent_output(EDLSession *session, double *result)
 {
-	if(session->output_w != output_w ||
-		session->output_h != output_h ||
-		!EQUIV(session->frame_rate, frame_rate) ||
-		session->color_model != color_model ||
-		session->interpolation_type != interpolation_type ||
-		session->interpolate_raw != interpolate_raw ||
-		session->white_balance_raw != white_balance_raw ||
-		session->mpeg4_deblock != mpeg4_deblock ||
-		session->decode_subtitles != decode_subtitles ||
-		session->subtitle_number != subtitle_number)
+	if( session->output_w != output_w ||
+	    session->output_h != output_h ||
+	    !EQUIV(session->frame_rate, frame_rate) ||
+	    session->color_model != color_model ||
+	    session->interpolation_type != interpolation_type ||
+	    session->interpolate_raw != interpolate_raw ||
+	    session->white_balance_raw != white_balance_raw ||
+	    session->mpeg4_deblock != mpeg4_deblock ||
+	    session->decode_subtitles != decode_subtitles ||
+	    session->subtitle_number != subtitle_number ||
+	    session->proxy_use_scaler != proxy_use_scaler ||
+	    session->proxy_scale != proxy_scale )
 		*result = 0;
 
 // If it's before the current brender_start, render extra data.
@@ -489,6 +495,7 @@ void EDLSession::boundaries()
 	Workarounds::clamp(min_meter_db, -80, -20);
 	Workarounds::clamp(max_meter_db, 0, 10);
 	Workarounds::clamp(frames_per_foot, 1, 32);
+	Workarounds::clamp(proxy_scale, 1, 32);
 	Workarounds::clamp(output_w, 16, (int)BC_INFINITY);
 	Workarounds::clamp(output_h, 16, (int)BC_INFINITY);
 	Workarounds::clamp(video_write_length, 1, 1000);
@@ -546,6 +553,8 @@ int EDLSession::load_video_config(FileXML *file, int append_mode, uint32_t load_
 	output_h = file->tag.get_property("OUTPUTH", output_h);
 	aspect_w = file->tag.get_property("ASPECTW", aspect_w);
 	aspect_h = file->tag.get_property("ASPECTH", aspect_h);
+	proxy_use_scaler = file->tag.get_property("PROXY_USE_SCALER", proxy_use_scaler);
+	proxy_scale = file->tag.get_property("PROXY_SCALE", proxy_scale);
 	return 0;
 }
 
@@ -735,6 +744,8 @@ int EDLSession::save_video_config(FileXML *file)
 	file->tag.set_property("OUTPUTH", output_h);
 	file->tag.set_property("ASPECTW", aspect_w);
 	file->tag.set_property("ASPECTH", aspect_h);
+	file->tag.set_property("PROXY_USE_SCALER", proxy_use_scaler);
+	file->tag.set_property("PROXY_SCALE", proxy_scale);
 	file->append_tag();
 	file->tag.set_title("/VIDEO");
 	file->append_tag();
@@ -873,6 +884,8 @@ int EDLSession::copy(EDLSession *session)
 	view_follows_playback = session->view_follows_playback;
 	vwindow_meter = session->vwindow_meter;
 	vwindow_zoom = session->vwindow_zoom;
+	proxy_use_scaler = session->proxy_use_scaler;
+	proxy_scale = session->proxy_scale;
 
 	subtitle_number = session->subtitle_number;
 	decode_subtitles = session->decode_subtitles;
@@ -887,9 +900,11 @@ void EDLSession::dump()
 	printf("EDLSession::dump\n");
 	printf("    audio_tracks=%d audio_channels=%d sample_rate=%jd\n"
 		"    video_tracks=%d frame_rate=%f output_w=%d output_h=%d aspect_w=%f aspect_h=%f\n"
-		"    decode subtitles=%d subtitle_number=%d label_cells=%d program_no=%d\n",
+		"    decode subtitles=%d subtitle_number=%d label_cells=%d program_no=%d\n"
+		"    proxy_use_scaler=%d, proxy_scale=%d\n",
 		audio_tracks, audio_channels, sample_rate, video_tracks,
 		frame_rate, output_w, output_h, aspect_w, aspect_h,
-		decode_subtitles, subtitle_number, label_cells, program_no);
+		decode_subtitles, subtitle_number, label_cells, program_no,
+		proxy_use_scaler, proxy_scale);
 }