projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add ffmpeg indexing
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
asset.h
diff --git
a/cinelerra-5.0/cinelerra/asset.h
b/cinelerra-5.0/cinelerra/asset.h
index f20fbf452b40d623448cf0d7630446b9c391a475..30523acdb7ae074927779ebd31ee619b56a56882 100644
(file)
--- a/
cinelerra-5.0/cinelerra/asset.h
+++ b/
cinelerra-5.0/cinelerra/asset.h
@@
-30,6
+30,7
@@
#include "filexml.inc"
#include "indexable.h"
#include "indexfile.inc"
#include "filexml.inc"
#include "indexable.h"
#include "indexfile.inc"
+#include "indexstate.inc"
#include "linklist.h"
#include "pluginserver.inc"
#include "linklist.h"
#include "pluginserver.inc"
@@
-79,7
+80,6
@@
public:
// Executed during index building only
// Executed during index building only
- void update_index(Asset *asset);
int equivalent(Asset &asset,
int test_audio,
int test_video);
int equivalent(Asset &asset,
int test_audio,
int test_video);
@@
-96,17
+96,11
@@
public:
int read_index(FileXML *xml);
void reset_audio();
void reset_video();
int read_index(FileXML *xml);
void reset_audio();
void reset_video();
- void reset_index(); // When the index file is wrong, reset the asset values
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.
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.
- int write(FileXML *file,
- int include_index,
- const char *output_path);
-// Write the index data and asset info. Used by IndexThread.
- int write_index(const char *path, int data_bytes);
-
+ int write(FileXML *file, int include_index, const char *output_path);
// For Indexable
int get_audio_channels();
// For Indexable
int get_audio_channels();
@@
-126,7
+120,6
@@
public:
int write_audio(FileXML *xml);
int write_video(FileXML *xml);
int write_index(FileXML *xml);
int write_audio(FileXML *xml);
int write_video(FileXML *xml);
int write_index(FileXML *xml);
- int update_path(char *new_path);
@@
-147,13
+140,6
@@
public:
int64_t audio_length;
int64_t audio_length;
-// 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;
-
// contains video data
int video_data;
int layers, program;
// contains video data
int video_data;
int layers, program;
@@
-220,12
+206,13
@@
public:
int vmpeg_field_order;
int vmpeg_pframe_distance;
int vmpeg_field_order;
int vmpeg_pframe_distance;
-
-
-
-
-
-
+// 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;
// Divx video compression
int divx_bitrate;
// Divx video compression
int divx_bitrate;
@@
-269,9
+256,6
@@
public:
int ac3_bitrate;
int ac3_bitrate;
- char pipe[BCTEXTLEN];
- int use_pipe;
-
// 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.
// 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.