/*
- Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "playhead_to_timecode_dialog.h"
#include "playhead_to_frame_dialog.h"
#include "wx_util.h"
+#include "closed_captions_dialog.h"
#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/util.h"
: wxPanel (p)
, _panel (new wxPanel (this))
, _outline_content (0)
- , _left_eye (new wxRadioButton (this, wxID_ANY, _("Left eye"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP))
- , _right_eye (new wxRadioButton (this, wxID_ANY, _("Right eye")))
+ , _eye (0)
, _jump_to_selected (0)
, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
+ , _rewind_button (new wxButton (this, wxID_ANY, wxT("|<")))
, _back_button (new wxButton (this, wxID_ANY, wxT("<")))
, _forward_button (new wxButton (this, wxID_ANY, wxT(">")))
, _frame_number (new wxStaticText (this, wxID_ANY, wxT("")))
, _timecode (new wxStaticText (this, wxID_ANY, wxT("")))
, _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
, _coalesce_player_changes (false)
- , _pending_player_change (false)
- , _last_seek_accurate (true)
+ , _slider_being_moved (false)
+ , _was_running_before_slider (false)
, _audio (DCPOMATIC_RTAUDIO_API)
, _audio_channels (0)
, _audio_block_size (1024)
, _playing (false)
, _latency_history_count (0)
, _dropped (0)
+ , _closed_captions_dialog (new ClosedCaptionsDialog(GetParent()))
{
#ifndef __WXOSX__
_panel->SetDoubleBuffered (true);
wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL);
if (outline_content) {
_outline_content = new wxCheckBox (this, wxID_ANY, _("Outline content"));
- view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP);
+ view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
}
- view_options->Add (_left_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
- view_options->Add (_right_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+
+ _eye = new wxChoice (this, wxID_ANY);
+ _eye->Append (_("Left"));
+ _eye->Append (_("Right"));
+ _eye->SetSelection (0);
+ view_options->Add (_eye, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+
if (jump_to_selected) {
_jump_to_selected = new wxCheckBox (this, wxID_ANY, _("Jump to selected content"));
- view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
+ view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
}
+
_v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
time_sizer->Add (_frame_number, 0, wxEXPAND);
time_sizer->Add (_timecode, 0, wxEXPAND);
+ h_sizer->Add (_rewind_button, 0, wxALL, 2);
h_sizer->Add (_back_button, 0, wxALL, 2);
h_sizer->Add (time_sizer, 0, wxEXPAND);
h_sizer->Add (_forward_button, 0, wxALL, 2);
_v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
_frame_number->SetMinSize (wxSize (84, -1));
+ _rewind_button->SetMinSize (wxSize (32, -1));
_back_button->SetMinSize (wxSize (32, -1));
_forward_button->SetMinSize (wxSize (32, -1));
- _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this));
- _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1));
+ _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this));
+ _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1));
if (_outline_content) {
- _outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::refresh_panel, this));
- }
- _left_eye->Bind (wxEVT_RADIOBUTTON, boost::bind (&FilmViewer::refresh, this));
- _right_eye->Bind (wxEVT_RADIOBUTTON, boost::bind (&FilmViewer::refresh, this));
- _slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&FilmViewer::slider_moved, this, false));
- _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind (&FilmViewer::slider_moved, this, false));
- _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind (&FilmViewer::slider_moved, this, false));
- _slider->Bind (wxEVT_SCROLL_CHANGED, boost::bind (&FilmViewer::slider_moved, this, true));
- _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind (&FilmViewer::play_clicked, this));
- _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this));
- _back_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::back_clicked, this, _1));
- _forward_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::forward_clicked, this, _1));
- _frame_number->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::frame_number_clicked, this));
- _timecode->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::timecode_clicked, this));
+ _outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::refresh_panel, this));
+ }
+ _eye->Bind (wxEVT_CHOICE, boost::bind (&FilmViewer::slow_refresh, this));
+ _slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&FilmViewer::slider_moved, this, false));
+ _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind (&FilmViewer::slider_moved, this, true));
+ _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind (&FilmViewer::slider_moved, this, true));
+ _slider->Bind (wxEVT_SCROLL_THUMBRELEASE, boost::bind (&FilmViewer::slider_released, this));
+ _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind (&FilmViewer::play_clicked, this));
+ _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this));
+ _rewind_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::rewind_clicked, this, _1));
+ _back_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::back_clicked, this, _1));
+ _forward_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::forward_clicked, this, _1));
+ _frame_number->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::frame_number_clicked, this));
+ _timecode->Bind (wxEVT_LEFT_DOWN, boost::bind (&FilmViewer::timecode_clicked, this));
if (_jump_to_selected) {
_jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::jump_to_selected_clicked, this));
_jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
_film = film;
_frame.reset ();
+ _closed_captions_dialog->clear ();
update_position_slider ();
update_position_label ();
if (!_film) {
+ _player.reset ();
+ _closed_captions_dialog->set_player (_player);
+ recreate_butler ();
+ _frame.reset ();
+ refresh_panel ();
return;
}
return;
}
- /* Always burn in subtitles, even if content is set not to, otherwise we won't see them
- in the preview.
- */
- _player->set_always_burn_subtitles (true);
+ _closed_captions_dialog->set_player (_player);
+
+ _player->set_always_burn_open_subtitles ();
_player->set_play_referenced ();
_film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
- _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
+ _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1, _2));
/* Keep about 1 second's worth of history samples */
_latency_history_count = _film->audio_frame_rate() / _audio_block_size;
recreate_butler ();
calculate_sizes ();
- refresh ();
+ slow_refresh ();
setup_sensitivity ();
}
map.set (i, i, 1);
}
} else {
- /* Special case: stereo output, at least 3 channel input, map L+R to L/R and
- C to both, all 3dB down.
+ /* Special case: stereo output, at least 3 channel input.
+ Map so that Lt = L(-3dB) + Ls(-3dB) + C(-6dB) + Lfe(-10dB)
+ Rt = R(-3dB) + Rs(-3dB) + C(-6dB) + Lfe(-10dB)
*/
- map.set (0, 0, 1 / sqrt(2)); // L -> L
- map.set (1, 1, 1 / sqrt(2)); // R -> R
- map.set (2, 0, 1 / sqrt(2)); // C -> L
- map.set (2, 1, 1 / sqrt(2)); // C -> R
+ map.set (dcp::LEFT, 0, 1 / sqrt(2)); // L -> Lt
+ map.set (dcp::RIGHT, 1, 1 / sqrt(2)); // R -> Rt
+ map.set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt
+ map.set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt
+ map.set (dcp::LFE, 0, 1 / sqrt(10)); // Lfe -> Lt
+ map.set (dcp::LFE, 1, 1 / sqrt(10)); // Lfe -> Rt
+ map.set (dcp::LS, 0, 1 / sqrt(2)); // Ls -> Lt
+ map.set (dcp::RS, 1, 1 / sqrt(2)); // Rs -> Rt
}
_butler.reset (new Butler (_player, _film->log(), map, _audio_channels));
- if (!Config::instance()->sound()) {
+ if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
_butler->disable_audio ();
}
{
DCPOMATIC_ASSERT (_butler);
- pair<shared_ptr<PlayerVideo>, DCPTime> video;
do {
- video = _butler->get_video ();
+ _player_video = _butler->get_video ();
} while (
_film->three_d() &&
- ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT))
+ ((_eye->GetSelection() == 0 && _player_video.first->eyes() == EYES_RIGHT) || (_eye->GetSelection() == 1 && _player_video.first->eyes() == EYES_LEFT))
);
_butler->rethrow ();
- if (!video.first) {
+ display_player_video ();
+}
+
+void
+FilmViewer::display_player_video ()
+{
+ if (!_player_video.first) {
_frame.reset ();
refresh_panel ();
return;
}
- if ((time() - video.second) > one_video_frame()) {
+ if (_playing && (time() - _player_video.second) > one_video_frame()) {
/* Too late; just drop this frame before we try to get its image (which will be the time-consuming
part if this frame is J2K).
*/
- _video_position = video.second;
+ _video_position = _player_video.second;
++_dropped;
return;
}
* image and convert it (from whatever the user has said it is) to RGB.
*/
- _frame = video.first->image (
+ _frame = _player_video.first->image (
bind (&Log::dcp_log, _film->log().get(), _1, _2),
bind (&PlayerVideo::always_rgb, _1),
false, true
);
- ImageChanged (video.first);
+ ImageChanged (_player_video.first);
- _video_position = video.second;
- _inter_position = video.first->inter_position ();
- _inter_size = video.first->inter_size ();
+ _video_position = _player_video.second;
+ _inter_position = _player_video.first->inter_position ();
+ _inter_size = _player_video.first->inter_size ();
refresh_panel ();
+
+ _closed_captions_dialog->update (time());
}
void
{
wxPaintDC dc (_panel);
- if (!_frame || !_film || !_out_size.width || !_out_size.height) {
+ if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) {
dc.Clear ();
return;
}
}
}
+/** @param page true if this was a PAGEUP/PAGEDOWN event for which we won't receive a THUMBRELEASE */
void
-FilmViewer::slider_moved (bool update_slider)
+FilmViewer::slider_moved (bool page)
{
if (!_film) {
return;
}
+ if (!page && !_slider_being_moved) {
+ /* This is the first event of a drag; stop playback for the duration of the drag */
+ _was_running_before_slider = stop ();
+ _slider_being_moved = true;
+ }
DCPTime t (_slider->GetValue() * _film->length().get() / 4096);
+ t = t.round (_film->video_frame_rate());
/* Ensure that we hit the end of the film at the end of the slider */
if (t >= _film->length ()) {
t = _film->length() - one_video_frame();
}
seek (t, false);
update_position_label ();
- if (update_slider) {
- update_position_slider ();
+}
+
+void
+FilmViewer::slider_released ()
+{
+ if (_was_running_before_slider) {
+ /* Restart after a drag */
+ start ();
}
+ _slider_being_moved = false;
}
void
_panel_size.height = ev.GetSize().GetHeight();
calculate_sizes ();
- refresh ();
+ if (!quick_refresh()) {
+ slow_refresh ();
+ }
update_position_label ();
update_position_slider ();
}
void
FilmViewer::calculate_sizes ()
{
- if (!_film) {
+ if (!_film || !_player) {
return;
}
void
FilmViewer::start ()
{
+ if (!_film) {
+ return;
+ }
+
if (_audio.isStreamOpen()) {
_audio.setStreamTime (_video_position.seconds());
_audio.startStream ();
_playing = true;
_dropped = 0;
timer ();
+ _play_button->SetValue (true);
}
bool
FilmViewer::stop ()
{
if (_audio.isStreamRunning()) {
- /* stop stream and discard any remainig queued samples */
+ /* stop stream and discard any remaining queued samples */
_audio.abortStream ();
}
}
DCPTime
-FilmViewer::nudge_amount (wxMouseEvent& ev)
+FilmViewer::nudge_amount (wxKeyboardState& ev)
{
DCPTime amount = one_video_frame ();
}
void
-FilmViewer::back_clicked (wxMouseEvent& ev)
+FilmViewer::rewind_clicked (wxMouseEvent& ev)
+{
+ go_to(DCPTime());
+ ev.Skip();
+}
+
+void
+FilmViewer::back_frame ()
+{
+ if (!_film) {
+ return;
+ }
+
+ go_to (_video_position - one_video_frame());
+}
+
+void
+FilmViewer::forward_frame ()
+{
+ if (!_film) {
+ return;
+ }
+
+ go_to (_video_position + one_video_frame());
+}
+
+void
+FilmViewer::back_clicked (wxKeyboardState& ev)
{
go_to (_video_position - nudge_amount (ev));
- ev.Skip ();
}
void
-FilmViewer::forward_clicked (wxMouseEvent& ev)
+FilmViewer::forward_clicked (wxKeyboardState& ev)
{
go_to (_video_position + nudge_amount (ev));
- ev.Skip ();
}
void
-FilmViewer::player_changed (bool frequent)
+FilmViewer::player_changed (int property, bool frequent)
{
if (frequent) {
return;
}
if (_coalesce_player_changes) {
- _pending_player_change = true;
+ _pending_player_changes.push_back (property);
return;
}
calculate_sizes ();
- refresh ();
+ bool refreshed = false;
+ if (
+ property == VideoContentProperty::CROP ||
+ property == VideoContentProperty::SCALE ||
+ property == VideoContentProperty::FADE_IN ||
+ property == VideoContentProperty::FADE_OUT ||
+ property == VideoContentProperty::COLOUR_CONVERSION ||
+ property == PlayerProperty::VIDEO_CONTAINER_SIZE ||
+ property == PlayerProperty::FILM_CONTAINER
+ ) {
+ refreshed = quick_refresh ();
+ }
+
+ if (!refreshed) {
+ slow_refresh ();
+ }
update_position_label ();
update_position_slider ();
}
bool const c = _film && !_film->content().empty ();
_slider->Enable (c);
+ _rewind_button->Enable (c);
_back_button->Enable (c);
_forward_button->Enable (c);
_play_button->Enable (c);
_jump_to_selected->Enable (c);
}
- _left_eye->Enable (c && _film->three_d ());
- _right_eye->Enable (c && _film->three_d ());
+ _eye->Enable (c && _film->three_d ());
}
void
{
if (p == Film::CONTENT || p == Film::THREE_D) {
setup_sensitivity ();
+ } else if (p == Film::AUDIO_CHANNELS) {
+ recreate_butler ();
}
}
-/** Re-get the current frame */
+/** Re-get the current frame slowly by seeking */
void
-FilmViewer::refresh ()
+FilmViewer::slow_refresh ()
{
- seek (_video_position, _last_seek_accurate);
+ seek (_video_position, true);
+}
+
+/** Try to re-get the current frame quickly by resetting the metadata
+ * in the PlayerVideo that we used last time.
+ * @return true if this was possible, false if not.
+ */
+bool
+FilmViewer::quick_refresh ()
+{
+ if (!_player_video.first) {
+ return false;
+ }
+
+ if (!_player_video.first->reset_metadata (_player->video_container_size(), _film->frame_size())) {
+ return false;
+ }
+
+ display_player_video ();
+ return true;
}
void
update_position_slider ();
}
+void
+FilmViewer::set_position (shared_ptr<Content> content, ContentTime t)
+{
+ set_position (_player->content_time_to_dcp (content, t));
+}
+
void
FilmViewer::set_coalesce_player_changes (bool c)
{
_coalesce_player_changes = c;
- if (c) {
- _pending_player_change = false;
- } else {
- if (_pending_player_change) {
- player_changed (false);
+ if (!c) {
+ BOOST_FOREACH (int i, _pending_player_changes) {
+ player_changed (i, false);
}
+ _pending_player_changes.clear ();
}
}
bool const was_running = stop ();
+ _closed_captions_dialog->clear ();
_butler->seek (t, accurate);
- _last_seek_accurate = accurate;
get ();
if (was_running) {
_audio.closeStream ();
}
- if (Config::instance()->sound()) {
+ if (Config::instance()->sound() && _audio.getDeviceCount() > 0) {
unsigned int st = 0;
if (Config::instance()->sound_output()) {
while (st < _audio.getDeviceCount()) {
_audio_channels = _audio.getDeviceInfo(st).outputChannels;
- recreate_butler ();
-
RtAudio::StreamParameters sp;
sp.deviceId = st;
sp.nChannels = _audio_channels;
#endif
error_dialog (
this,
- wxString::Format (_("Could not set up audio output (%s). There will be no audio during the preview."), e.what())
+ _("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what())
);
}
+ recreate_butler ();
} else {
_audio_channels = 0;
}
}
+DCPTime
+FilmViewer::uncorrected_time () const
+{
+ if (_audio.isStreamRunning ()) {
+ return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime());
+ }
+
+ return _video_position;
+}
+
DCPTime
FilmViewer::time () const
{
int
FilmViewer::audio_callback (void* out_p, unsigned int frames)
{
- _butler->get_audio (reinterpret_cast<float*> (out_p), frames);
+ while (true) {
+ optional<DCPTime> t = _butler->get_audio (reinterpret_cast<float*> (out_p), frames);
+ if (!t || DCPTime(uncorrected_time() - *t) < one_video_frame()) {
+ /* There was an underrun or this audio is on time; carry on */
+ break;
+ }
+ /* The audio we just got was (very) late; drop it and get some more. */
+ }
boost::mutex::scoped_lock lm (_latency_history_mutex, boost::try_to_lock);
if (lm) {
}
}
+optional<int>
+FilmViewer::dcp_decode_reduction () const
+{
+ return _dcp_decode_reduction;
+}
+
DCPTime
FilmViewer::one_video_frame () const
{
return DCPTime::from_frames (1, _film->video_frame_rate());
}
+
+void
+FilmViewer::show_closed_captions ()
+{
+ _closed_captions_dialog->Show();
+}
projects / dcpomatic.git / blobdiff