projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up progress reporting for examine content.
[dcpomatic.git]
/
src
/
lib
/
j2k_still_encoder.cc
diff --git
a/src/lib/j2k_still_encoder.cc
b/src/lib/j2k_still_encoder.cc
index a241dd6e35165468029afe99e00896b770cf254c..de2f1eb468ac9a194e29abf0c9191a122e37b1c7 100644
(file)
--- a/
src/lib/j2k_still_encoder.cc
+++ b/
src/lib/j2k_still_encoder.cc
@@
-50,9
+50,9
@@
J2KStillEncoder::J2KStillEncoder (shared_ptr<const FilmState> s, shared_ptr<cons
void
J2KStillEncoder::process_video (shared_ptr<Image> yuv, int frame, shared_ptr<Subtitle> sub)
{
void
J2KStillEncoder::process_video (shared_ptr<Image> yuv, int frame, shared_ptr<Subtitle> sub)
{
- pair<string, string> const s = Filter::ffmpeg_strings (_fs->filters);
+ pair<string, string> const s = Filter::ffmpeg_strings (_fs->filters
()
);
DCPVideoFrame* f = new DCPVideoFrame (
DCPVideoFrame* f = new DCPVideoFrame (
- yuv, sub, _opt->out_size, _opt->padding, _fs->s
caler, 0, _fs->frames_per_second
, s.second,
+ yuv, sub, _opt->out_size, _opt->padding, _fs->s
ubtitle_offset(), _fs->subtitle_scale(), _fs->scaler(), 0, _fs->frames_per_second()
, s.second,
Config::instance()->colour_lut_index(), Config::instance()->j2k_bandwidth(),
_log
);
Config::instance()->colour_lut_index(), Config::instance()->j2k_bandwidth(),
_log
);
@@
-63,7
+63,7
@@
J2KStillEncoder::process_video (shared_ptr<Image> yuv, int frame, shared_ptr<Sub
}
string const real = _opt->frame_out_path (0, false);
}
string const real = _opt->frame_out_path (0, false);
- for (int i = 1; i < (_fs->still_duration * ImageMagickDecoder::static_frames_per_second()); ++i) {
+ for (int i = 1; i < (_fs->still_duration
()
* ImageMagickDecoder::static_frames_per_second()); ++i) {
if (!boost::filesystem::exists (_opt->frame_out_path (i, false))) {
string const link = _opt->frame_out_path (i, false);
#ifdef DVDOMATIC_POSIX
if (!boost::filesystem::exists (_opt->frame_out_path (i, false))) {
string const link = _opt->frame_out_path (i, false);
#ifdef DVDOMATIC_POSIX