projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always make 16-channel MXFs.
[dcpomatic.git]
/
src
/
lib
/
writer.cc
diff --git
a/src/lib/writer.cc
b/src/lib/writer.cc
index 1c8f1a0cd3d8ec2fa3f830b0d57487dd0c0a00ba..b0bd4aaff4766c3ab27c7d859f97cd27c5988951 100644
(file)
--- a/
src/lib/writer.cc
+++ b/
src/lib/writer.cc
@@
-231,17
+231,12
@@
Writer::fake_write (Frame frame, Eyes eyes)
qi.size = _reels[reel].read_frame_info(info_file, frame_in_reel, eyes).size;
}
qi.size = _reels[reel].read_frame_info(info_file, frame_in_reel, eyes).size;
}
+ DCPOMATIC_ASSERT((film()->three_d() && eyes != Eyes::BOTH) || (!film()->three_d() && eyes == Eyes::BOTH));
+
qi.reel = reel;
qi.frame = frame_in_reel;
qi.reel = reel;
qi.frame = frame_in_reel;
- if (film()->three_d() && eyes == Eyes::BOTH) {
- qi.eyes = Eyes::LEFT;
- _queue.push_back (qi);
- qi.eyes = Eyes::RIGHT;
- _queue.push_back (qi);
- } else {
- qi.eyes = eyes;
- _queue.push_back (qi);
- }
+ qi.eyes = eyes;
+ _queue.push_back(qi);
/* Now there's something to do: wake anything wait()ing on _empty_condition */
_empty_condition.notify_all ();
/* Now there's something to do: wake anything wait()ing on _empty_condition */
_empty_condition.notify_all ();
@@
-650,9
+645,7
@@
Writer::finish (boost::filesystem::path output_dcp)
}
dcp::MCASoundField field;
}
dcp::MCASoundField field;
- if (film()->audio_channels() == 2) {
- field = dcp::MCASoundField::STEREO;
- } else if (film()->audio_channels() <= 6) {
+ if (film()->audio_channels() <= 6) {
field = dcp::MCASoundField::FIVE_POINT_ONE;
} else {
field = dcp::MCASoundField::SEVEN_POINT_ONE;
field = dcp::MCASoundField::FIVE_POINT_ONE;
} else {
field = dcp::MCASoundField::SEVEN_POINT_ONE;