#include "nag_dialog.h"
#include "playhead_to_frame_dialog.h"
#include "playhead_to_timecode_dialog.h"
+#include "sign_language_dialog.h"
#include "simple_video_view.h"
#include "wx_util.h"
-#include "lib/film.h"
-#include "lib/ratio.h"
-#include "lib/util.h"
-#include "lib/job_manager.h"
-#include "lib/image.h"
-#include "lib/exceptions.h"
+#include "lib/butler.h"
+#include "lib/compose.hpp"
+#include "lib/config.h"
+#include "lib/dcpomatic_log.h"
#include "lib/examine_content_job.h"
+#include "lib/exceptions.h"
+#include "lib/film.h"
#include "lib/filter.h"
+#include "lib/image.h"
+#include "lib/job_manager.h"
+#include "lib/log.h"
#include "lib/player.h"
#include "lib/player_video.h"
+#include "lib/ratio.h"
+#include "lib/text_content.h"
+#include "lib/timer.h"
+#include "lib/util.h"
#include "lib/video_content.h"
#include "lib/video_decoder.h"
-#include "lib/timer.h"
-#include "lib/butler.h"
-#include "lib/log.h"
-#include "lib/config.h"
-#include "lib/compose.hpp"
-#include "lib/dcpomatic_log.h"
-#include "lib/text_content.h"
+#include <dcp/exceptions.h>
+#include <dcp/warnings.h>
extern "C" {
#include <libavutil/pixfmt.h>
}
-#include <dcp/exceptions.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/tglbtn.h>
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
#include <iomanip>
using std::bad_alloc;
-using std::cout;
using std::dynamic_pointer_cast;
using std::make_shared;
using std::max;
FilmViewer::FilmViewer (wxWindow* p)
: _audio (DCPOMATIC_RTAUDIO_API)
, _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
+ , _sign_language_dialog(new SignLanguageDialog(p))
{
#if wxCHECK_VERSION(3, 1, 0)
switch (Config::instance()->video_view_type()) {
case Config::VIDEO_VIEW_OPENGL:
- _video_view = std::make_shared<GLVideoView>(this, p);
+ _video_view[VideoType::MAIN] = std::make_shared<GLVideoView>(this, VideoType::MAIN, p);
+ _video_view[VideoType::SIGN_LANGUAGE] = std::make_shared<GLVideoView>(this, VideoType::SIGN_LANGUAGE, _sign_language_dialog);
break;
case Config::VIDEO_VIEW_SIMPLE:
- _video_view = std::make_shared<SimpleVideoView>(this, p);
+ _video_view[VideoType::MAIN] = std::make_shared<SimpleVideoView>(this, VideoType::MAIN, p);
+ _video_view[VideoType::SIGN_LANGUAGE] = std::make_shared<SimpleVideoView>(this, VideoType::SIGN_LANGUAGE, _sign_language_dialog);
break;
}
#else
_video_view = std::make_shared<SimpleVideoView>(this, p);
#endif
- _video_view->Sized.connect (boost::bind(&FilmViewer::video_view_sized, this));
- _video_view->TooManyDropped.connect (boost::bind(boost::ref(TooManyDropped)));
+ for (auto type: _video_view.indices()) {
+ _video_view[type]->Sized.connect(boost::bind(&FilmViewer::video_view_sized, this, type));
+ }
+ _video_view[VideoType::MAIN]->TooManyDropped.connect(boost::bind(boost::ref(TooManyDropped)));
set_film (shared_ptr<Film>());
}
-/** Ask for ::get() to be called next time we are idle */
+/** Ask for ::idle_handler() to be called next time we are idle */
void
FilmViewer::request_idle_display_next_frame ()
{
return;
}
- if (_video_view->display_next_frame(true) == VideoView::AGAIN) {
+ if (_video_view[VideoType::MAIN]->display_next_frame(true) == VideoView::AGAIN) {
/* get() could not complete quickly so we'll try again later */
signal_manager->when_idle (boost::bind(&FilmViewer::idle_handler, this));
} else {
_film = film;
- _video_view->clear ();
+ for (auto& view: _video_view) {
+ view->clear();
+ }
_closed_captions_dialog->clear ();
+ destroy_butler();
+
if (!_film) {
- _player.reset ();
- recreate_butler ();
- _video_view->update ();
+ _player = boost::none;
+ resume();
+ for (auto& view: _video_view) {
+ view->update();
+ }
return;
}
try {
- _player = make_shared<Player>(_film, _optimise_for_j2k ? Image::Alignment::COMPACT : Image::Alignment::PADDED);
+ _player.emplace(_film, _optimise_for_j2k ? Image::Alignment::COMPACT : Image::Alignment::PADDED);
_player->set_fast ();
if (_dcp_decode_reduction) {
_player->set_dcp_decode_reduction (_dcp_decode_reduction);
}
} catch (bad_alloc &) {
- error_dialog (_video_view->get(), _("There is not enough free memory to do that."));
+ error_dialog(_video_view[VideoType::MAIN]->get(), _("There is not enough free memory to do that."));
_film.reset ();
+ resume();
return;
}
_closed_captions_dialog->update_tracks (_film);
- recreate_butler ();
+ create_butler();
calculate_sizes ();
slow_refresh ();
void
-FilmViewer::recreate_butler ()
+FilmViewer::destroy_butler()
{
suspend ();
_butler.reset ();
+}
+
+
+void
+FilmViewer::destroy_and_maybe_create_butler()
+{
+ destroy_butler();
if (!_film) {
resume ();
return;
}
+ create_butler();
+}
+
+
+void
+FilmViewer::create_butler()
+{
#if wxCHECK_VERSION(3, 1, 0)
- auto const j2k_gl_optimised = dynamic_pointer_cast<GLVideoView>(_video_view) && _optimise_for_j2k;
+ auto const j2k_gl_optimised = dynamic_pointer_cast<GLVideoView>(_video_view[VideoType::MAIN]) && _optimise_for_j2k;
#else
auto const j2k_gl_optimised = false;
#endif
+ DCPOMATIC_ASSERT(_player);
+
_butler = std::make_shared<Butler>(
_film,
- _player,
+ *_player,
Config::instance()->audio_mapping(_audio_channels),
_audio_channels,
- bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+ boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
VideoRange::FULL,
j2k_gl_optimised ? Image::Alignment::COMPACT : Image::Alignment::PADDED,
true,
- j2k_gl_optimised
+ j2k_gl_optimised,
+ (Config::instance()->sound() && _audio.isStreamOpen()) ? Butler::Audio::ENABLED : Butler::Audio::DISABLED
);
- if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
- _butler->disable_audio ();
- }
-
_closed_captions_dialog->set_butler (_butler);
resume ();
FilmViewer::set_outline_content (bool o)
{
_outline_content = o;
- _video_view->update ();
+ _video_view[VideoType::MAIN]->update();
}
FilmViewer::set_outline_subtitles (optional<dcpomatic::Rect<double>> rect)
{
_outline_subtitles = rect;
- _video_view->update ();
+ _video_view[VideoType::MAIN]->update();
}
void
FilmViewer::set_eyes (Eyes e)
{
- _video_view->set_eyes (e);
+ _video_view[VideoType::MAIN]->set_eyes(e);
slow_refresh ();
}
void
-FilmViewer::video_view_sized ()
+FilmViewer::video_view_sized(VideoType)
{
calculate_sizes ();
if (!quick_refresh()) {
return;
}
- auto const container = _film->container ();
+ auto set_sizes = [this](VideoType type, float ratio) {
+ auto const scale = dpi_scale_factor(_video_view[type]->get());
+ int const video_view_width = std::round(_video_view[type]->get()->GetSize().x * scale);
+ int const video_view_height = std::round(_video_view[type]->get()->GetSize().y * scale);
- auto const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y;
- auto const film_ratio = container ? container->ratio () : 1.78;
+ auto const view_ratio = float(video_view_width) / video_view_height;
- dcp::Size out_size;
- if (view_ratio < film_ratio) {
- /* panel is less widscreen than the film; clamp 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 = _video_view->get()->GetSize().y;
- out_size.width = lrintf (out_size.height * film_ratio);
- }
+ dcp::Size out_size;
+ if (view_ratio < ratio) {
+ /* panel is less widescreen than the film; clamp width */
+ out_size.width = video_view_width;
+ out_size.height = lrintf(out_size.width / ratio);
+ } else {
+ /* panel is more widescreen than the film; clamp height */
+ out_size.height = video_view_height;
+ out_size.width = lrintf(out_size.height * ratio);
+ }
+
+ /* Catch silly values */
+ out_size.width = max (64, out_size.width);
+ out_size.height = max (64, out_size.height);
+
+ /* Make sure the video container sizes are always a multiple of 2 so that
+ * we don't get gaps with subsampled sources (e.g. YUV420)
+ */
+ if (out_size.width % 2) {
+ out_size.width++;
+ }
+ if (out_size.height % 2) {
+ out_size.height++;
+ }
- /* Catch silly values */
- out_size.width = max (64, out_size.width);
- out_size.height = max (64, out_size.height);
+ _player->set_video_container_size(type, out_size);
+ };
- _player->set_video_container_size (out_size);
+ set_sizes(VideoType::MAIN, _film->container() ? _film->container()->ratio() : 1.78);
+ set_sizes(VideoType::SIGN_LANGUAGE, 480.0 / 640.0);
}
}
+void
+FilmViewer::start_audio_stream_if_open ()
+{
+ if (_audio.isStreamOpen()) {
+ _audio.setStreamTime(_video_view[VideoType::MAIN]->position().seconds());
+ try {
+ _audio.startStream ();
+ } catch (RtAudioError& e) {
+ _audio_channels = 0;
+ error_dialog (
+ _video_view[VideoType::MAIN]->get(),
+ _("There was a problem starting audio playback. Please try another audio output device in Preferences."), std_to_wx(e.what())
+ );
+ }
+ }
+}
+
+
void
FilmViewer::resume ()
{
DCPOMATIC_ASSERT (_suspended > 0);
--_suspended;
if (_playing && !_suspended) {
- if (_audio.isStreamOpen()) {
- _audio.setStreamTime (_video_view->position().seconds());
- _audio.startStream ();
+ start_audio_stream_if_open ();
+ for (auto& view: _video_view) {
+ view->start();
}
- _video_view->start ();
}
}
/* Take the video view's idea of position as our `playhead' and start the
audio stream (which is the timing reference) there.
*/
- if (_audio.isStreamOpen()) {
- _audio.setStreamTime (_video_view->position().seconds());
- try {
- _audio.startStream ();
- } catch (RtAudioError& e) {
- _audio_channels = 0;
- error_dialog (
- _video_view->get(),
- _("There was a problem starting audio playback. Please try another audio output device in Preferences."), std_to_wx(e.what())
- );
- }
- }
+ start_audio_stream_if_open ();
_playing = true;
/* Calling start() below may directly result in Stopped being emitted, and if that
* happens we want it to come after the Started signal, so do that first.
*/
- Started (position());
- _video_view->start ();
+ Started ();
+ for (auto& view: _video_view) {
+ view->start();
+ }
}
}
_playing = false;
- _video_view->stop ();
- Stopped (position());
+ for (auto& view: _video_view) {
+ view->stop();
+ }
- _video_view->rethrow ();
+ Stopped ();
+
+ for (auto& view: _video_view) {
+ view->rethrow();
+ }
return true;
}
}
if (p == Film::Property::AUDIO_CHANNELS) {
- recreate_butler ();
+ destroy_and_maybe_create_butler();
} else if (p == Film::Property::VIDEO_FRAME_RATE) {
- _video_view->set_video_frame_rate (_film->video_frame_rate());
+ for (auto& view: _video_view) {
+ view->set_video_frame_rate(_film->video_frame_rate());
+ }
} else if (p == Film::Property::THREE_D) {
- _video_view->set_three_d (_film->three_d());
+ _video_view[VideoType::MAIN]->set_three_d(_film->three_d());
} else if (p == Film::Property::CONTENT) {
_closed_captions_dialog->update_tracks (_film);
}
void
FilmViewer::film_length_change ()
{
- _video_view->set_length (_film->length());
+ for (auto& view: _video_view) {
+ view->set_length(_film->length());
+ }
}
void
FilmViewer::slow_refresh ()
{
- seek (_video_view->position(), true);
+ seek(_video_view[VideoType::MAIN]->position(), true);
}
bool
FilmViewer::quick_refresh ()
{
- if (!_video_view || !_film || !_player) {
+ if (!_video_view[VideoType::MAIN] || !_film || !_player) {
return true;
}
- return _video_view->reset_metadata (_film, _player->video_container_size());
+ return _video_view[VideoType::MAIN]->reset_metadata(_film, _player->video_container_size(VideoType::MAIN));
}
void
FilmViewer::seek (shared_ptr<Content> content, ContentTime t, bool accurate)
{
+ DCPOMATIC_ASSERT(_player);
auto dt = _player->content_time_to_dcp (content, t);
if (dt) {
seek (*dt, accurate);
/* We're going to start playing again straight away
so wait for the seek to finish.
*/
- while (_video_view->display_next_frame(false) == VideoView::AGAIN) {}
+ while (_video_view[VideoType::MAIN]->display_next_frame(false) == VideoView::AGAIN) {}
}
resume ();
FilmViewer::config_changed (Config::Property p)
{
if (p == Config::AUDIO_MAPPING) {
- recreate_butler ();
+ destroy_and_maybe_create_butler();
return;
}
} catch (RtAudioError& e) {
_audio_channels = 0;
error_dialog (
- _video_view->get(),
+ _video_view[VideoType::MAIN]->get(),
_("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what())
);
}
- recreate_butler ();
+ destroy_and_maybe_create_butler();
} else {
_audio_channels = 0;
- recreate_butler ();
+ destroy_and_maybe_create_butler();
}
}
return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime());
}
- return _video_view->position();
+ return _video_view[VideoType::MAIN]->position();
}
DCPTime
FilmViewer::time () const
{
- return audio_time().get_value_or(_video_view->position());
+ return audio_time().get_value_or(_video_view[VideoType::MAIN]->position());
}
}
+optional<ContentTime>
+FilmViewer::position_in_content (shared_ptr<const Content> content) const
+{
+ DCPOMATIC_ASSERT(_player);
+ return _player->dcp_to_content_time (content, position());
+}
+
+
DCPTime
FilmViewer::one_video_frame () const
{
}
+void
+FilmViewer::show_sign_language()
+{
+ _sign_language_dialog->Show();
+}
+
+
void
FilmViewer::seek_by (DCPTime by, bool accurate)
{
- seek (_video_view->position() + by, accurate);
+ seek(_video_view[VideoType::MAIN]->position() + by, accurate);
}
int
FilmViewer::dropped () const
{
- return _video_view->dropped ();
+ return _video_view[VideoType::MAIN]->dropped();
}
int
FilmViewer::errored () const
{
- return _video_view->errored ();
+ return _video_view[VideoType::MAIN]->errored();
}
int
FilmViewer::gets () const
{
- return _video_view->gets ();
+ return _video_view[VideoType::MAIN]->gets();
}
FilmViewer::set_optimise_for_j2k (bool o)
{
_optimise_for_j2k = o;
- _video_view->set_optimise_for_j2k (o);
+ _video_view[VideoType::MAIN]->set_optimise_for_j2k(o);
+}
+
+
+void
+FilmViewer::set_crop_guess (dcpomatic::Rect<float> crop)
+{
+ if (crop != _crop_guess) {
+ _crop_guess = crop;
+ _video_view[VideoType::MAIN]->update();
+ }
+}
+
+
+void
+FilmViewer::unset_crop_guess ()
+{
+ _crop_guess = boost::none;
+ _video_view[VideoType::MAIN]->update();
+}
+
+
+optional<dcpomatic::Rect<float>>
+FilmViewer::crop_guess(VideoType type) const
+{
+ if (type != VideoType::MAIN) {
+ return {};
+ }
+
+ return _crop_guess;
+}
+
+
+optional<dcpomatic::Rect<double>>
+FilmViewer::outline_subtitles(VideoType type) const
+{
+ if (type != VideoType::MAIN) {
+ return {};
+ }
+
+ return _outline_subtitles;
}
projects / dcpomatic.git / blobdiff