using std::dynamic_pointer_cast;
using std::make_shared;
using std::shared_ptr;
+using std::vector;
+using boost::optional;
using namespace dcpomatic;
Piece::Piece (shared_ptr<Content> c, shared_ptr<Decoder> d, FrameRateChange f)
- : content (c)
+ : _content (c)
, decoder (d)
- , frc (f)
+ , _frc (f)
{
- if (content->audio) {
- for (auto j: content->audio->streams()) {
- _stream_last_push_end[j] = content->position();
+ if (_content->audio) {
+ for (auto j: _content->audio->streams()) {
+ _stream_last_push_end[j] = _content->position();
}
}
}
void
Piece::update_pull_to (DCPTime& pull_to) const
{
- if (done) {
+ if (_done) {
return;
}
Piece::content_video_to_dcp (Frame f) const
{
/* See comment in resampled_audio_to_dcp */
- auto const d = DCPTime::from_frames(f * frc.factor(), frc.dcp) - DCPTime(content->trim_start(), frc);
- return d + content->position();
+ auto const d = DCPTime::from_frames(f * _frc.factor(), _frc.dcp) - DCPTime(_content->trim_start(), _frc);
+ return d + _content->position();
}
Instead we convert the DCPTime using the DCP video rate then account for any skip/repeat.
*/
return DCPTime::from_frames(f, film->audio_frame_rate())
- - DCPTime(content->trim_start(), frc)
- + content->position();
+ - DCPTime(_content->trim_start(), _frc)
+ + _content->position();
}
ContentTime
Piece::dcp_to_content_time (DCPTime t, shared_ptr<const Film> film) const
{
- auto s = t - content->position ();
- s = min (content->length_after_trim(film), s);
- return max (ContentTime(), ContentTime(s, frc) + content->trim_start());
+ auto s = t - _content->position ();
+ s = min (_content->length_after_trim(film), s);
+ return max (ContentTime(), ContentTime(s, _frc) + _content->trim_start());
}
-DCPTime
-Piece::content_time_to_dcp (ContentTime t) const
+optional<DCPTime>
+Piece::content_time_to_dcp (shared_ptr<const Content> content, ContentTime t) const
{
- return max (DCPTime(), DCPTime(t - content->trim_start(), frc) + content->position());
+ if (_content != content) {
+ return {};
+ }
+
+ return max (DCPTime(), DCPTime(t - _content->trim_start(), _frc) + _content->position());
}
bool
Piece::use_video () const
{
- return content->video && content->video->use();
+ return _content->video && _content->video->use();
}
VideoFrameType
Piece::video_frame_type () const
{
- DCPOMATIC_ASSERT (content->video);
- return content->video->frame_type ();
+ DCPOMATIC_ASSERT (_content->video);
+ return _content->video->frame_type ();
}
dcpomatic::DCPTime
Piece::position () const
{
- return content->position ();
+ return _content->position ();
}
dcpomatic::DCPTime
Piece::end (shared_ptr<const Film> film) const
{
- return content->end (film);
+ return _content->end (film);
}
{
return std::make_shared<PlayerVideo>(
video.image,
- content->video->crop (),
- content->video->fade (film, video.frame),
- scale_for_display(content->video->scaled_size(film->frame_size()), container_size, film->frame_size()),
+ _content->video->crop (),
+ _content->video->fade (film, video.frame),
+ scale_for_display(_content->video->scaled_size(film->frame_size()), container_size, film->frame_size()),
container_size,
video.eyes,
video.part,
- content->video->colour_conversion(),
- content->video->range(),
- content,
+ _content->video->colour_conversion(),
+ _content->video->range(),
+ _content,
video.frame,
false
);
int
Piece::resampled_audio_frame_rate (shared_ptr<const Film> film) const
{
- DCPOMATIC_ASSERT (content->audio);
- return content->audio->resampled_frame_rate (film);
+ DCPOMATIC_ASSERT (_content->audio);
+ return _content->audio->resampled_frame_rate (film);
}
double
Piece::audio_gain () const
{
- DCPOMATIC_ASSERT (content->audio);
- return content->audio->gain();
+ DCPOMATIC_ASSERT (_content->audio);
+ return _content->audio->gain();
}
shared_ptr<Decoder>
-Piece::decoder_for (shared_ptr<Content> content_) const
+Piece::decoder_for (shared_ptr<Content> content) const
{
- if (content_ == content) {
+ if (content == _content) {
return decoder;
}
}
-DCPTime
-Piece::decoder_position () const
-{
- return content_time_to_dcp(std::max(decoder->position(), content->trim_start()));
-}
-
-
void
Piece::pass ()
{
- LOG_DEBUG_PLAYER ("Calling pass() on %1", content->path(0));
- done = decoder->pass();
+ LOG_DEBUG_PLAYER ("Calling pass() on %1", _content->path(0));
+ _done = decoder->pass();
}
bool
Piece::reference_dcp_audio () const
{
- auto dcp = dynamic_pointer_cast<DCPContent>(content);
+ auto dcp = dynamic_pointer_cast<DCPContent>(_content);
return dcp && dcp->reference_audio();
}
+
+
+void
+Piece::seek (shared_ptr<const Film> film, DCPTime time, bool accurate)
+{
+ if (time < position()) {
+ /* Before; seek to the start of the content. Even if this request is for an inaccurate seek
+ we must seek this (following) content accurately, otherwise when we come to the end of the current
+ content we may not start right at the beginning of the next, causing a gap (if the next content has
+ been trimmed to a point between keyframes, or something).
+ */
+ decoder->seek (dcp_to_content_time(position(), film), true);
+ _done = false;
+ } else if (position() <= time && time < end(film)) {
+ /* During; seek to position */
+ decoder->seek (dcp_to_content_time(time, film), accurate);
+ _done = false;
+ } else {
+ /* After; this piece is done */
+ _done = true;
+ }
+}
+
+
+optional<dcpomatic::DCPTime>
+Piece::decoder_before(shared_ptr<const Film> film, optional<dcpomatic::DCPTime> time)
+{
+ if (_done) {
+ return {};
+ }
+
+ auto t = content_time_to_dcp(_content, std::max(decoder->position(), _content->trim_start()));
+ DCPOMATIC_ASSERT (t);
+
+ if (*t > end(film)) {
+ _done = true;
+ } else {
+ /* Given two choices at the same time, pick the one with texts so we see it before
+ the video.
+ */
+ if (!time || t < *time || (t == *time && !decoder->text.empty())) {
+ return t;
+ }
+ }
+
+ return {};
+}
+
+vector<dcpomatic::FontData>
+Piece::fonts () const
+{
+ return decoder->fonts();
+}
+
projects / dcpomatic.git / blobdiff