X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.h;h=b877c47d938d1ccfb29184c673ceb12116f9da80;hp=51f775034e7b7126b7d0dcacfdfe451a29de0b22;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/asset.h b/cinelerra-5.1/cinelerra/asset.h
index 51f77503..b877c47d 100644
--- a/cinelerra-5.1/cinelerra/asset.h
+++ b/cinelerra-5.1/cinelerra/asset.h
@@ -27,6 +27,7 @@
 #include "arraylist.h"
 #include "bcwindowbase.inc"
 #include "bchash.inc"
+#include "edl.inc"
 #include "filexml.inc"
 #include "indexable.h"
 #include "indexfile.inc"
@@ -85,12 +86,7 @@ public:
 
 
 // Executed during index building only
-	int equivalent(Asset &asset,
-		int test_audio,
-		int test_video);
-	Asset& operator=(Asset &asset);
-	int operator==(Asset &asset);
-	int operator!=(Asset &asset);
+	int equivalent(Asset &asset, int test_audio, int test_video, EDL *edl=0);
 // Return 1 if the paths match
 	int test_path(const char *path);
 	int read(FileXML *file,
@@ -100,8 +96,6 @@ public:
 	int read_index(FileXML *xml);
 	void reset_audio();
 	void reset_video();
-	int set_timecode(char *tc, int format, int end);
-	int reset_timecode();
 
 // Output path is the path of the output file if name truncation is desired.
 // It is a "" if; complete names should be used.
@@ -145,24 +139,18 @@ public:
 
 	int64_t audio_length;
 
-// contains video data
-	int video_data;
+// contains video data, single frame data set
+	int video_data, single_frame;
 	int layers, program;
 	double frame_rate;
 
-// Timecode information. User setable, in case of errors in source
-	char reel_name[BCTEXTLEN];
-	int reel_number;
-	int64_t tcstart;
-	int64_t tcend;
-	int tcformat;
-
 	int actual_width, actual_height;
 	int width, height;
 // String or FourCC describing compression
 	char vcodec[BCTEXTLEN];
 
 // Length in frames
+// -1 means a still photo
 	int64_t video_length;
 
 
@@ -220,11 +208,12 @@ public:
 
 // ffmpeg muxer file extension
 	char fformat[BCSTRLEN];
-	char ff_audio_options[BCTEXTLEN];
 	char ff_video_options[BCTEXTLEN];
-	int ff_audio_bitrate;
-	int ff_video_bitrate;
-	int ff_video_quality;
+	char ff_pixel_format[BCSTRLEN];
+	int ff_video_bitrate, ff_video_quality;
+	char ff_audio_options[BCTEXTLEN];
+	char ff_sample_format[BCSTRLEN];
+	int ff_audio_bitrate, ff_audio_quality;
 
 // PNG video compression
 	int png_use_alpha;
@@ -239,6 +228,9 @@ public:
 
 	int ac3_bitrate;
 
+// Insert tag for spherical playback
+	int mov_sphere, jpeg_sphere;
+
 // Image file sequences.  Background rendering doesn't want to write a
 // sequence header but instead wants to start the sequence numbering at a certain
 // number.  This ensures deletion of all the frames which aren't being used.