X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.h;h=90b43524b4aade86f80423a2d8669d03e28555f5;hb=f51838e3e7dec4553d8a85ad5c84c0e44764cae2;hp=b877c47d938d1ccfb29184c673ceb12116f9da80;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/asset.h b/cinelerra-5.1/cinelerra/asset.h
index b877c47d..90b43524 100644
--- a/cinelerra-5.1/cinelerra/asset.h
+++ b/cinelerra-5.1/cinelerra/asset.h
@@ -1,6 +1,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2010 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,12 +37,6 @@
 #include "pluginserver.inc"
 
 
-// Time code formats
-#define TC_DROPFRAME 0
-#define TC_NONDROPFRAME 1
-#define TC_PAL 2
-#define TC_FILM 3
-
 class Asset : public Indexable, public ListItem<Asset>
 {
 public:
@@ -93,6 +88,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,14 +142,16 @@ public:
 
 	int actual_width, actual_height;
 	int width, height;
+// scale factor or 0 if not proxy, proxy_edl if proxyed from nested_edl
+	int proxy_scale, proxy_edl;
 // String or FourCC describing compression
 	char vcodec[BCTEXTLEN];
 
 // Length in frames
 // -1 means a still photo
 	int64_t video_length;
-
-
+// timecode, unknown=-2, no timecode=-1, timecode>=0 
+	double timecode;
 
 // mp3 compression
 	int mp3_bitrate;
@@ -182,12 +180,11 @@ public:
 	double aspect_ratio;
 
 // for the interlace mode
-	int interlace_autofixoption;
 	int interlace_mode;
-	int interlace_fixmethod;
 // for jpeg compression
 	int jpeg_quality;
 
+
 // for mpeg video compression
 	int vmpeg_iframe_distance;
 	int vmpeg_progressive;
@@ -206,18 +203,21 @@ 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;
 
 // PNG video compression
 	int png_use_alpha;
-
+	int png_depth;
+	int png_compression;
 // EXR video compression
 	int exr_use_alpha;
 	int exr_compression;
@@ -225,9 +225,10 @@ public:
 // TIFF video compression.  An enumeration from filetiff.h
 	int tiff_cmodel;
 	int tiff_compression;
-
+// AC3 bitrate
 	int ac3_bitrate;
-
+// FLAC compression
+	int flac_compression;
 // Insert tag for spherical playback
 	int mov_sphere, jpeg_sphere;