* @brief A wx widget to view a preview of a Film.
*/
+#include "film_viewer.h"
+#include "playhead_to_timecode_dialog.h"
+#include "playhead_to_frame_dialog.h"
+#include "wx_util.h"
#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/util.h"
#include "lib/video_decoder.h"
#include "lib/timer.h"
#include "lib/log.h"
-#include "film_viewer.h"
-#include "wx_util.h"
+#include "lib/config.h"
extern "C" {
#include <libavutil/pixfmt.h>
}
, _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content")))
, _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 (new wxCheckBox (this, wxID_ANY, _("Jump to selected content")))
, _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(">")))
, _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
, _coalesce_player_changes (false)
, _pending_player_change (false)
- , _last_get_accurate (true)
+ , _last_seek_accurate (true)
{
#ifndef __WXOSX__
_panel->SetDoubleBuffered (true);
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);
+ view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
_v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
_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));
- _outline_content->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmViewer::refresh_panel, this));
- _left_eye->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&FilmViewer::refresh, this));
- _right_eye->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&FilmViewer::refresh, this));
- _slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&FilmViewer::slider_moved, this));
- _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind (&FilmViewer::slider_moved, this));
- _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind (&FilmViewer::slider_moved, this));
- _play_button->Bind (wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, boost::bind (&FilmViewer::play_clicked, this));
- _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this));
- _back_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmViewer::back_clicked, this));
- _forward_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmViewer::forward_clicked, this));
+ _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this));
+ _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1));
+ _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));
+ _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind (&FilmViewer::slider_moved, this));
+ _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind (&FilmViewer::slider_moved, this));
+ _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));
+ _jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::jump_to_selected_clicked, this));
+
+ _jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
set_film (shared_ptr<Film> ());
_player->set_ignore_audio ();
_player->set_play_referenced ();
- _film_connection = _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
+ _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
- _player_connection = _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
+ _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
+ _player->Video.connect (boost::bind (&FilmViewer::video, this, _1, _2));
calculate_sizes ();
refresh ();
}
void
-FilmViewer::get (DCPTime p, bool accurate)
+FilmViewer::video (shared_ptr<PlayerVideo> pv, DCPTime time)
{
if (!_player) {
return;
}
- list<shared_ptr<PlayerVideo> > all_pv;
- try {
- all_pv = _player->get_video (p, accurate);
- } catch (exception& e) {
- error_dialog (this, wxString::Format (_("Could not get video for view (%s)"), std_to_wx(e.what()).data()));
- }
-
- if (!all_pv.empty ()) {
- try {
- shared_ptr<PlayerVideo> pv;
- if (all_pv.size() == 2) {
- /* We have 3D; choose the correct eye */
- if (_left_eye->GetValue()) {
- if (all_pv.front()->eyes() == EYES_LEFT) {
- pv = all_pv.front();
- } else {
- pv = all_pv.back();
- }
- } else {
- if (all_pv.front()->eyes() == EYES_RIGHT) {
- pv = all_pv.front();
- } else {
- pv = all_pv.back();
- }
- }
- } else {
- /* 2D; no choice to make */
- pv = all_pv.front ();
- }
-
- _frame = pv->image (
- bind (&Log::dcp_log, _film->log().get(), _1, _2), bind (&PlayerVideo::always_rgb, _1), false, true
- );
-
- ImageChanged (pv);
-
- _position = pv->time ();
- _inter_position = pv->inter_position ();
- _inter_size = pv->inter_size ();
- } catch (dcp::DCPReadError& e) {
- /* This can happen on the following sequence of events:
- * - load encrypted DCP
- * - add KDM
- * - DCP is examined again, which sets its "playable" flag to 1
- * - as a side effect of the exam, the viewer is updated using the old pieces
- * - the DCPDecoder in the old piece gives us an encrypted frame
- * - then, the pieces are re-made (but too late).
- *
- * I hope there's a better way to handle this ...
- */
- _frame.reset ();
- _position = p;
+ if (_film->three_d ()) {
+ if ((_left_eye->GetValue() && pv->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && pv->eyes() == EYES_LEFT)) {
+ return;
}
- } else {
- _frame.reset ();
- _position = p;
}
+ /* In an ideal world, what we would do here is:
+ *
+ * 1. convert to XYZ exactly as we do in the DCP creation path.
+ * 2. convert back to RGB for the preview display, compensating
+ * for the monitor etc. etc.
+ *
+ * but this is inefficient if the source is RGB. Since we don't
+ * (currently) care too much about the precise accuracy of the preview's
+ * colour mapping (and we care more about its speed) we try to short-
+ * circuit this "ideal" situation in some cases.
+ *
+ * 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
+ * image and convert it (from whatever the user has said it is) to RGB.
+ */
+
+ _frame = pv->image (
+ bind (&Log::dcp_log, _film->log().get(), _1, _2),
+ bind (&PlayerVideo::always_rgb, _1),
+ false, true
+ );
+
+ ImageChanged (pv);
+
+ _position = time;
+ _inter_position = pv->inter_position ();
+ _inter_size = pv->inter_size ();
+
refresh_panel ();
+}
- _last_get_accurate = accurate;
+void
+FilmViewer::get ()
+{
+ Image const * current = _frame.get ();
+ while (!_player->pass() && _frame.get() == current) {}
}
void
_play_button->SetValue (false);
check_play_state ();
} else {
- get (_position + frame, true);
+ get ();
}
update_position_label ();
if (t >= _film->length ()) {
t = _film->length() - DCPTime::from_frames (1, _film->video_frame_rate ());
}
- get (t, false);
+ seek (t, false);
update_position_label ();
}
_play_button->Enable (a);
}
-void
-FilmViewer::back_clicked ()
+DCPTime
+FilmViewer::nudge_amount (wxMouseEvent& ev)
{
- DCPTime p = _position - DCPTime::from_frames (1, _film->video_frame_rate ());
- if (p < DCPTime ()) {
- p = DCPTime ();
+ DCPTime amount = DCPTime::from_frames (1, _film->video_frame_rate ());
+
+ 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);
}
- get (p, true);
- update_position_label ();
- update_position_slider ();
+ return amount;
}
void
-FilmViewer::forward_clicked ()
+FilmViewer::go_to (DCPTime t)
{
- DCPTime p = _position + DCPTime::from_frames (1, _film->video_frame_rate ());
- if (p >= _film->length ()) {
- p = _position;
+ if (t < DCPTime ()) {
+ t = DCPTime ();
}
- get (p, true);
+ if (t >= _film->length ()) {
+ t = _film->length ();
+ }
+
+ seek (t, true);
update_position_label ();
update_position_slider ();
}
+void
+FilmViewer::back_clicked (wxMouseEvent& ev)
+{
+ go_to (_position - nudge_amount (ev));
+ ev.Skip ();
+}
+
+void
+FilmViewer::forward_clicked (wxMouseEvent& ev)
+{
+ go_to (_position + nudge_amount (ev));
+ ev.Skip ();
+}
+
void
FilmViewer::player_changed (bool frequent)
{
void
FilmViewer::refresh ()
{
- get (_position, _last_get_accurate);
+ seek (_position, _last_seek_accurate);
}
void
FilmViewer::set_position (DCPTime p)
{
_position = p;
- get (_position, true);
+ seek (p, true);
update_position_label ();
update_position_slider ();
}
}
}
}
+
+void
+FilmViewer::timecode_clicked ()
+{
+ PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _film->video_frame_rate ());
+ if (dialog->ShowModal() == wxID_OK) {
+ go_to (dialog->get ());
+ }
+ 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 ());
+ }
+ 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)
+{
+ _player->seek (t, accurate);
+ _last_seek_accurate = accurate;
+ get ();
+}