projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit Andrew - add Details of color transfers/primaries, + update x264 from r3106...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
asset.h
diff --git
a/cinelerra-5.1/cinelerra/asset.h
b/cinelerra-5.1/cinelerra/asset.h
index 92b15794ced82f6f31a2144c87ad78c114564cf4..90b43524b4aade86f80423a2d8669d03e28555f5 100644
(file)
--- 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>
/*
* 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
*
* 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"
#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:
class Asset : public Indexable, public ListItem<Asset>
{
public:
@@
-147,16
+142,16
@@
public:
int actual_width, actual_height;
int width, height;
int actual_width, actual_height;
int width, height;
-// scale factor or 0 if not proxy
- int proxy_scale;
+// 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;
// 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;
// mp3 compression
int mp3_bitrate;
@@
-230,9
+225,10
@@
public:
// TIFF video compression. An enumeration from filetiff.h
int tiff_cmodel;
int tiff_compression;
// TIFF video compression. An enumeration from filetiff.h
int tiff_cmodel;
int tiff_compression;
-
+// AC3 bitrate
int ac3_bitrate;
int ac3_bitrate;
-
+// FLAC compression
+ int flac_compression;
// Insert tag for spherical playback
int mov_sphere, jpeg_sphere;
// Insert tag for spherical playback
int mov_sphere, jpeg_sphere;