#include "lib/butler.h"
#include <dcp/util.h>
#include <wx/wx.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
using std::max;
using std::string;
using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
+
SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
: VideoView (viewer)
{
void
SimpleVideoView::paint ()
{
- _viewer->state_timer().set("paint-panel");
+ _state_timer.set("paint-panel");
wxPaintDC dc (_panel);
dcp::Size const out_size = _viewer->out_size ();
wxSize const panel_size = _panel->GetSize ();
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- if (_viewer->background_image()) {
- dc.Clear ();
- 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.GetWidth() - image.GetSize().GetWidth()) / 2), max(0, (panel_size.GetHeight() - image.GetSize().GetHeight()) / 2));
- }
- return;
- }
-#endif
-
if (!out_size.width || !out_size.height || !_image || out_size != _image->size()) {
dc.Clear ();
} else {
wxImage frame (out_size.width, out_size.height, _image->data()[0], true);
wxBitmap frame_bitmap (frame);
dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
- int64_t n = _viewer->position().get() / period.get();
- DCPTime from(n * period.get());
- DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
- if (from <= _viewer->position() && _viewer->position() <= to) {
- if (!_in_watermark) {
- _in_watermark = true;
- _watermark_x = rand() % panel_size.GetWidth();
- _watermark_y = rand() % panel_size.GetHeight();
- }
- dc.SetTextForeground(*wxWHITE);
- string wm = Config::instance()->player_watermark_theatre();
- boost::posix_time::ptime t = boost::posix_time::second_clock::local_time();
- wm += "\n" + boost::posix_time::to_iso_extended_string(t);
- dc.DrawText(std_to_wx(wm), _watermark_x, _watermark_y);
- } else {
- _in_watermark = false;
- }
-#endif
}
+ auto const pad_colour = (_viewer->pad_black() || gui_is_dark()) ? wxColour(0, 0, 0) : wxColour(240, 240, 240);
+
if (out_size.width < panel_size.GetWidth()) {
- /* XXX: these colours are right for GNOME; may need adjusting for other OS */
- wxPen p (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
- wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+ wxPen p (pad_colour);
+ wxBrush b (pad_colour);
dc.SetPen (p);
dc.SetBrush (b);
dc.DrawRectangle (out_size.width, 0, panel_size.GetWidth() - out_size.width, panel_size.GetHeight());
}
if (out_size.height < panel_size.GetHeight()) {
- wxPen p (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
- wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+ wxPen p (pad_colour);
+ wxBrush b (pad_colour);
dc.SetPen (p);
dc.SetBrush (b);
int const gap = (panel_size.GetHeight() - out_size.height) / 2;
}
if (_viewer->outline_content()) {
- Position<int> inter_position = _viewer->inter_position ();
- dcp::Size inter_size = _viewer->inter_size ();
wxPen p (wxColour (255, 0, 0), 2);
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
- dc.DrawRectangle (inter_position.x, inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, inter_size.width, inter_size.height);
+ dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height);
}
- _viewer->state_timer().unset();
+
+ auto subs = _viewer->outline_subtitles();
+ if (subs) {
+ wxPen p (wxColour(0, 255, 0), 2);
+ dc.SetPen (p);
+ dc.SetBrush (*wxTRANSPARENT_BRUSH);
+ dc.DrawRectangle (subs->x * out_size.width, subs->y * out_size.height, subs->width * out_size.width, subs->height * out_size.height);
+ }
+
+ _state_timer.unset();
}
void
-SimpleVideoView::update ()
+SimpleVideoView::refresh_panel ()
{
+ _state_timer.set ("refresh-panel");
_panel->Refresh ();
_panel->Update ();
+ _state_timer.unset ();
}
void
}
display_next_frame (false);
- DCPTime const next = _viewer->position() + _viewer->one_video_frame();
+ auto const next = position() + _viewer->one_video_frame();
if (next >= length()) {
- _viewer->stop ();
- _viewer->Finished ();
+ _viewer->finished ();
return;
}
- LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
- _timer.Start (time_until_next_frame(), wxTIMER_ONE_SHOT);
+ LOG_DEBUG_VIDEO_VIEW("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
+ _timer.Start (max(1, time_until_next_frame().get_value_or(0)), wxTIMER_ONE_SHOT);
if (_viewer->butler()) {
_viewer->butler()->rethrow ();
void
SimpleVideoView::start ()
{
+ VideoView::start ();
timer ();
}
* false to ask the butler to block until it has video (unless it is suspended).
* @return true on success, false if we did nothing because it would have taken too long.
*/
-bool
+VideoView::NextFrameResult
SimpleVideoView::display_next_frame (bool non_blocking)
{
- bool r = get_next_frame (non_blocking);
- if (!r) {
- if (non_blocking) {
- /* No video available; return saying we failed */
- return false;
- } else {
- /* Player was suspended; come back later */
- signal_manager->when_idle (boost::bind(&SimpleVideoView::display_next_frame, this, false));
- return false;
- }
+ auto const r = get_next_frame (non_blocking);
+ if (r != SUCCESS) {
+ return r;
}
- display_player_video ();
+ update ();
- return true;
+ try {
+ _viewer->butler()->rethrow ();
+ } catch (DecodeError& e) {
+ error_dialog (get(), e.what());
+ }
+
+ return SUCCESS;
}
void
-SimpleVideoView::display_player_video ()
+SimpleVideoView::update ()
{
- if (!_player_video.first) {
+ if (!player_video().first) {
set_image (shared_ptr<Image>());
- _viewer->refresh_view ();
+ refresh_panel ();
return;
}
- if (_viewer->playing() && (_viewer->time() - _player_video.second) > _viewer->one_video_frame()) {
+ if (_viewer->playing() && (_viewer->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).
*/
- ++_viewer->_dropped;
+ add_dropped ();
return;
}
* image and convert it (from whatever the user has said it is) to RGB.
*/
- _viewer->_state_timer.set ("get image");
+ _state_timer.set ("get image");
set_image (
- _player_video.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
+ player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, true)
);
- _viewer->_state_timer.set ("ImageChanged");
- _viewer->ImageChanged (_player_video.first);
- _viewer->_state_timer.unset ();
-
- _viewer->_inter_position = _player_video.first->inter_position ();
- _viewer->_inter_size = _player_video.first->inter_size ();
+ _state_timer.set ("ImageChanged");
+ _viewer->image_changed (player_video().first);
+ _state_timer.unset ();
- _viewer->refresh_view ();
+ _inter_position = player_video().first->inter_position ();
+ _inter_size = player_video().first->inter_size ();
- _viewer->_closed_captions_dialog->update (_viewer->time());
+ refresh_panel ();
}
projects / dcpomatic.git / blobdiff