ChangeLog.

[dcpomatic.git] / src / lib / player.cc

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 87b10a3989a2021be3e04c0971f14f7e7fe166fa..cacb42651b1656d706773a7b335c21c054af2458 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -144,7 +144,6 @@ Player::pass ()
 {
        if (!_have_valid_pieces) {
                setup_pieces ();
-               _have_valid_pieces = true;
        }
 
        Time earliest_t = TIME_MAX;
@@ -270,40 +269,38 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
                return;
        }
 
-       /* Convert to RGB first, as FFmpeg doesn't seem to like handling YUV images with odd widths */
-       shared_ptr<Image> work_image = image->scale (image->size (), _film->scaler(), PIX_FMT_RGB24, true);
-
-       work_image = work_image->crop (content->crop(), true);
-
+       Time const time = content->position() + relative_time + extra - content->trim_start ();
        float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio();
-       libdcp::Size image_size = fit_ratio_within (ratio, _video_container_size);
+       libdcp::Size const image_size = fit_ratio_within (ratio, _video_container_size);
+
+       shared_ptr<PlayerImage> pi (
+               new PlayerImage (
+                       image,
+                       content->crop(),
+                       image_size,
+                       _video_container_size,
+                       _film->scaler()
+                       )
+               );
        
-       work_image = work_image->scale (image_size, _film->scaler(), PIX_FMT_RGB24, true);
-
-       Time time = content->position() + relative_time + extra - content->trim_start ();
-           
        if (_film->with_subtitles () && _out_subtitle.image && time >= _out_subtitle.from && time <= _out_subtitle.to) {
-               work_image->alpha_blend (_out_subtitle.image, _out_subtitle.position);
-       }
 
-       if (image_size != _video_container_size) {
-               assert (image_size.width <= _video_container_size.width);
-               assert (image_size.height <= _video_container_size.height);
-               shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
-               im->make_black ();
-               im->copy (work_image, Position<int> ((_video_container_size.width - image_size.width) / 2, (_video_container_size.height - image_size.height) / 2));
-               work_image = im;
-       }
+               Position<int> const container_offset (
+                       (_video_container_size.width - image_size.width) / 2,
+                       (_video_container_size.height - image_size.width) / 2
+                       );
 
+               pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset);
+       }
+                                           
 #ifdef DCPOMATIC_DEBUG
        _last_video = piece->content;
 #endif
 
-       Video (work_image, eyes, content->colour_conversion(), same, time);
+       Video (pi, eyes, content->colour_conversion(), same, time);
 
-       time += TIME_HZ / _film->video_frame_rate();
        _last_emit_was_black = false;
-       _video_position = piece->video_position = time;
+       _video_position = piece->video_position = (time + TIME_HZ / _film->video_frame_rate());
 
        if (frc.repeat > 1 && !piece->repeating ()) {
                piece->set_repeat (_last_incoming_video, frc.repeat - 1);
@@ -378,16 +375,16 @@ void
 Player::flush ()
 {
        TimedAudioBuffers<Time> 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 (_film->time_to_audio_frames (_video_position - _audio_position));
        }
        
@@ -402,7 +399,6 @@ Player::seek (Time t, bool accurate)
 {
        if (!_have_valid_pieces) {
                setup_pieces ();
-               _have_valid_pieces = true;
        }
 
        if (_pieces.empty ()) {
@@ -494,6 +490,8 @@ Player::setup_pieces ()
 
                _pieces.push_back (piece);
        }
+
+       _have_valid_pieces = true;
 }
 
 void
@@ -506,7 +504,8 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 
        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;
@@ -517,10 +516,7 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
                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);
 
@@ -541,8 +537,19 @@ void
 Player::set_video_container_size (libdcp::Size s)
 {
        _video_container_size = s;
-       _black_frame.reset (new Image (PIX_FMT_RGB24, _video_container_size, true));
-       _black_frame->make_black ();
+
+       shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
+       im->make_black ();
+       
+       _black_frame.reset (
+               new PlayerImage (
+                       im,
+                       Crop(),
+                       _video_container_size,
+                       _video_container_size,
+                       Scaler::from_id ("bicubic")
+                       )
+               );
 }
 
 shared_ptr<Resampler>
@@ -675,7 +682,7 @@ Player::update_subtitle ()
 bool
 Player::repeat_last_video ()
 {
-       if (!_last_incoming_video.image) {
+       if (!_last_incoming_video.image || !_have_valid_pieces) {
                return false;
        }
 
@@ -690,3 +697,40 @@ Player::repeat_last_video ()
 
        return true;
 }
+
+PlayerImage::PlayerImage (
+       shared_ptr<const Image> in,
+       Crop crop,
+       libdcp::Size inter_size,
+       libdcp::Size out_size,
+       Scaler const * scaler
+       )
+       : _in (in)
+       , _crop (crop)
+       , _inter_size (inter_size)
+       , _out_size (out_size)
+       , _scaler (scaler)
+{
+
+}
+
+void
+PlayerImage::set_subtitle (shared_ptr<const Image> image, Position<int> pos)
+{
+       _subtitle_image = image;
+       _subtitle_position = pos;
+}
+
+shared_ptr<Image>
+PlayerImage::image ()
+{
+       shared_ptr<Image> out = _in->crop_scale_window (_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, false);
+
+       Position<int> const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2);
+
+       if (_subtitle_image) {
+               out->alpha_blend (_subtitle_image, _subtitle_position);
+       }
+
+       return out;
+}