projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Round the length of video-containing content to the nearest frame.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_encoder.h
diff --git
a/src/lib/ffmpeg_encoder.h
b/src/lib/ffmpeg_encoder.h
index 687d2981ee11108dd72ecb86a3d663c2d720fff9..df2dcfcc866f5a7535c697274244dd4a3a02d6fa 100644
(file)
--- a/
src/lib/ffmpeg_encoder.h
+++ b/
src/lib/ffmpeg_encoder.h
@@
-39,11
+39,15
@@
public:
bool mixdown_to_stereo,
bool split_reels,
int x264_crf
bool mixdown_to_stereo,
bool split_reels,
int x264_crf
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , boost::optional<dcp::Key> key
+ , boost::optional<std::string> id
+#endif
);
void go ();
);
void go ();
-
float
current_rate () const;
+
boost::optional<float>
current_rate () const;
Frame frames_done () const;
bool finishing () const {
return false;
Frame frames_done () const;
bool finishing () const {
return false;
@@
-64,6
+68,10
@@
private:
bool three_d,
boost::filesystem::path output,
std::string extension
bool three_d,
boost::filesystem::path output,
std::string extension
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , boost::optional<dcp::Key> key
+ , boost::optional<std::string> id
+#endif
);
boost::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;
);
boost::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;