diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-08-04 23:55:17 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-08-04 23:55:17 +0200 |
| commit | 7bd8eecb8ba8535978d58408dc73ce7528034c7e (patch) | |
| tree | e3019a153415a6becde846fcb6a68f0674341bc1 /src/lib/j2k_encoder.cc | |
| parent | d6aeaf8dd1b3158689da7b75c7417c1838af9c95 (diff) | |
wip: got stuck... because PlayerVideo is related to the render sizeadjust-sizing
because its subtitles are prepared for the _video_container_size that
the Player knows about. I think the only way around this would be to
store the subs in PlayerVideo in some independent way and to scale/convert
to bitmap later.
Diffstat (limited to 'src/lib/j2k_encoder.cc')
| -rw-r--r-- | src/lib/j2k_encoder.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc index 53e1c272f..3e1bbc864 100644 --- a/src/lib/j2k_encoder.cc +++ b/src/lib/j2k_encoder.cc @@ -225,7 +225,7 @@ J2KEncoder::encode (shared_ptr<PlayerVideo> pv, DCPTime time) LOG_DEBUG_ENCODE("Frame @ %1 FAKE", to_string(time)); _writer->fake_write (position, pv->eyes ()); frame_done (); - } else if (pv->has_j2k() && !_film->reencode_j2k()) { + } else if (pv->has_j2k(_film->frame_size(), _film->frame_size()) && !_film->reencode_j2k()) { LOG_DEBUG_ENCODE("Frame @ %1 J2K", to_string(time)); /* This frame already has J2K data, so just write it */ _writer->write (pv->j2k(), position, pv->eyes ()); @@ -239,6 +239,7 @@ J2KEncoder::encode (shared_ptr<PlayerVideo> pv, DCPTime time) LOG_TIMING ("add-frame-to-queue queue=%1", _queue.size ()); _queue.push_back (DCPVideo( pv, + _film->frame_size(), position, _film->video_frame_rate(), _film->j2k_bandwidth(), |