#include "lib/filter.h"
#include "lib/player.h"
#include "lib/video_content.h"
-#include "lib/ffmpeg_content.h"
-#include "lib/imagemagick_content.h"
+#include "lib/video_decoder.h"
+#include "lib/timer.h"
#include "film_viewer.h"
#include "wx_util.h"
-#include "video_decoder.h"
using std::string;
using std::pair;
_back_button->SetMinSize (wxSize (32, -1));
_forward_button->SetMinSize (wxSize (32, -1));
- _panel->Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (FilmViewer::paint_panel), 0, this);
- _panel->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (FilmViewer::panel_sized), 0, this);
- _slider->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (FilmViewer::slider_moved), 0, this);
- _slider->Connect (wxID_ANY, wxEVT_SCROLL_PAGEUP, wxScrollEventHandler (FilmViewer::slider_moved), 0, this);
- _slider->Connect (wxID_ANY, wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler (FilmViewer::slider_moved), 0, this);
- _play_button->Connect (wxID_ANY, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler (FilmViewer::play_clicked), 0, this);
- _timer.Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (FilmViewer::timer), 0, this);
- _back_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmViewer::back_clicked), 0, this);
- _forward_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmViewer::forward_clicked), 0, this);
+ _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this));
+ _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1));
+ _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));
set_film (f);
_film = f;
_frame.reset ();
- _queue.clear ();
-
+
+ _slider->SetValue (0);
+ set_position_text (0);
+
if (!_film) {
return;
}
_player = f->make_player ();
_player->disable_audio ();
- _player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _3));
+ _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));
calculate_sizes ();
- fetch_current_frame_again ();
+ fetch_next_frame ();
}
void
return;
}
- /* Player::video_position is the time after the last frame that we received.
- We want to see it again, so seek back one frame.
+ /* We could do this with a seek and a fetch_next_frame, but this is
+ a shortcut to make it quicker.
*/
- Time p = _player->video_position() - _film->video_frames_to_time (1);
- if (p < 0) {
- p = 0;
+ _got_frame = false;
+ if (!_player->repeat_last_video ()) {
+ fetch_next_frame ();
}
-
- _player->seek (p, true);
- fetch_next_frame ();
+
+ _panel->Refresh ();
+ _panel->Update ();
}
void
-FilmViewer::timer (wxTimerEvent &)
+FilmViewer::timer ()
{
if (!_player) {
return;
fetch_next_frame ();
- if (_film->length()) {
- int const new_slider_position = 4096 * _player->video_position() / _film->length();
+ DCPTime const len = _film->length ();
+
+ if (len) {
+ int const new_slider_position = 4096 * _player->video_position() / len;
if (new_slider_position != _slider->GetValue()) {
_slider->SetValue (new_slider_position);
}
void
-FilmViewer::paint_panel (wxPaintEvent &)
+FilmViewer::paint_panel ()
{
wxPaintDC dc (_panel);
return;
}
- shared_ptr<Image> 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);
void
-FilmViewer::slider_moved (wxScrollEvent &)
+FilmViewer::slider_moved ()
{
if (_film && _player) {
_player->seek (_slider->GetValue() * _film->length() / 4096, false);
Ratio const * container = _film->container ();
- float const panel_ratio = static_cast<float> (_panel_size.width) / _panel_size.height;
+ float const panel_ratio = _panel_size.ratio ();
float const film_ratio = container ? container->ratio () : 1.78;
if (panel_ratio < film_ratio) {
}
void
-FilmViewer::play_clicked (wxCommandEvent &)
+FilmViewer::play_clicked ()
{
check_play_state ();
}
void
FilmViewer::check_play_state ()
{
- if (!_film || _film->dcp_video_frame_rate() == 0) {
+ if (!_film || _film->video_frame_rate() == 0) {
return;
}
if (_play_button->GetValue()) {
- _timer.Start (1000 / _film->dcp_video_frame_rate());
+ _timer.Start (1000 / _film->video_frame_rate());
} else {
_timer.Stop ();
}
}
void
-FilmViewer::process_video (shared_ptr<const Image> image, Time t)
+FilmViewer::process_video (shared_ptr<PlayerImage> image, Eyes eyes, DCPTime t)
{
- if (_got_frame) {
- /* This is an additional frame emitted by a single pass. Store it. */
- _queue.push_front (make_pair (image, t));
+ if (eyes == EYES_RIGHT) {
return;
}
-
- _frame = image;
+
+ /* Going via BGRA here makes the scaler faster then using RGB24 directly (about
+ twice on x86 Linux).
+ */
+ shared_ptr<Image> im = image->image (PIX_FMT_BGRA, true);
+ _frame = im->scale (im->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false);
_got_frame = true;
- double const fps = _film->dcp_video_frame_rate ();
+ set_position_text (t);
+}
+
+void
+FilmViewer::set_position_text (DCPTime t)
+{
+ if (!_film) {
+ _frame_number->SetLabel ("0");
+ _timecode->SetLabel ("0:0:0.0");
+ return;
+ }
+
+ 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));
int const s = floor (w);
w -= s;
int const f = rint (w * fps);
- _timecode->SetLabel (wxString::Format (wxT("%02d:%02d:%02d:%02d"), h, m, s, f));
+ _timecode->SetLabel (wxString::Format (wxT("%02d:%02d:%02d.%02d"), h, m, s, f));
}
/** Ask the player to emit its next frame, then update our display */
_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()));
- }
+ 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 ();
}
void
-FilmViewer::back_clicked (wxCommandEvent &)
+FilmViewer::back_clicked ()
{
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.
*/
+
+ DCPTime p = _player->video_position() - _film->video_frames_to_time (2);
+ if (p < 0) {
+ p = 0;
+ }
- _player->seek (_player->video_position() - _film->video_frames_to_time(2), true);
+ _player->seek (p, true);
fetch_next_frame ();
}
void
-FilmViewer::forward_clicked (wxCommandEvent &)
+FilmViewer::forward_clicked ()
{
if (!_player) {
return;
projects / dcpomatic.git / blobdiff