projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
da36048
)
Trim must be part of the video identifier if we are doing encode-trims.
author
Carl Hetherington
<cth@carlh.net>
Thu, 30 May 2013 11:15:01 +0000
(12:15 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 30 May 2013 11:15:01 +0000
(12:15 +0100)
src/lib/film.cc
patch
|
blob
|
history
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index 81c7de77f72bb0b3a04f1e7d906011c8777bcca8..5573ee9d2867f87ae1d4b57703df7883be687147 100644
(file)
--- a/
src/lib/film.cc
+++ b/
src/lib/film.cc
@@
-218,6
+218,10
@@
Film::video_state_identifier () const
<< "_" << j2k_bandwidth()
<< "_" << boost::lexical_cast<int> (colour_lut());
<< "_" << j2k_bandwidth()
<< "_" << boost::lexical_cast<int> (colour_lut());
+ if (trim_type() == ENCODE) {
+ s << "_" << trim_start() << "_" << trim_end();
+ }
+
if (dcp_ab()) {
pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
s << "ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;
if (dcp_ab()) {
pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
s << "ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;