*/
#include <stdint.h>
+#include <algorithm>
#include "player.h"
#include "film.h"
#include "ffmpeg_decoder.h"
#include "job.h"
#include "image.h"
#include "ratio.h"
-#include "resampler.h"
#include "log.h"
#include "scaler.h"
, _audio_merger (f->audio_channels(), bind (&Film::time_to_audio_frames, f.get(), _1), bind (&Film::audio_frames_to_time, f.get(), _1))
, _last_emit_was_black (false)
, _just_did_inaccurate_seek (false)
+ , _approximate_size (false)
{
_playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
_playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
shared_ptr<Decoded> dec = (*i)->decoder->peek ();
if (dec) {
- dec->set_dcp_times ((*i)->frc.speed_up, (*i)->content->position());
+ dec->set_dcp_times ((*i)->frc.speed_up, (*i)->content->position() - (*i)->content->trim_start());
}
- /* XXX: don't know what to do with this */
-#if 0
- if (ad->done()) {
- shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> ((*i)->content);
- assert (ac);
- shared_ptr<Resampler> re = resampler (ac, false);
- if (re) {
- shared_ptr<const AudioBuffers> b = re->flush ();
- if (b->frames ()) {
- process_audio (earliest, b, ac->audio_length ());
- }
- }
- }
-#endif
-
if (dec && dec->dcp_time < earliest_time) {
earliest_piece = *i;
earliest_decoded = dec;
}
if (earliest_audio != TIME_MAX) {
- TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (earliest_audio);
+ TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (max (int64_t (0), earliest_audio));
Audio (tb.audio, tb.time);
+ /* This assumes that the audio_frames_to_time conversion is exact
+ so that there are no accumulated errors caused by rounding.
+ */
_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
}
shared_ptr<DecodedAudio> da = dynamic_pointer_cast<DecodedAudio> (earliest_decoded);
shared_ptr<DecodedSubtitle> ds = dynamic_pointer_cast<DecodedSubtitle> (earliest_decoded);
- if (dv) {
- if (!_just_did_inaccurate_seek && earliest_time > _video_position) {
+ /* Will be set to false if we shouldn't consume the peeked DecodedThing */
+ bool consume = true;
+
+ /* This is the margin either side of _{video,audio}_position that we will accept
+ as a starting point for a frame consecutive to the previous.
+ */
+ DCPTime const margin = TIME_HZ / (2 * _film->video_frame_rate ());
+
+ if (dv && _video) {
+
+ if (_just_did_inaccurate_seek) {
+
+ /* Just emit; no subtlety */
+ emit_video (earliest_piece, dv);
+ step_video_position (dv);
+
+ } else if (dv->dcp_time - _video_position > margin) {
+
+ /* Too far ahead */
- /* See if we're inside some video content */
list<shared_ptr<Piece> >::iterator i = _pieces.begin();
while (i != _pieces.end() && ((*i)->content->position() >= _video_position || _video_position >= (*i)->content->end())) {
++i;
/* We're outside all video content */
emit_black ();
} else {
+ /* We're inside some video; repeat the frame */
_last_incoming_video.video->dcp_time = _video_position;
emit_video (_last_incoming_video.weak_piece, _last_incoming_video.video);
+ step_video_position (_last_incoming_video.video);
}
- } else {
+
+ consume = false;
+
+ } else if (abs (dv->dcp_time - _video_position) < margin) {
+ /* We're ok */
emit_video (earliest_piece, dv);
- earliest_piece->decoder->get ();
- }
- } else if (da) {
- if (!_just_did_inaccurate_seek && earliest_time > _audio_position) {
- emit_silence (earliest_time - _audio_position);
+ step_video_position (dv);
} else {
+ /* Too far behind: skip */
+ }
+
+ _just_did_inaccurate_seek = false;
+
+ } else if (da && _audio) {
+
+ if (da->dcp_time - _audio_position > margin) {
+ /* Too far ahead */
+ emit_silence (da->dcp_time - _audio_position);
+ consume = false;
+ } else if (abs (da->dcp_time - _audio_position) < margin) {
+ /* We're ok */
emit_audio (earliest_piece, da);
- earliest_piece->decoder->get ();
+ } else {
+ /* Too far behind: skip */
}
- } else if (ds) {
+
+ } else if (ds && _video) {
_in_subtitle.piece = earliest_piece;
_in_subtitle.subtitle = ds;
update_subtitle ();
- earliest_piece->decoder->get ();
}
- _just_did_inaccurate_seek = false;
-
+ if (consume) {
+ earliest_piece->decoder->consume ();
+ }
+
return false;
}
assert (content);
FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate());
-#if 0
- XXX
- if (frc.skip && (frame % 2) == 1) {
- return;
- }
-#endif
-
- if (content->trimmed (video->dcp_time - content->position ())) {
- return;
- }
float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio();
- libdcp::Size const image_size = fit_ratio_within (ratio, _video_container_size);
+ libdcp::Size image_size = fit_ratio_within (ratio, _video_container_size);
+ if (_approximate_size) {
+ image_size.width &= ~3;
+ image_size.height &= ~3;
+ }
shared_ptr<PlayerImage> pi (
new PlayerImage (
if (
_film->with_subtitles () &&
- _out_subtitle.subtitle->image &&
- video->dcp_time >= _out_subtitle.subtitle->dcp_time && video->dcp_time <= _out_subtitle.subtitle->dcp_time_to
+ _out_subtitle.image &&
+ video->dcp_time >= _out_subtitle.from && video->dcp_time <= _out_subtitle.to
) {
Position<int> const container_offset (
(_video_container_size.width - image_size.width) / 2,
- (_video_container_size.height - image_size.width) / 2
+ (_video_container_size.height - image_size.height) / 2
);
- pi->set_subtitle (_out_subtitle.subtitle->image, _out_subtitle.position + container_offset);
+ pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset);
}
#ifdef DCPOMATIC_DEBUG
#endif
Video (pi, video->eyes, content->colour_conversion(), video->same, video->dcp_time);
-
+
_last_emit_was_black = false;
- _video_position = rint (video->dcp_time + TIME_HZ / _film->video_frame_rate());
+}
+
+void
+Player::step_video_position (shared_ptr<DecodedVideo> video)
+{
+ /* This is a bit of a hack; don't update _video_position if EYES_RIGHT is on its way */
+ if (video->eyes != EYES_LEFT) {
+ /* This assumes that the video_frames_to_time conversion is exact
+ so that there are no accumulated errors caused by rounding.
+ */
+ _video_position += _film->video_frames_to_time (1);
+ }
}
void
audio->data = gain;
}
- /* Resample */
- if (content->content_audio_frame_rate() != content->output_audio_frame_rate()) {
- audio->data = resampler(content, true)->run (audio->data);
- }
-
if (content->trimmed (audio->dcp_time - content->position ())) {
return;
}
Player::flush ()
{
TimedAudioBuffers<DCPTime> tb = _audio_merger.flush ();
- if (tb.audio) {
+ if (_audio && tb.audio) {
Audio (tb.audio, tb.time);
_audio_position += _film->audio_frames_to_time (tb.audio->frames ());
}
- while (_video_position < _audio_position) {
+ while (_video && _video_position < _audio_position) {
emit_black ();
}
- while (_audio_position < _video_position) {
+ while (_audio && _audio_position < _video_position) {
emit_silence (_video_position - _audio_position);
}
}
_have_valid_pieces = true;
+
+ /* The Piece for the _last_incoming_video will no longer be valid */
+ _last_incoming_video.video.reset ();
+
+ _video_position = _audio_position = 0;
}
void
if (
property == ContentProperty::POSITION || property == ContentProperty::LENGTH ||
- property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END
+ property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END ||
+ property == VideoContentProperty::VIDEO_FRAME_TYPE
) {
_have_valid_pieces = false;
update_subtitle ();
Changed (frequent);
- } else if (
- property == VideoContentProperty::VIDEO_FRAME_TYPE || property == VideoContentProperty::VIDEO_CROP ||
- property == VideoContentProperty::VIDEO_RATIO
- ) {
+ } else if (property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO) {
Changed (frequent);
);
}
-shared_ptr<Resampler>
-Player::resampler (shared_ptr<AudioContent> c, bool create)
-{
- map<shared_ptr<AudioContent>, shared_ptr<Resampler> >::iterator i = _resamplers.find (c);
- if (i != _resamplers.end ()) {
- return i->second;
- }
-
- if (!create) {
- return shared_ptr<Resampler> ();
- }
-
- _film->log()->log (
- String::compose (
- "Creating new resampler for %1 to %2 with %3 channels", c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()
- )
- );
-
- shared_ptr<Resampler> r (new Resampler (c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()));
- _resamplers[c] = r;
- return r;
-}
-
void
Player::emit_black ()
{
shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), t * _film->audio_frame_rate() / TIME_HZ));
silence->make_silent ();
Audio (silence, _audio_position);
+
_audio_position += t;
}
}
if (!_in_subtitle.subtitle->image) {
- _out_subtitle.subtitle->image.reset ();
+ _out_subtitle.image.reset ();
return;
}
_out_subtitle.position.x = rint (_video_container_size.width * (in_rect.x + (in_rect.width * (1 - sc->subtitle_scale ()) / 2)));
_out_subtitle.position.y = rint (_video_container_size.height * (in_rect.y + (in_rect.height * (1 - sc->subtitle_scale ()) / 2)));
-
- _out_subtitle.subtitle->image = _in_subtitle.subtitle->image->scale (
+
+ _out_subtitle.image = _in_subtitle.subtitle->image->scale (
scaled_size,
Scaler::from_id ("bicubic"),
- _in_subtitle.subtitle->image->pixel_format (),
+ PIX_FMT_RGBA,
true
);
-
- _out_subtitle.subtitle->dcp_time = _in_subtitle.subtitle->dcp_time;
- _out_subtitle.subtitle->dcp_time = _in_subtitle.subtitle->dcp_time;
+
+ _out_subtitle.from = _in_subtitle.subtitle->dcp_time;
+ _out_subtitle.to = _in_subtitle.subtitle->dcp_time_to;
}
/** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles.
return true;
}
+void
+Player::set_approximate_size ()
+{
+ _approximate_size = true;
+}
+
+
PlayerImage::PlayerImage (
shared_ptr<const Image> in,
Crop crop,
}
shared_ptr<Image>
-PlayerImage::image ()
+PlayerImage::image (AVPixelFormat format, bool aligned)
{
- shared_ptr<Image> out = _in->crop_scale_window (_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, false);
-
+ shared_ptr<Image> out = _in->crop_scale_window (_crop, _inter_size, _out_size, _scaler, format, aligned);
+
Position<int> const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2);
if (_subtitle_image) {
return out;
}
+
projects / dcpomatic.git / blobdiff