X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.h;h=096ea9882a0f58b0d0067a7adb074792cf1a527e;hp=0a2372cb829a3845f4f6e8d22b3a48b80907d559;hb=86c9537e0540010ff43b16feb4cd7de98409eba1;hpb=9668279ccef86a9cc9138aaa1a659f158698f829

diff --git a/cinelerra-5.1/cinelerra/asset.h b/cinelerra-5.1/cinelerra/asset.h
index 0a2372cb..096ea988 100644
--- a/cinelerra-5.1/cinelerra/asset.h
+++ b/cinelerra-5.1/cinelerra/asset.h
@@ -93,6 +93,7 @@ public:
 		int expand_relative = 1);
 	int read_audio(FileXML *xml);
 	int read_video(FileXML *xml);
+	int read_format(FileXML *xml);
 	int read_index(FileXML *xml);
 	void reset_audio();
 	void reset_video();
@@ -146,6 +147,8 @@ public:
 
 	int actual_width, actual_height;
 	int width, height;
+// scale factor or 0 if not proxy
+	int proxy_scale;
 // String or FourCC describing compression
 	char vcodec[BCTEXTLEN];
 
@@ -163,6 +166,21 @@ public:
 // 2 - 3
 	int ampeg_derivative;
 
+// Vorbis compression
+	int vorbis_min_bitrate;
+	int vorbis_bitrate;
+	int vorbis_max_bitrate;
+	int vorbis_vbr;
+
+// Theora compression
+	int theora_fix_bitrate;
+	int theora_bitrate;
+	int theora_quality;
+	int theora_sharpness;
+	int theora_keyframe_frequency;
+	int theora_keyframe_force_frequency;
+
+
 // Set by package render during file creation. -1 means square pixels.
 	double aspect_ratio;
 
@@ -189,11 +207,13 @@ public:
 	int vmpeg_field_order;
 	int vmpeg_pframe_distance;
 
-// ffmpeg muxer file extension
+// ffmpeg
 	char fformat[BCSTRLEN];
+	char ff_format_options[BCTEXTLEN];
 	char ff_video_options[BCTEXTLEN];
 	char ff_pixel_format[BCSTRLEN];
 	int ff_video_bitrate, ff_video_quality;
+	int ff_color_space, ff_color_range;
 	char ff_audio_options[BCTEXTLEN];
 	char ff_sample_format[BCSTRLEN];
 	int ff_audio_bitrate, ff_audio_quality;