using std::string;
using std::pair;
+using std::min;
using std::max;
using std::cout;
using std::list;
+using std::make_pair;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::weak_ptr;
, _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")))
, _got_frame (false)
_panel->SetDoubleBuffered (true);
#endif
-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
_panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
-#endif
_v_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (_v_sizer);
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);
_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));
);
}
-void
-FilmViewer::film_changed (Film::Property p)
-{
- switch (p) {
- case Film::CONTAINER:
- 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:
- update_from_decoder ();
- break;
- default:
- break;
- }
-}
-
void
FilmViewer::set_film (shared_ptr<Film> f)
{
_film = f;
- _raw_frame.reset ();
- _display_frame.reset ();
- _panel->Refresh ();
- _panel->Update ();
+ _frame.reset ();
+ _queue.clear ();
if (!_film) {
return;
}
- _player = f->player ();
+ _player = f->make_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));
-
- _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::CONTAINER);
- 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, _3));
+ _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
+
+ calculate_sizes ();
+ fetch_current_frame_again ();
}
void
-FilmViewer::update_from_decoder ()
+FilmViewer::fetch_current_frame_again ()
{
if (!_player) {
return;
}
- _player->seek (_player->position() - _film->video_frames_to_time (1));
- get_frame ();
- _panel->Refresh ();
- _panel->Update ();
+ /* Player::video_position is the time after the last frame that we received.
+ We want to see it again, so seek back one frame.
+ */
+
+ Time p = _player->video_position() - _film->video_frames_to_time (1);
+ if (p < 0) {
+ p = 0;
+ }
+
+ _player->seek (p, true);
+ fetch_next_frame ();
}
void
return;
}
- get_frame ();
+ fetch_next_frame ();
if (_film->length()) {
- int const new_slider_position = 4096 * _player->position() / _film->length();
+ int const new_slider_position = 4096 * _player->video_position() / _film->length();
if (new_slider_position != _slider->GetValue()) {
_slider->SetValue (new_slider_position);
}
}
-
- _panel->Refresh ();
- _panel->Update ();
}
{
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;
}
- wxImage frame (_out_size.width, _out_size.height, _display_frame->data()[0], true);
+ shared_ptr<Image> packed_frame (new Image (_frame, false));
+
+ wxImage frame (_out_size.width, _out_size.height, packed_frame->data()[0], true);
wxBitmap frame_bitmap (frame);
dc.DrawBitmap (frame_bitmap, 0, 0);
void
FilmViewer::slider_moved (wxScrollEvent &)
{
- cout << "slider " << _slider->GetValue() << " " << _film->length() << "\n";
-
if (_film && _player) {
- _player->seek (_slider->GetValue() * _film->length() / 4096);
+ _player->seek (_slider->GetValue() * _film->length() / 4096, false);
+ fetch_next_frame ();
}
-
- get_frame ();
- _panel->Refresh ();
- _panel->Update ();
}
void
_panel_size.width = ev.GetSize().GetWidth();
_panel_size.height = ev.GetSize().GetHeight();
calculate_sizes ();
- update_from_raw ();
+ fetch_current_frame_again ();
}
-void
-FilmViewer::update_from_raw ()
-{
- if (!_raw_frame) {
- return;
- }
-
- raw_to_display ();
-
- _panel->Refresh ();
- _panel->Update ();
-}
-
-void
-FilmViewer::raw_to_display ()
-{
- if (!_raw_frame || _out_size.width < 64 || _out_size.height < 64 || !_film) {
- return;
- }
-
- /* Get a compacted image as we have to feed it to wxWidgets */
- _display_frame.reset (new SimpleImage (_raw_frame, false));
-}
-
void
FilmViewer::calculate_sizes ()
{
}
/* 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
-FilmViewer::process_video (shared_ptr<const Image> image, bool, Time t)
+FilmViewer::process_video (shared_ptr<const Image> image, Time t)
{
- _raw_frame = image;
-
- raw_to_display ();
-
+ if (_got_frame) {
+ /* This is an additional frame emitted by a single pass. Store it. */
+ _queue.push_front (make_pair (image, t));
+ return;
+ }
+
+ _frame = image;
_got_frame = true;
double const fps = _film->dcp_video_frame_rate ();
/* Count frame number from 1 ... not sure if this is the best idea */
- _frame->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps / TIME_HZ)) + 1));
-
+ _frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps / TIME_HZ)) + 1));
+
double w = static_cast<double>(t) / TIME_HZ;
int const h = (w / 3600);
w -= h * 3600;
_timecode->SetLabel (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;
- }
+ _got_frame = false;
+
+ if (!_queue.empty ()) {
+ process_video (_queue.back().first, _queue.back().second);
+ _queue.pop_back ();
+ } else {
+ try {
+ 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()));
}
- } 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
_play_button->Enable (!a);
}
-void
-FilmViewer::film_content_changed (weak_ptr<Content>, int p)
-{
- if (p == ContentProperty::LENGTH) {
- /* Force an update to our frame */
- wxScrollEvent ev;
- slider_moved (ev);
- } else if (p == VideoContentProperty::VIDEO_CROP) {
- update_from_decoder ();
- }
-}
-
void
FilmViewer::back_clicked (wxCommandEvent &)
{
if (!_player) {
return;
}
+
+ /* Player::video_position is the time after the last frame that we received.
+ We want to see the one before it, so we need to go back 2.
+ */
- _player->seek_back ();
- get_frame ();
- _panel->Refresh ();
- _panel->Update ();
+ _player->seek (_player->video_position() - _film->video_frames_to_time(2), true);
+ fetch_next_frame ();
}
void
return;
}
- _player->seek_forward ();
- get_frame ();
- _panel->Refresh ();
- _panel->Update ();
+ fetch_next_frame ();
+}
+
+void
+FilmViewer::player_changed (bool frequent)
+{
+ if (frequent) {
+ return;
+ }
+
+ calculate_sizes ();
+ fetch_current_frame_again ();
}
projects / dcpomatic.git / blobdiff