X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=7e1b618119eec5367b0374fa09239886a3f12181;hp=291ab422d82574bf357988d237efaf1b0aed4443;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hpb=e24d0def5b4e6c1825620b032af9f63c9eb78693 diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 291ab422d..7e1b61811 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,9 +35,8 @@ #include "lib/filter.h" #include "lib/player.h" #include "lib/video_content.h" -#include "lib/ffmpeg_content.h" -#include "lib/still_image_content.h" #include "lib/video_decoder.h" +#include "lib/timer.h" #include "film_viewer.h" #include "wx_util.h" @@ -47,11 +46,12 @@ using std::min; using std::max; using std::cout; using std::list; +using std::bad_alloc; using std::make_pair; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::weak_ptr; -using libdcp::Size; +using dcp::Size; FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) : wxPanel (p) @@ -120,17 +120,24 @@ FilmViewer::set_film (shared_ptr f) _film = f; _frame.reset (); - _queue.clear (); - + _slider->SetValue (0); - set_position_text (0); + set_position_text (DCPTime ()); if (!_film) { return; } - _player = f->make_player (); + try { + _player = f->make_player (); + } catch (bad_alloc) { + error_dialog (this, _("There is not enough free memory to do that.")); + _film.reset (); + return; + } + _player->disable_audio (); + _player->set_approximate_size (); _player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _2, _5)); _player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1)); @@ -150,7 +157,10 @@ FilmViewer::fetch_current_frame_again () */ _got_frame = false; - _player->repeat_last_video (); + if (!_player->repeat_last_video ()) { + fetch_next_frame (); + } + _panel->Refresh (); _panel->Update (); } @@ -164,10 +174,10 @@ FilmViewer::timer () fetch_next_frame (); - Time const len = _film->length (); + DCPTime const len = _film->length (); - if (len) { - int const new_slider_position = 4096 * _player->video_position() / len; + if (len.get ()) { + int const new_slider_position = 4096 * _player->video_position().get() / len.get(); if (new_slider_position != _slider->GetValue()) { _slider->SetValue (new_slider_position); } @@ -185,9 +195,7 @@ FilmViewer::paint_panel () return; } - shared_ptr packed_frame (new Image (_frame, false)); - - wxImage frame (_out_size.width, _out_size.height, packed_frame->data()[0], true); + wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); wxBitmap frame_bitmap (frame); dc.DrawBitmap (frame_bitmap, 0, 0); @@ -213,8 +221,14 @@ void FilmViewer::slider_moved () { if (_film && _player) { - _player->seek (_slider->GetValue() * _film->length() / 4096, false); - fetch_next_frame (); + try { + _player->seek (DCPTime (_film->length().get() * _slider->GetValue() / 4096), false); + fetch_next_frame (); + } catch (OpenFileError& e) { + /* There was a problem opening a content file; we'll let this slide as it + probably means a missing content file, which we're already taking care of. + */ + } } } @@ -253,6 +267,13 @@ FilmViewer::calculate_sizes () _out_size.width = max (64, _out_size.width); _out_size.height = max (64, _out_size.height); + /* The player will round its image down to the nearest 4 pixels + to speed up its scale, so do similar here to avoid black borders + around things. This is a bit of a hack. + */ + _out_size.width &= ~3; + _out_size.height &= ~3; + _player->set_video_container_size (_out_size); } @@ -277,26 +298,24 @@ FilmViewer::check_play_state () } void -FilmViewer::process_video (shared_ptr image, Eyes eyes, Time t) +FilmViewer::process_video (shared_ptr image, Eyes eyes, DCPTime t) { if (eyes == EYES_RIGHT) { return; } - - 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; + + /* Going via BGRA here makes the scaler faster then using RGB24 directly (about + twice on x86 Linux). + */ + shared_ptr im = image->image (PIX_FMT_BGRA, true); + _frame = im->scale (im->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false); _got_frame = true; set_position_text (t); } void -FilmViewer::set_position_text (Time t) +FilmViewer::set_position_text (DCPTime t) { if (!_film) { _frame_number->SetLabel ("0"); @@ -306,9 +325,9 @@ FilmViewer::set_position_text (Time t) double const fps = _film->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)); + _frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (t.seconds() * fps)) + 1)); - double w = static_cast(t) / TIME_HZ; + double w = t.seconds (); int const h = (w / 3600); w -= h * 3600; int const m = (w / 60); @@ -332,17 +351,16 @@ FilmViewer::fetch_next_frame () _got_frame = false; - if (!_queue.empty ()) { - process_video (_queue.back().first, EYES_BOTH, _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())); - } + 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 (OpenFileError& e) { + /* There was a problem opening a content file; we'll let this slide as it + probably means a missing content file, which we're already taking care of. + */ } _panel->Refresh (); @@ -380,13 +398,19 @@ FilmViewer::back_clicked () We want to see the one before it, so we need to go back 2. */ - Time p = _player->video_position() - _film->video_frames_to_time (2); - if (p < 0) { - p = 0; + DCPTime p = _player->video_position() - DCPTime::from_frames (2, _film->video_frame_rate ()); + if (p < DCPTime ()) { + p = DCPTime (); } - _player->seek (p, true); - fetch_next_frame (); + try { + _player->seek (p, true); + fetch_next_frame (); + } catch (OpenFileError& e) { + /* There was a problem opening a content file; we'll let this slide as it + probably means a missing content file, which we're already taking care of. + */ + } } void @@ -405,7 +429,7 @@ FilmViewer::player_changed (bool frequent) if (frequent) { return; } - + calculate_sizes (); fetch_current_frame_again (); }