X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=ab53a9d154c48f21a2ae03db46890aed986f71e5;hb=bc5253cec3293a3cde39f5b9fea491a6be720640;hp=e9a1a574be01477b884e34a5eeb05e30684edbcc;hpb=28dbf4fd074d2046a3c8ddebac9a537a80fd457a;p=dcpomatic.git diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index e9a1a574b..ab53a9d15 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -25,10 +25,9 @@ #include #include #include "lib/film.h" -#include "lib/format.h" +#include "lib/ratio.h" #include "lib/util.h" #include "lib/job_manager.h" -#include "lib/subtitle.h" #include "lib/image.h" #include "lib/scaler.h" #include "lib/exceptions.h" @@ -44,6 +43,7 @@ using std::string; using std::pair; +using std::min; using std::max; using std::cout; using std::list; @@ -58,16 +58,16 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) , _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 (new wxStaticText (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"))) - , _display_frame_x (0) , _got_frame (false) { +#ifndef __WXOSX__ _panel->SetDoubleBuffered (true); -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 +#endif + _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); -#endif _v_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (_v_sizer); @@ -77,7 +77,7 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL); - time_sizer->Add (_frame, 0, wxEXPAND); + time_sizer->Add (_frame_number, 0, wxEXPAND); time_sizer->Add (_timecode, 0, wxEXPAND); h_sizer->Add (_back_button, 0, wxALL, 2); @@ -88,7 +88,7 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6); - _frame->SetMinSize (wxSize (84, -1)); + _frame_number->SetMinSize (wxSize (84, -1)); _back_button->SetMinSize (wxSize (32, -1)); _forward_button->SetMinSize (wxSize (32, -1)); @@ -109,38 +109,6 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) ); } -void -FilmViewer::film_changed (Film::Property p) -{ - switch (p) { - case Film::FORMAT: - calculate_sizes (); - update_from_raw (); - break; - case Film::CONTENT: - { - calculate_sizes (); - wxScrollEvent ev; - slider_moved (ev); - break; - } - case Film::WITH_SUBTITLES: - case Film::SUBTITLE_OFFSET: - case Film::SUBTITLE_SCALE: - raw_to_display (); - _panel->Refresh (); - _panel->Update (); - break; - case Film::SCALER: - case Film::FILTERS: - case Film::CROP: - update_from_decoder (); - break; - default: - break; - } -} - void FilmViewer::set_film (shared_ptr f) { @@ -150,10 +118,7 @@ FilmViewer::set_film (shared_ptr f) _film = f; - _raw_frame.reset (); - _display_frame.reset (); - _panel->Refresh (); - _panel->Update (); + _frame.reset (); if (!_film) { return; @@ -161,32 +126,28 @@ FilmViewer::set_film (shared_ptr f) _player = f->player (); _player->disable_audio (); - /* Don't disable subtitles here as we may need them, and it's nice to be able to turn them - on and off without needing obtain a new Player. - */ - - _player->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3, _4)); - - _film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1)); - _film->ContentChanged.connect (boost::bind (&FilmViewer::film_content_changed, this, _1, _2)); - - film_changed (Film::CONTENT); - film_changed (Film::FORMAT); - film_changed (Film::WITH_SUBTITLES); - film_changed (Film::SUBTITLE_OFFSET); - film_changed (Film::SUBTITLE_SCALE); + _player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _2, _3)); + _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this)); + + calculate_sizes (); + fetch_current_frame_again (); } void -FilmViewer::update_from_decoder () +FilmViewer::fetch_current_frame_again () { - if (!_player || _player->seek (_player->last_video_time ())) { + if (!_player) { return; } - get_frame (); - _panel->Refresh (); - _panel->Update (); + Time const t = _film->video_frames_to_time (1); + + /* This 2.5 is, in theory: 1 to get back to the same frame, 1 more + because we are about to call fetch_next_frame(), and 0.5 for luck. + */ + + _player->seek (_player->video_position() - t * 2.5, true); + fetch_next_frame (); } void @@ -196,13 +157,10 @@ FilmViewer::timer (wxTimerEvent &) return; } - _panel->Refresh (); - _panel->Update (); + fetch_next_frame (); - get_frame (); - - if (_film->video_length()) { - int const new_slider_position = 4096 * _player->last_video_time() / (_film->video_length() / _film->video_frame_rate()); + if (_film->length()) { + int const new_slider_position = 4096 * _player->video_position() / _film->length(); if (new_slider_position != _slider->GetValue()) { _slider->SetValue (new_slider_position); } @@ -215,27 +173,16 @@ FilmViewer::paint_panel (wxPaintEvent &) { wxPaintDC dc (_panel); - if (!_display_frame || !_film || !_out_size.width || !_out_size.height) { + if (!_frame || !_film || !_out_size.width || !_out_size.height) { dc.Clear (); return; } - if (_display_frame_x) { - dc.SetPen(*wxBLACK_PEN); - dc.SetBrush(*wxBLACK_BRUSH); - dc.DrawRectangle (0, 0, _display_frame_x, _film_size.height); - dc.DrawRectangle (_display_frame_x + _film_size.width, 0, _display_frame_x, _film_size.height); - } + shared_ptr packed_frame (new Image (_frame, false)); - wxImage frame (_film_size.width, _film_size.height, _display_frame->data()[0], true); + wxImage frame (_out_size.width, _out_size.height, packed_frame->data()[0], true); wxBitmap frame_bitmap (frame); - dc.DrawBitmap (frame_bitmap, _display_frame_x, 0); - - if (_film->with_subtitles() && _display_sub) { - wxImage sub (_display_sub->size().width, _display_sub->size().height, _display_sub->data()[0], _display_sub->alpha(), true); - wxBitmap sub_bitmap (sub); - dc.DrawBitmap (sub_bitmap, _display_sub_position.x, _display_sub_position.y); - } + dc.DrawBitmap (frame_bitmap, 0, 0); if (_out_size.width < _panel_size.width) { wxPen p (GetBackgroundColour ()); @@ -258,17 +205,10 @@ FilmViewer::paint_panel (wxPaintEvent &) void FilmViewer::slider_moved (wxScrollEvent &) { - if (!_film || !_player) { - return; + if (_film && _player) { + _player->seek (_slider->GetValue() * _film->length() / 4096, false); + fetch_next_frame (); } - - if (_player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()))) { - return; - } - - get_frame (); - _panel->Refresh (); - _panel->Update (); } void @@ -277,61 +217,9 @@ FilmViewer::panel_sized (wxSizeEvent& ev) _panel_size.width = ev.GetSize().GetWidth(); _panel_size.height = ev.GetSize().GetHeight(); calculate_sizes (); - update_from_raw (); -} - -void -FilmViewer::update_from_raw () -{ - if (!_raw_frame) { - return; - } - - raw_to_display (); - - _panel->Refresh (); - _panel->Update (); + fetch_current_frame_again (); } -void -FilmViewer::raw_to_display () -{ - if (!_raw_frame || _out_size.width < 64 || _out_size.height < 64 || !_film) { - return; - } - - shared_ptr input = _raw_frame; - - pair const s = Filter::ffmpeg_strings (_film->filters()); - if (!s.second.empty ()) { - input = input->post_process (s.second, true); - } - - /* Get a compacted image as we have to feed it to wxWidgets */ - _display_frame = input->scale_and_convert_to_rgb (_film_size, 0, _film->scaler(), false); - - if (_raw_sub) { - - /* Our output is already cropped by the decoder, so we need to account for that - when working out the scale that we are applying. - */ - - Size const cropped_size = _film->cropped_size (_film->video_size ()); - - Rect tx = subtitle_transformed_area ( - float (_film_size.width) / cropped_size.width, - float (_film_size.height) / cropped_size.height, - _raw_sub->area(), _film->subtitle_offset(), _film->subtitle_scale() - ); - - _display_sub.reset (new RGBPlusAlphaImage (_raw_sub->image()->scale (tx.size(), _film->scaler(), false))); - _display_sub_position = tx.position(); - _display_sub_position.x += _display_frame_x; - } else { - _display_sub.reset (); - } -} - void FilmViewer::calculate_sizes () { @@ -339,10 +227,10 @@ FilmViewer::calculate_sizes () return; } - Format const * format = _film->format (); + Ratio const * container = _film->container (); float const panel_ratio = static_cast (_panel_size.width) / _panel_size.height; - float const film_ratio = format ? format->container_ratio () : 1.78; + float const film_ratio = container ? container->ratio () : 1.78; if (panel_ratio < film_ratio) { /* panel is less widscreen than the film; clamp width */ @@ -354,21 +242,11 @@ FilmViewer::calculate_sizes () _out_size.width = _out_size.height * film_ratio; } - /* Work out how much padding there is in terms of our display; this will be the x position - of our _display_frame. - */ - _display_frame_x = 0; - if (format) { - _display_frame_x = static_cast (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width; - } - - _film_size = _out_size; - _film_size.width -= _display_frame_x * 2; - /* Catch silly values */ - if (_out_size.width < 64) { - _out_size.width = 64; - } + _out_size.width = max (64, _out_size.width); + _out_size.height = max (64, _out_size.height); + + _player->set_video_container_size (_out_size); } void @@ -380,31 +258,29 @@ FilmViewer::play_clicked (wxCommandEvent &) void FilmViewer::check_play_state () { - if (!_film) { + if (!_film || _film->dcp_video_frame_rate() == 0) { return; } if (_play_button->GetValue()) { - _timer.Start (1000 / _film->video_frame_rate()); + _timer.Start (1000 / _film->dcp_video_frame_rate()); } else { _timer.Stop (); } } void -FilmViewer::process_video (shared_ptr image, bool, shared_ptr sub, double t) +FilmViewer::process_video (shared_ptr image, bool, Time t) { - _raw_frame = image; - _raw_sub = sub; - - raw_to_display (); + _frame = image; _got_frame = true; - double const fps = _film->video_frame_rate (); - _frame->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps)))); - - double w = t; + double const fps = _film->dcp_video_frame_rate (); + /* Count frame number from 1 ... not sure if this is the best idea */ + _frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps / TIME_HZ)) + 1)); + + double w = static_cast(t) / TIME_HZ; int const h = (w / 3600); w -= h * 3600; int const m = (w / 60); @@ -415,36 +291,28 @@ FilmViewer::process_video (shared_ptr image, bool, shared_ptrSetLabel (wxString::Format (wxT("%02d:%02d:%02d:%02d"), h, m, s, f)); } -/** Get a new _raw_frame from the decoder and then do - * raw_to_display (). - */ +/** Ask the player to emit its next frame, then update our display */ void -FilmViewer::get_frame () +FilmViewer::fetch_next_frame () { - /* Clear our raw frame in case we don't get a new one */ - _raw_frame.reset (); + /* Clear our frame in case we don't get a new one */ + _frame.reset (); if (!_player) { - _display_frame.reset (); return; } try { _got_frame = false; - while (!_got_frame) { - if (_player->pass ()) { - /* We didn't get a frame before the decoder gave up, - so clear our display frame. - */ - _display_frame.reset (); - break; - } - } + while (!_got_frame && !_player->pass ()) {} } catch (DecodeError& e) { _play_button->SetValue (false); check_play_state (); error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data())); } + + _panel->Refresh (); + _panel->Update (); } void @@ -467,27 +335,17 @@ FilmViewer::active_jobs_changed (bool a) _play_button->Enable (!a); } -void -FilmViewer::film_content_changed (weak_ptr, int p) -{ - if (p == VideoContentProperty::VIDEO_LENGTH) { - /* Force an update to our frame */ - wxScrollEvent ev; - slider_moved (ev); - } -} - void FilmViewer::back_clicked (wxCommandEvent &) { if (!_player) { return; } + + Time const t = _film->video_frames_to_time (1); - _player->seek_back (); - get_frame (); - _panel->Refresh (); - _panel->Update (); + _player->seek (_player->video_position() - t * 2.5, true); + fetch_next_frame (); } void @@ -497,8 +355,12 @@ FilmViewer::forward_clicked (wxCommandEvent &) return; } - _player->seek_forward (); - get_frame (); - _panel->Refresh (); - _panel->Update (); + fetch_next_frame (); +} + +void +FilmViewer::player_changed () +{ + calculate_sizes (); + fetch_current_frame_again (); }