X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=2828fe31df7a535088d45da3713a084bd22edbd0;hb=45a8ba3455cf252332c03533a7590df5267ce9aa;hp=fe169cbcd0d2623332b85f0135350ff39d72d388;hpb=01c087cf8b098c6cd424cb2cb3778f3b1317fa21;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C
index fe169cbc..2828fe31 100644
--- a/cinelerra-5.1/cinelerra/asset.C
+++ b/cinelerra-5.1/cinelerra/asset.C
@@ -165,7 +165,9 @@ void Asset::reset_video()
 	actual_width = width = 0;
 	actual_height = height = 0;
 	proxy_scale = 0; // not a proxy
+	proxy_edl = 0; // not proxy from edl
 	video_length = 0;
+	timecode = -2; // unknown
 	single_frame = 0;
 	vmpeg_cmodel = BC_YUV420P;
 	frame_rate = 0;
@@ -179,9 +181,9 @@ void Asset::boundaries()
 // sample_rate & frame_rate are user defined
 // 	CLAMP(sample_rate, 1, 1000000);
 // 	CLAMP(frame_rate, 0.001, 1000000);
- 	CLAMP(channels, 0, 16);
- 	CLAMP(width, 0, 10000);
- 	CLAMP(height, 0, 10000);
+ 	CLAMP(channels, 0, MAX_CHANNELS-1);
+ 	CLAMP(width, 0, 32767);
+ 	CLAMP(height, 0, 32767);
 //printf("Asset::boundaries %d %d %f\n", __LINE__, sample_rate, frame_rate);
 }
 
@@ -216,6 +218,7 @@ void Asset::copy_format(Asset *asset, int do_index)
 	use_header = asset->use_header;
 	aspect_ratio = asset->aspect_ratio;
 	interlace_mode = asset->interlace_mode;
+	timecode = asset->timecode;
 
 	video_data = asset->video_data;
 	layers = asset->layers;
@@ -226,6 +229,7 @@ void Asset::copy_format(Asset *asset, int do_index)
 	actual_width = asset->actual_width;
 	actual_height = asset->actual_height;
 	proxy_scale = asset->proxy_scale;
+	proxy_edl = asset->proxy_edl;
 	strcpy(vcodec, asset->vcodec);
 	strcpy(acodec, asset->acodec);
 
@@ -376,7 +380,8 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl)
 		result = (layers == asset.layers &&
 			program == asset.program &&
 			frame_rate == asset.frame_rate &&
-			asset.interlace_mode    == interlace_mode &&
+			asset.interlace_mode == interlace_mode &&
+			asset.timecode == timecode &&
 			width == asset.width &&
 			height == asset.height &&
 			!strcmp(vcodec, asset.vcodec) &&
@@ -470,6 +475,7 @@ int Asset::read_video(FileXML *file)
 	height = file->tag.get_property("HEIGHT", height);
 	width = file->tag.get_property("WIDTH", width);
 	proxy_scale = file->tag.get_property("PROXY_SCALE", 0);
+	proxy_edl = file->tag.get_property("PROXY_EDL", 0);
 	layers = file->tag.get_property("LAYERS", layers);
 	program = file->tag.get_property("PROGRAM", program);
 // This is loaded from the index file after the EDL but this
@@ -479,6 +485,7 @@ int Asset::read_video(FileXML *file)
 	file->tag.get_property("VCODEC", vcodec);
 
 	video_length = file->tag.get_property("VIDEO_LENGTH", (int64_t)0);
+	timecode = file->tag.get_property("TIMECODE", -2);
 	mov_sphere = file->tag.get_property("MOV_SPHERE", 0);
 	jpeg_sphere = file->tag.get_property("JPEG_SPHERE", 0);
 	single_frame = file->tag.get_property("SINGLE_FRAME", (int64_t)0);
@@ -638,6 +645,7 @@ int Asset::write_video(FileXML *file)
 	file->tag.set_property("HEIGHT", height);
 	file->tag.set_property("WIDTH", width);
 	file->tag.set_property("PROXY_SCALE", proxy_scale);
+	file->tag.set_property("PROXY_EDL", proxy_edl);
 	file->tag.set_property("LAYERS", layers);
 	file->tag.set_property("PROGRAM", program);
 	file->tag.set_property("FRAMERATE", frame_rate);
@@ -645,6 +653,7 @@ int Asset::write_video(FileXML *file)
 		file->tag.set_property("VCODEC", vcodec);
 
 	file->tag.set_property("VIDEO_LENGTH", video_length);
+	file->tag.set_property("TIMECODE", timecode);
 	file->tag.set_property("MOV_SPHERE", mov_sphere);
 	file->tag.set_property("JPEG_SPHERE", jpeg_sphere);
 	file->tag.set_property("SINGLE_FRAME", single_frame);
@@ -741,6 +750,7 @@ void Asset::load_defaults(BC_Hash *defaults,
 		actual_height = GET_DEFAULT("ACTUAL_HEIGHT", actual_height);
 		actual_width = GET_DEFAULT("ACTUAL_WIDTH", actual_width);
 		proxy_scale = GET_DEFAULT("PROXY_SCALE", proxy_scale);
+		proxy_edl = GET_DEFAULT("PROXY_SCALE", proxy_edl);
 		program = GET_DEFAULT("PROGRAM", program);
 		layers = GET_DEFAULT("LAYERS", layers);
 		if(EQUIV(frame_rate, 0)) frame_rate = GET_DEFAULT("FRAMERATE", frame_rate);
@@ -944,6 +954,7 @@ void Asset::save_defaults(BC_Hash *defaults,
 		UPDATE_DEFAULT("ACTUAL_HEIGHT", actual_height);
 		UPDATE_DEFAULT("ACTUAL_WIDTH", actual_width);
 		UPDATE_DEFAULT("PROXY_SCALE", proxy_scale);
+		UPDATE_DEFAULT("PROXY_EDL", proxy_edl);
 		UPDATE_DEFAULT("PROGRAM", program);
 		UPDATE_DEFAULT("LAYERS", layers);
 		UPDATE_DEFAULT("FRAMERATE", frame_rate);
@@ -989,11 +1000,10 @@ int Asset::dump(FILE *fp)
 		" height %d vcodec %s aspect_ratio %f ilace_mode %s\n",
 		video_data, layers, program, frame_rate, width, height,
 		vcodec, aspect_ratio,string);
-	fprintf(fp,"   actual_width %d actual_height %d proxy_scale %d"
-		" video_length %jd repeat %d\n",
-		actual_width, actual_height, proxy_scale, video_length,
-		single_frame);
-	fprintf(fp,"   video_length %jd repeat %d\n", video_length, single_frame);
+	fprintf(fp,"   actual_width %d actual_height %d proxy_scale %d proxy_edl %d\n",
+		actual_width, actual_height, proxy_scale, proxy_edl);
+	fprintf(fp,"   video_length %jd repeat %d timecode %f\n",
+		video_length, single_frame, timecode);
 	fprintf(fp,"   mov_sphere=%d jpeg_sphere=%d\n", mov_sphere, jpeg_sphere);
 	return 0;
 }