X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedlsession.C;h=1ad030702c7170985d9f13a67098eb22d8ef50d6;hb=91055a5ffb7855edcfcc7790d5131c2ad304b10a;hp=ddce17f1b45dbd9c18a1b09ee0edcf928d6d58b5;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index ddce17f1..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;
@@ -121,8 +123,6 @@ EDLSession::EDLSession(EDL *edl)
         show_titles = 1;
 	test_playback_edits = 1;
 	time_format = TIME_HMSF;
-	for(int i = 0; i < 4; i++)
-        	timecode_offset[i] = 0;
         nudge_format = 1;
         tool_window = 0;
 	for(int i = 0; i < MAXCHANNELS; i++) {
@@ -167,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.
@@ -316,10 +320,6 @@ int EDLSession::load_defaults(BC_Hash *defaults)
 	show_titles = defaults->get("SHOW_TITLES", 1);
 //	test_playback_edits = defaults->get("TEST_PLAYBACK_EDITS", 1);
 	time_format = defaults->get("TIME_FORMAT", TIME_HMSF);
-	for(int i = 0; i < 4; i++) {
-		sprintf(string, "TIMECODE_OFFSET_%d", i);
-		timecode_offset[i] = defaults->get(string, 0);
-	}
 	nudge_format = defaults->get("NUDGE_FORMAT", 1);
 	tool_window = defaults->get("TOOL_WINDOW", 0);
 	vconfig_in->load_defaults(defaults);
@@ -452,10 +452,6 @@ int EDLSession::save_defaults(BC_Hash *defaults)
 	defaults->update("SHOW_TITLES", show_titles);
 //	defaults->update("TEST_PLAYBACK_EDITS", test_playback_edits);
 	defaults->update("TIME_FORMAT", time_format);
-	for(int i = 0; i < 4; i++) {
-		sprintf(string, "TIMECODE_OFFSET_%d", i);
-		defaults->update(string, timecode_offset[i]);
-	}
 	defaults->update("NUDGE_FORMAT", nudge_format);
 	defaults->update("TOOL_WINDOW", tool_window);
 	vconfig_in->save_defaults(defaults);
@@ -499,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);
@@ -556,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;
 }
 
@@ -638,10 +637,6 @@ int EDLSession::load_xml(FileXML *file,
 		show_titles = file->tag.get_property("SHOW_TITLES", 1);
 //		test_playback_edits = file->tag.get_property("TEST_PLAYBACK_EDITS", test_playback_edits);
 		time_format = file->tag.get_property("TIME_FORMAT", time_format);
-		for(int i = 0; i < 4; i++) {
-			sprintf(string, "TIMECODE_OFFSET_%d", i);
-			timecode_offset[i] = file->tag.get_property(string, timecode_offset[i]);
-		}
 		nudge_format = file->tag.get_property("NUDGE_FORMAT", nudge_format);
 		tool_window = file->tag.get_property("TOOL_WINDOW", tool_window);
 		vwindow_meter = file->tag.get_property("VWINDOW_METER", vwindow_meter);
@@ -706,10 +701,6 @@ int EDLSession::save_xml(FileXML *file)
 	file->tag.set_property("SHOW_TITLES", show_titles);
 	file->tag.set_property("TEST_PLAYBACK_EDITS", test_playback_edits);
 	file->tag.set_property("TIME_FORMAT", time_format);
-	for(int i = 0; i < 4; i++) {
-		sprintf(string, "TIMECODE_OFFSET_%d", i);
-		file->tag.set_property(string, timecode_offset[i]);
-	}
 	file->tag.set_property("NUDGE_FORMAT", nudge_format);
 	file->tag.set_property("TOOL_WINDOW", tool_window);
 	file->tag.set_property("VWINDOW_METER", vwindow_meter);
@@ -753,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();
@@ -876,9 +869,6 @@ int EDLSession::copy(EDLSession *session)
 	show_titles = session->show_titles;
 	test_playback_edits = session->test_playback_edits;
 	time_format = session->time_format;
-	for(int i = 0; i < 4; i++) {
-		timecode_offset[i] = session->timecode_offset[i];
-	}
 	nudge_format = session->nudge_format;
 	tool_window = session->tool_window;
 	for(int i = 0; i < MAXCHANNELS; i++) {
@@ -894,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;
@@ -903,20 +895,16 @@ int EDLSession::copy(EDLSession *session)
 	return 0;
 }
 
-int64_t EDLSession::get_frame_offset()
-{
-	return int64_t((timecode_offset[3] * 3600 + timecode_offset[2] * 60 +
-		timecode_offset[1]) * frame_rate + timecode_offset[0]);
-}
-
 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);
 }