/*
- Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 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 "gl_video_view.h"
+#include "simple_video_view.h"
#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/util.h"
#include "lib/butler.h"
#include "lib/log.h"
#include "lib/config.h"
+#include "lib/compose.hpp"
+#include "lib/dcpomatic_log.h"
extern "C" {
#include <libavutil/pixfmt.h>
}
using boost::weak_ptr;
using boost::optional;
using dcp::Size;
+using namespace dcpomatic;
static
int
return reinterpret_cast<FilmViewer*>(data)->audio_callback (out, frames);
}
-FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected)
- : 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")))
- , _jump_to_selected (0)
- , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
- , _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)
+FilmViewer::FilmViewer (wxWindow* p)
+ : _coalesce_player_changes (false)
, _audio (DCPOMATIC_RTAUDIO_API)
, _audio_channels (0)
, _audio_block_size (1024)
, _playing (false)
, _latency_history_count (0)
, _dropped (0)
-{
-#ifndef __WXOSX__
- _panel->SetDoubleBuffered (true);
+ , _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
+ , _outline_content (false)
+ , _eyes (EYES_LEFT)
+ , _pad_black (false)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , _in_watermark (false)
+ , _background_image (false)
#endif
-
- _panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
-
- _v_sizer = new wxBoxSizer (wxVERTICAL);
- SetSizer (_v_sizer);
-
- _v_sizer->Add (_panel, 1, wxEXPAND);
-
- 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 (_left_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
- view_options->Add (_right_eye, 0, wxLEFT | wxRIGHT, 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);
+ , _state_timer ("viewer")
+ , _gets (0)
+{
+ switch (Config::instance()->video_view_type()) {
+ case Config::VIDEO_VIEW_OPENGL:
+ _video_view = new GLVideoView (p);
+ break;
+ case Config::VIDEO_VIEW_SIMPLE:
+ _video_view = new SimpleVideoView (this, p);
+ break;
}
- _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
-
- wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
-
- wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL);
- time_sizer->Add (_frame_number, 0, wxEXPAND);
- time_sizer->Add (_timecode, 0, wxEXPAND);
- h_sizer->Add (_back_button, 0, wxALL, 2);
- h_sizer->Add (time_sizer, 0, wxEXPAND);
- h_sizer->Add (_forward_button, 0, wxALL, 2);
- h_sizer->Add (_play_button, 0, wxEXPAND);
- h_sizer->Add (_slider, 1, wxEXPAND);
-
- _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
-
- _frame_number->SetMinSize (wxSize (84, -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));
- 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));
- 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 ());
- }
+ _video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this));
+ _timer.Bind (wxEVT_TIMER, boost::bind(&FilmViewer::timer, this));
set_film (shared_ptr<Film> ());
- JobManager::instance()->ActiveJobsChanged.connect (
- bind (&FilmViewer::active_jobs_changed, this, _2)
- );
-
- setup_sensitivity ();
-
_config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1));
config_changed (Config::SOUND_OUTPUT);
}
}
_film = film;
+ _video_position = DCPTime ();
+ _player_video.first.reset ();
+ _player_video.second = DCPTime ();
- _frame.reset ();
-
- update_position_slider ();
- update_position_label ();
+ _video_view->set_image (shared_ptr<Image>());
+ _closed_captions_dialog->clear ();
if (!_film) {
_player.reset ();
recreate_butler ();
- _frame.reset ();
- refresh_panel ();
+ refresh_view ();
return;
}
if (_dcp_decode_reduction) {
_player->set_dcp_decode_reduction (_dcp_decode_reduction);
}
- } catch (bad_alloc) {
- error_dialog (this, _("There is not enough free memory to do that."));
+ } catch (bad_alloc &) {
+ error_dialog (_video_view->get(), _("There is not enough free memory to do that."));
_film.reset ();
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);
+ _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));
+ _film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));
+ _player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
/* Keep about 1 second's worth of history samples */
_latency_history_count = _film->audio_frame_rate() / _audio_block_size;
recreate_butler ();
calculate_sizes ();
- refresh ();
-
- setup_sensitivity ();
+ slow_refresh ();
}
void
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));
+ _butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
_butler->disable_audio ();
}
+ _closed_captions_dialog->set_film_and_butler (_film, _butler);
+
if (was_running) {
start ();
}
}
void
-FilmViewer::refresh_panel ()
+FilmViewer::refresh_view ()
{
- _panel->Refresh ();
- _panel->Update ();
+ _state_timer.set ("update-view");
+ _video_view->update ();
+ _state_timer.unset ();
}
void
FilmViewer::get ()
{
DCPOMATIC_ASSERT (_butler);
+ ++_gets;
- pair<shared_ptr<PlayerVideo>, DCPTime> video;
do {
- video = _butler->get_video ();
+ Butler::Error e;
+ _player_video = _butler->get_video (&e);
+ if (!_player_video.first && e == Butler::AGAIN) {
+ signal_manager->when_idle (boost::bind(&FilmViewer::get, this));
+ return;
+ }
} while (
+ _player_video.first &&
_film->three_d() &&
- ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT))
+ _eyes != _player_video.first->eyes() &&
+ _player_video.first->eyes() != EYES_BOTH
);
_butler->rethrow ();
- if (!video.first) {
- _frame.reset ();
- refresh_panel ();
+ display_player_video ();
+}
+
+void
+FilmViewer::display_player_video ()
+{
+ if (!_player_video.first) {
+ _video_view->set_image (shared_ptr<Image>());
+ refresh_view ();
return;
}
- if (_playing && (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;
}
* The content's specified colour conversion indicates the colourspace
* which the content is in (according to the user).
*
- * PlayerVideo::image (bound to PlayerVideo::always_rgb) will take the source
+ * PlayerVideo::image (bound to PlayerVideo::force) will take the source
* image and convert it (from whatever the user has said it is) to RGB.
*/
- _frame = video.first->image (
- bind (&Log::dcp_log, _film->log().get(), _1, _2),
- bind (&PlayerVideo::always_rgb, _1),
- false, true
+ _state_timer.set ("get image");
+
+ _video_view->set_image (
+ _player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
);
- ImageChanged (video.first);
+ _state_timer.set ("ImageChanged");
+ ImageChanged (_player_video.first);
+ _state_timer.unset ();
- _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 ();
+ refresh_view ();
+
+ _closed_captions_dialog->update (time());
}
void
}
get ();
- update_position_label ();
- update_position_slider ();
+ PositionChanged ();
DCPTime const next = _video_position + one_video_frame();
if (next >= _film->length()) {
stop ();
+ Finished ();
+ return;
}
+ LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), time().seconds(), max((next.seconds() - time().seconds()) * 1000, 1.0));
_timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
if (_butler) {
}
}
-void
-FilmViewer::paint_panel ()
+bool
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+XXX
+FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
{
- wxPaintDC dc (_panel);
-
- if (!_frame || !_film || !_out_size.width || !_out_size.height) {
- dc.Clear ();
- return;
- }
-
- wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
- wxBitmap frame_bitmap (frame);
- dc.DrawBitmap (frame_bitmap, 0, 0);
-
- if (_out_size.width < _panel_size.width) {
- wxPen p (GetBackgroundColour ());
- wxBrush b (GetBackgroundColour ());
- dc.SetPen (p);
- dc.SetBrush (b);
- dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height);
- }
-
- if (_out_size.height < _panel_size.height) {
- wxPen p (GetBackgroundColour ());
- wxBrush b (GetBackgroundColour ());
- dc.SetPen (p);
- dc.SetBrush (b);
- dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height);
+ optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
+ if (bg) {
+ wxImage image (std_to_wx(bg->string()));
+ wxBitmap bitmap (image);
+ dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
+ return true;
}
- if (_outline_content && _outline_content->GetValue ()) {
- wxPen p (wxColour (255, 0, 0), 2);
- dc.SetPen (p);
- dc.SetBrush (*wxTRANSPARENT_BRUSH);
- dc.DrawRectangle (_inter_position.x, _inter_position.y, _inter_size.width, _inter_size.height);
- }
+ return false;
}
+#else
+FilmViewer::maybe_draw_background_image (wxPaintDC &)
+{
+ return false;
+}
+#endif
void
-FilmViewer::slider_moved (bool update_slider)
+FilmViewer::set_outline_content (bool o)
{
- if (!_film) {
- return;
- }
-
-
- DCPTime t (_slider->GetValue() * _film->length().get() / 4096);
- /* 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 ();
- }
+ _outline_content = o;
+ refresh_view ();
}
void
-FilmViewer::panel_sized (wxSizeEvent& ev)
+FilmViewer::set_eyes (Eyes e)
{
- _panel_size.width = ev.GetSize().GetWidth();
- _panel_size.height = ev.GetSize().GetHeight();
+ _eyes = e;
+ slow_refresh ();
+}
+void
+FilmViewer::video_view_sized ()
+{
calculate_sizes ();
- refresh ();
- update_position_label ();
- update_position_slider ();
+ if (!quick_refresh()) {
+ slow_refresh ();
+ }
+ PositionChanged ();
}
void
FilmViewer::calculate_sizes ()
{
- if (!_film) {
+ if (!_film || !_player) {
return;
}
Ratio const * container = _film->container ();
- float const panel_ratio = _panel_size.ratio ();
+ float const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y;
float const film_ratio = container ? container->ratio () : 1.78;
- if (panel_ratio < film_ratio) {
+ if (view_ratio < film_ratio) {
/* panel is less widscreen than the film; clamp width */
- _out_size.width = _panel_size.width;
+ _out_size.width = _video_view->get()->GetSize().x;
_out_size.height = lrintf (_out_size.width / film_ratio);
} else {
/* panel is more widescreen than the film; clamp height */
- _out_size.height = _panel_size.height;
+ _out_size.height = _video_view->get()->GetSize().y;
_out_size.width = lrintf (_out_size.height * film_ratio);
}
_out_size.width = max (64, _out_size.width);
_out_size.height = max (64, _out_size.height);
- _player->set_video_container_size (_out_size);
-}
+ /* Make OpenGL happy; XXX: only do this in GLVideoView? Is the round-to-4 constraint a thing? */
+ _out_size.width &= ~3;
+ _out_size.height &= ~3;
-void
-FilmViewer::play_clicked ()
-{
- check_play_state ();
+ _player->set_video_container_size (_out_size);
}
void
-FilmViewer::check_play_state ()
+FilmViewer::start ()
{
- if (!_film || _film->video_frame_rate() == 0) {
+ if (!_film) {
return;
}
- if (_play_button->GetValue()) {
- start ();
- } else {
- stop ();
+ optional<bool> v = PlaybackPermitted ();
+ if (v && !*v) {
+ /* Computer says no */
+ return;
}
-}
-void
-FilmViewer::start ()
-{
if (_audio.isStreamOpen()) {
_audio.setStreamTime (_video_position.seconds());
_audio.startStream ();
_playing = true;
_dropped = 0;
timer ();
+ Started (position());
}
bool
FilmViewer::stop ()
{
if (_audio.isStreamRunning()) {
- /* stop stream and discard any remainig queued samples */
+ /* stop stream and discard any remaining queued samples */
_audio.abortStream ();
}
}
_playing = false;
- _play_button->SetValue (false);
+ Stopped (position());
return true;
}
void
-FilmViewer::update_position_slider ()
+FilmViewer::player_change (ChangeType type, int property, bool frequent)
{
- if (!_film) {
- _slider->SetValue (0);
+ if (type != CHANGE_TYPE_DONE || frequent) {
return;
}
- DCPTime const len = _film->length ();
-
- if (len.get ()) {
- int const new_slider_position = 4096 * _video_position.get() / len.get();
- if (new_slider_position != _slider->GetValue()) {
- _slider->SetValue (new_slider_position);
- }
- }
-}
-
-void
-FilmViewer::update_position_label ()
-{
- if (!_film) {
- _frame_number->SetLabel ("0");
- _timecode->SetLabel ("0:0:0.0");
+ if (_coalesce_player_changes) {
+ _pending_player_changes.push_back (property);
return;
}
- double const fps = _film->video_frame_rate ();
- /* Count frame number from 1 ... not sure if this is the best idea */
- _frame_number->SetLabel (wxString::Format (wxT("%ld"), lrint (_video_position.seconds() * fps) + 1));
- _timecode->SetLabel (time_to_timecode (_video_position, fps));
-}
-
-void
-FilmViewer::active_jobs_changed (optional<string> j)
-{
- /* examine content is the only job which stops the viewer working */
- bool const a = !j || *j != "examine_content";
- _slider->Enable (a);
- _play_button->Enable (a);
-}
-
-DCPTime
-FilmViewer::nudge_amount (wxMouseEvent& ev)
-{
- DCPTime amount = one_video_frame ();
-
- if (ev.ShiftDown() && !ev.ControlDown()) {
- amount = DCPTime::from_seconds (1);
- } else if (!ev.ShiftDown() && ev.ControlDown()) {
- amount = DCPTime::from_seconds (10);
- } else if (ev.ShiftDown() && ev.ControlDown()) {
- amount = DCPTime::from_seconds (60);
- }
-
- return amount;
-}
-
-void
-FilmViewer::go_to (DCPTime t)
-{
- if (t < DCPTime ()) {
- t = DCPTime ();
+ calculate_sizes ();
+ 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 (t >= _film->length ()) {
- t = _film->length ();
+ if (!refreshed) {
+ slow_refresh ();
}
-
- seek (t, true);
- update_position_label ();
- update_position_slider ();
+ PositionChanged ();
}
void
-FilmViewer::back_clicked (wxMouseEvent& ev)
+FilmViewer::film_change (ChangeType type, Film::Property p)
{
- go_to (_video_position - nudge_amount (ev));
- ev.Skip ();
+ if (type == CHANGE_TYPE_DONE && p == Film::AUDIO_CHANNELS) {
+ recreate_butler ();
+ }
}
+/** Re-get the current frame slowly by seeking */
void
-FilmViewer::forward_clicked (wxMouseEvent& ev)
+FilmViewer::slow_refresh ()
{
- go_to (_video_position + nudge_amount (ev));
- ev.Skip ();
+ seek (_video_position, true);
}
-void
-FilmViewer::player_changed (bool frequent)
+/** 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 (frequent) {
- return;
- }
-
- if (_coalesce_player_changes) {
- _pending_player_change = true;
- return;
+ if (!_player_video.first) {
+ return false;
}
- calculate_sizes ();
- refresh ();
- update_position_label ();
- update_position_slider ();
-}
-
-void
-FilmViewer::setup_sensitivity ()
-{
- bool const c = _film && !_film->content().empty ();
-
- _slider->Enable (c);
- _back_button->Enable (c);
- _forward_button->Enable (c);
- _play_button->Enable (c);
- if (_outline_content) {
- _outline_content->Enable (c);
- }
- _frame_number->Enable (c);
- _timecode->Enable (c);
- if (_jump_to_selected) {
- _jump_to_selected->Enable (c);
+ if (!_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) {
+ return false;
}
- _left_eye->Enable (c && _film->three_d ());
- _right_eye->Enable (c && _film->three_d ());
+ display_player_video ();
+ return true;
}
void
-FilmViewer::film_changed (Film::Property p)
+FilmViewer::seek (shared_ptr<Content> content, ContentTime t, bool accurate)
{
- if (p == Film::CONTENT || p == Film::THREE_D) {
- setup_sensitivity ();
+ optional<DCPTime> dt = _player->content_time_to_dcp (content, t);
+ if (dt) {
+ seek (*dt, accurate);
}
}
-/** Re-get the current frame */
-void
-FilmViewer::refresh ()
-{
- seek (_video_position, _last_seek_accurate);
-}
-
-void
-FilmViewer::set_position (DCPTime p)
-{
- _video_position = p;
- seek (p, true);
- update_position_label ();
- update_position_slider ();
-}
-
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_change (CHANGE_TYPE_DONE, i, false);
}
+ _pending_player_changes.clear ();
}
}
void
-FilmViewer::timecode_clicked ()
+FilmViewer::seek (DCPTime t, bool accurate)
{
- PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ());
- if (dialog->ShowModal() == wxID_OK) {
- go_to (dialog->get ());
+ if (!_butler) {
+ return;
}
- dialog->Destroy ();
-}
-void
-FilmViewer::frame_number_clicked ()
-{
- PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _film->video_frame_rate ());
- if (dialog->ShowModal() == wxID_OK) {
- go_to (dialog->get ());
+ if (t < DCPTime ()) {
+ t = DCPTime ();
}
- dialog->Destroy ();
-}
-void
-FilmViewer::jump_to_selected_clicked ()
-{
- Config::instance()->set_jump_to_selected (_jump_to_selected->GetValue ());
-}
-
-void
-FilmViewer::seek (DCPTime t, bool accurate)
-{
- if (!_butler) {
- return;
+ if (t >= _film->length ()) {
+ t = _film->length ();
}
bool const was_running = stop ();
+ _closed_captions_dialog->clear ();
_butler->seek (t, accurate);
- _last_seek_accurate = accurate;
get ();
if (was_running) {
start ();
}
+
+ PositionChanged ();
}
void
FilmViewer::config_changed (Config::Property p)
{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ if (p == Config::PLAYER_BACKGROUND_IMAGE) {
+ refresh_view ();
+ return;
+ }
+#endif
+
if (p != Config::SOUND && p != Config::SOUND_OUTPUT) {
return;
}
_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()) {
} catch (RtAudioError& e) {
#endif
error_dialog (
- this,
- wxString::Format (_("Could not set up audio output (%s). There will be no audio during the preview."), e.what())
+ _video_view->get(),
+ _("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what())
);
}
recreate_butler ();
}
}
+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) {
{
return DCPTime::from_frames (1, _film->video_frame_rate());
}
+
+/** Open a dialog box showing our film's closed captions */
+void
+FilmViewer::show_closed_captions ()
+{
+ _closed_captions_dialog->Show();
+}
+
+void
+FilmViewer::seek_by (DCPTime by, bool accurate)
+{
+ seek (_video_position + by, accurate);
+}
+
+void
+FilmViewer::set_pad_black (bool p)
+{
+ _pad_black = p;
+}
projects / dcpomatic.git / blobdiff