X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=59454153a5b92ea40079a5b334b48c86e905a6da;hp=fab58403d7c54cfaefccc06232ffcf45d9f97589;hb=refs%2Fheads%2Fmaster;hpb=c9c0e07706fad701a70ee0d1ffb0fcb6304f138c

diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C
index fab58403..59454153 100644
--- a/cinelerra-5.1/cinelerra/asset.C
+++ b/cinelerra-5.1/cinelerra/asset.C
@@ -132,6 +132,8 @@ int Asset::init_values()
 
 	ac3_bitrate = 128;
 
+	flac_compression = 0;
+
 	png_use_alpha = 0;
 	png_depth = 8;
 	png_compression = 0;
@@ -181,9 +183,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, ASSET_MAX_WIDTH);
+ 	CLAMP(height, 0, ASSET_MAX_HEIGHT);
 //printf("Asset::boundaries %d %d %f\n", __LINE__, sample_rate, frame_rate);
 }
 
@@ -293,6 +295,8 @@ void Asset::copy_format(Asset *asset, int do_index)
 	tiff_cmodel = asset->tiff_cmodel;
 	tiff_compression = asset->tiff_compression;
 
+	flac_compression = asset->flac_compression;
+
 	mov_sphere = asset->mov_sphere;
 	jpeg_sphere = asset->jpeg_sphere;
 }
@@ -368,11 +372,6 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl)
 			header == asset.header &&
 			dither == asset.dither &&
 			!strcmp(acodec, asset.acodec));
-		if( result && format == FILE_FFMPEG )
-			result = !strcmp(ff_audio_options, asset.ff_audio_options) &&
-				!strcmp(ff_sample_format, asset.ff_sample_format) &&
-				ff_audio_bitrate == asset.ff_audio_bitrate &&
-				ff_audio_quality == asset.ff_audio_quality;
 	}
 
 
@@ -387,13 +386,6 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl)
 			!strcmp(vcodec, asset.vcodec) &&
 			mov_sphere == asset.mov_sphere &&
 			jpeg_sphere == asset.jpeg_sphere);
-		if( result && format == FILE_FFMPEG )
-			result = !strcmp(ff_video_options, asset.ff_video_options) &&
-				!strcmp(ff_pixel_format, asset.ff_pixel_format) &&
-				ff_video_bitrate == asset.ff_video_bitrate &&
-				ff_video_quality == asset.ff_video_quality &&
-				ff_color_space == asset.ff_color_space &&
-				ff_color_range == asset.ff_color_range;
 	}
 
 	return result;
@@ -805,13 +797,6 @@ void Asset::load_defaults(BC_Hash *defaults,
 	vmpeg_preset = GET_DEFAULT("VMPEG_PRESET", vmpeg_preset);
 	vmpeg_field_order = GET_DEFAULT("VMPEG_FIELD_ORDER", vmpeg_field_order);
 
-	theora_fix_bitrate = GET_DEFAULT("THEORA_FIX_BITRATE", theora_fix_bitrate);
-	theora_bitrate = GET_DEFAULT("THEORA_BITRATE", theora_bitrate);
-	theora_quality = GET_DEFAULT("THEORA_QUALITY", theora_quality);
-	theora_sharpness = GET_DEFAULT("THEORA_SHARPNESS", theora_sharpness);
-	theora_keyframe_frequency = GET_DEFAULT("THEORA_KEYFRAME_FREQUENCY", theora_keyframe_frequency);
-	theora_keyframe_force_frequency = GET_DEFAULT("THEORA_FORCE_KEYFRAME_FEQUENCY", theora_keyframe_force_frequency);
-
 
 	ac3_bitrate = GET_DEFAULT("AC3_BITRATE", ac3_bitrate);
 
@@ -822,6 +807,7 @@ void Asset::load_defaults(BC_Hash *defaults,
 	exr_compression = GET_DEFAULT("EXR_COMPRESSION", exr_compression);
 	tiff_cmodel = GET_DEFAULT("TIFF_CMODEL", tiff_cmodel);
 	tiff_compression = GET_DEFAULT("TIFF_COMPRESSION", tiff_compression);
+	flac_compression = GET_DEFAULT("FLAC_COMPRESSION", flac_compression);
 
 	mov_sphere = GET_DEFAULT("MOV_SPHERE", mov_sphere);
 	jpeg_sphere = GET_DEFAULT("JPEG_SPHERE", jpeg_sphere);
@@ -921,7 +907,7 @@ void Asset::save_defaults(BC_Hash *defaults,
 		UPDATE_DEFAULT("TIFF_CMODEL", tiff_cmodel);
 		UPDATE_DEFAULT("TIFF_COMPRESSION", tiff_compression);
 
-
+		UPDATE_DEFAULT("FLAC_COMPRESSION", flac_compression);
 
 		UPDATE_DEFAULT("MOV_SPHERE", mov_sphere);
 		UPDATE_DEFAULT("JPEG_SPHERE", jpeg_sphere);