projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix complete failure of preview/playback introduced in
[dcpomatic.git]
/
src
/
lib
/
player.cc
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index b3fba1aece638df97a57b522f9fda0f31cd352ba..07447d531db7036ed61ef1ef414d18e9cc1f7685 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-83,11
+83,12
@@
int const PlayerProperty::PLAYLIST = 701;
int const PlayerProperty::FILM_CONTAINER = 702;
int const PlayerProperty::FILM_VIDEO_FRAME_RATE = 703;
int const PlayerProperty::DCP_DECODE_REDUCTION = 704;
int const PlayerProperty::FILM_CONTAINER = 702;
int const PlayerProperty::FILM_VIDEO_FRAME_RATE = 703;
int const PlayerProperty::DCP_DECODE_REDUCTION = 704;
+int const PlayerProperty::PLAYBACK_LENGTH = 705;
-Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
+Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
, DCPTime playback_length
)
: _film (film)
, _playlist (playlist)
: _film (film)
, _playlist (playlist)
- , _suspended (
false
)
+ , _suspended (
0
)
, _ignore_video (false)
, _ignore_audio (false)
, _ignore_text (false)
, _ignore_video (false)
, _ignore_audio (false)
, _ignore_text (false)
@@
-97,6
+98,7
@@
Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist
, _play_referenced (false)
, _audio_merger (_film->audio_frame_rate())
, _shuffler (0)
, _play_referenced (false)
, _audio_merger (_film->audio_frame_rate())
, _shuffler (0)
+ , _playback_length (playback_length)
{
_film_changed_connection = _film->Change.connect (bind (&Player::film_change, this, _1, _2));
/* The butler must hear about this first, so since we are proxying this through to the butler we must
{
_film_changed_connection = _film->Change.connect (bind (&Player::film_change, this, _1, _2));
/* The butler must hear about this first, so since we are proxying this through to the butler we must
@@
-124,16
+126,26
@@
Player::setup_pieces ()
setup_pieces_unlocked ();
}
setup_pieces_unlocked ();
}
+
+void
+Player::set_playback_length (DCPTime len)
+{
+ Change (CHANGE_TYPE_PENDING, PlayerProperty::PLAYBACK_LENGTH, false);
+ _playback_length = len;
+ Change (CHANGE_TYPE_DONE, PlayerProperty::PLAYBACK_LENGTH, false);
+ setup_pieces ();
+}
+
bool
bool
-have_video (shared_ptr<
Piece> piece
)
+have_video (shared_ptr<
const Content> content
)
{
{
- return
piece->decoder && piece->decoder->video
;
+ return
static_cast<bool>(content->video)
;
}
bool
}
bool
-have_audio (shared_ptr<
Piece> piece
)
+have_audio (shared_ptr<
const Content> content
)
{
{
- return
piece->decoder && piece->decoder->audio
;
+ return
static_cast<bool>(content->audio)
;
}
void
}
void
@@
-237,8
+249,8
@@
Player::setup_pieces_unlocked ()
}
}
}
}
- _black = Empty (_film, _p
ieces, bind(&have_video, _1)
);
- _silent = Empty (_film, _p
ieces, bind(&have_audio, _1)
);
+ _black = Empty (_film, _p
laylist, bind(&have_video, _1), _playback_length
);
+ _silent = Empty (_film, _p
laylist, bind(&have_audio, _1), _playback_length
);
_last_video_time = DCPTime ();
_last_video_eyes = EYES_BOTH;
_last_video_time = DCPTime ();
_last_video_eyes = EYES_BOTH;
@@
-249,19
+261,17
@@
void
Player::playlist_content_change (ChangeType type, int property, bool frequent)
{
if (type == CHANGE_TYPE_PENDING) {
Player::playlist_content_change (ChangeType type, int property, bool frequent)
{
if (type == CHANGE_TYPE_PENDING) {
- boost::mutex::scoped_lock lm (_mutex);
/* The player content is probably about to change, so we can't carry on
until that has happened and we've rebuilt our pieces. Stop pass()
and seek() from working until then.
*/
/* The player content is probably about to change, so we can't carry on
until that has happened and we've rebuilt our pieces. Stop pass()
and seek() from working until then.
*/
-
_suspended = true
;
+
++_suspended
;
} else if (type == CHANGE_TYPE_DONE) {
/* A change in our content has gone through. Re-build our pieces. */
setup_pieces ();
} else if (type == CHANGE_TYPE_DONE) {
/* A change in our content has gone through. Re-build our pieces. */
setup_pieces ();
-
_suspended = false
;
+
--_suspended
;
} else if (type == CHANGE_TYPE_CANCELLED) {
} else if (type == CHANGE_TYPE_CANCELLED) {
- boost::mutex::scoped_lock lm (_mutex);
- _suspended = false;
+ --_suspended;
}
Change (type, property, frequent);
}
Change (type, property, frequent);
@@
-345,7
+355,8
@@
Player::black_player_video_frame (Eyes eyes) const
PresetColourConversion::all().front().conversion,
VIDEO_RANGE_FULL,
boost::weak_ptr<Content>(),
PresetColourConversion::all().front().conversion,
VIDEO_RANGE_FULL,
boost::weak_ptr<Content>(),
- boost::optional<Frame>()
+ boost::optional<Frame>(),
+ false
)
);
}
)
);
}
@@
-570,8
+581,8
@@
Player::pass ()
return false;
}
return false;
}
- if (_play
list->length(_film)
== DCPTime()) {
- /* Special
case of an empty Film
; just give one black frame */
+ if (_play
back_length
== DCPTime()) {
+ /* Special; just give one black frame */
emit_video (black_player_video_frame(EYES_BOTH), DCPTime());
return true;
}
emit_video (black_player_video_frame(EYES_BOTH), DCPTime());
return true;
}
@@
-648,12
+659,16
@@
Player::pass ()
if (_last_audio_time) {
/* Sometimes the thing that happened last finishes fractionally before
or after this silence. Bodge the start time of the silence to fix it.
if (_last_audio_time) {
/* Sometimes the thing that happened last finishes fractionally before
or after this silence. Bodge the start time of the silence to fix it.
+ I think this is nothing to worry about since we will just add or
+ remove a little silence at the end of some content.
*/
int64_t const error = labs(period.from.get() - _last_audio_time->get());
*/
int64_t const error = labs(period.from.get() - _last_audio_time->get());
- if (error >= 2) {
+ /* Let's not worry about less than a frame at 24fps */
+ int64_t const too_much_error = DCPTime::from_frames(1, 24).get();
+ if (error >= too_much_error) {
_film->log()->log(String::compose("Silence starting before or after last audio by %1", error), LogEntry::TYPE_ERROR);
}
_film->log()->log(String::compose("Silence starting before or after last audio by %1", error), LogEntry::TYPE_ERROR);
}
- DCPOMATIC_ASSERT (error <
2
);
+ DCPOMATIC_ASSERT (error <
too_much_error
);
period.from = *_last_audio_time;
}
if (period.duration() > one_video_frame()) {
period.from = *_last_audio_time;
}
if (period.duration() > one_video_frame()) {
@@
-673,7
+688,7
@@
Player::pass ()
/* Work out the time before which the audio is definitely all here. This is the earliest last_push_end of one
of our streams, or the position of the _silent.
*/
/* Work out the time before which the audio is definitely all here. This is the earliest last_push_end of one
of our streams, or the position of the _silent.
*/
- DCPTime pull_to = _
film->length ()
;
+ DCPTime pull_to = _
playback_length
;
for (map<AudioStreamPtr, StreamState>::const_iterator i = _stream_states.begin(); i != _stream_states.end(); ++i) {
if (!i->second.piece->done && i->second.last_push_end < pull_to) {
pull_to = i->second.last_push_end;
for (map<AudioStreamPtr, StreamState>::const_iterator i = _stream_states.begin(); i != _stream_states.end(); ++i) {
if (!i->second.piece->done && i->second.last_push_end < pull_to) {
pull_to = i->second.last_push_end;
@@
-844,7
+859,8
@@
Player::video (weak_ptr<Piece> wp, ContentVideo video)
piece->content->video->colour_conversion(),
piece->content->video->range(),
piece->content,
piece->content->video->colour_conversion(),
piece->content->video->range(),
piece->content,
- video.frame
+ video.frame,
+ false
)
);
)
);
@@
-894,9
+910,7
@@
Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
if (remaining_frames == 0) {
return;
}
if (remaining_frames == 0) {
return;
}
- shared_ptr<AudioBuffers> cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames));
- cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0);
- content_audio.audio = cut;
+ content_audio.audio.reset (new AudioBuffers(content_audio.audio, remaining_frames, 0));
}
DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
}
DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
@@
-949,8
+963,15
@@
Player::bitmap_text_start (weak_ptr<Piece> wp, weak_ptr<const TextContent> wc, C
PlayerText ps;
shared_ptr<Image> image = subtitle.sub.image;
PlayerText ps;
shared_ptr<Image> image = subtitle.sub.image;
+
/* We will scale the subtitle up to fit _video_container_size */
/* We will scale the subtitle up to fit _video_container_size */
- dcp::Size scaled_size (subtitle.sub.rectangle.width * _video_container_size.width, subtitle.sub.rectangle.height * _video_container_size.height);
+ int const width = subtitle.sub.rectangle.width * _video_container_size.width;
+ int const height = subtitle.sub.rectangle.height * _video_container_size.height;
+ if (width == 0 || height == 0) {
+ return;
+ }
+
+ dcp::Size scaled_size (width, height);
ps.bitmap.push_back (BitmapText(image->scale(scaled_size, dcp::YUV_TO_RGB_REC601, image->pixel_format(), true, _fast), subtitle.sub.rectangle));
DCPTime from (content_time_to_dcp (piece, subtitle.from()));
ps.bitmap.push_back (BitmapText(image->scale(scaled_size, dcp::YUV_TO_RGB_REC601, image->pixel_format(), true, _fast), subtitle.sub.rectangle));
DCPTime from (content_time_to_dcp (piece, subtitle.from()));
@@
-1182,8
+1203,7
@@
Player::discard_audio (shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTi
if (remaining_frames <= 0) {
return make_pair(shared_ptr<AudioBuffers>(), DCPTime());
}
if (remaining_frames <= 0) {
return make_pair(shared_ptr<AudioBuffers>(), DCPTime());
}
- shared_ptr<AudioBuffers> cut (new AudioBuffers (audio->channels(), remaining_frames));
- cut->copy_from (audio.get(), remaining_frames, discard_frames, 0);
+ shared_ptr<AudioBuffers> cut (new AudioBuffers(audio, remaining_frames, discard_frames));
return make_pair(cut, time + discard_time);
}
return make_pair(cut, time + discard_time);
}