-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
#include <iomanip>
#include <wx/tglbtn.h>
#include "lib/film.h"
-#include "lib/container.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"
using std::string;
using std::pair;
+using std::min;
using std::max;
using std::cout;
using std::list;
, _frame (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);
+#endif
+
#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9
_panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
#endif
case Film::WITH_SUBTITLES:
case Film::SUBTITLE_OFFSET:
case Film::SUBTITLE_SCALE:
+ update_from_decoder ();
raw_to_display ();
_panel->Refresh ();
_panel->Update ();
_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));
+ _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));
return;
}
- _player->seek (_player->position ());
+ _player->seek (_player->video_position() - _film->video_frames_to_time (1));
get_frame ();
_panel->Refresh ();
_panel->Update ();
return;
}
- _panel->Refresh ();
- _panel->Update ();
-
get_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 ();
}
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);
- }
-
- wxImage frame (_film_size.width, _film_size.height, _display_frame->data()[0], true);
+ wxImage frame (_out_size.width, _out_size.height, _display_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 ());
}
/* Get a compacted image as we have to feed it to wxWidgets */
- _display_frame = _raw_frame->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.
- */
-
- /* XXX */
- Size const cropped_size = _raw_frame->size ();//_film->cropped_size (_raw_frame->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 ();
- }
+ _display_frame.reset (new SimpleImage (_raw_frame, false));
}
void
return;
}
- Container const * container = _film->container ();
+ Ratio const * container = _film->container ();
float const panel_ratio = static_cast<float> (_panel_size.width) / _panel_size.height;
float const film_ratio = container ? container->ratio () : 1.78;
_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<float> (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);
+ update_from_decoder ();
}
void
}
void
-FilmViewer::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub, Time t)
+FilmViewer::process_video (shared_ptr<const Image> image, bool, Time t)
{
_raw_frame = image;
- _raw_sub = sub;
raw_to_display ();
_got_frame = true;
double const fps = _film->dcp_video_frame_rate ();
- _frame->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps / TIME_HZ))));
+ /* 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));
double w = static_cast<double>(t) / TIME_HZ;
int const h = (w / 3600);
/* Force an update to our frame */
wxScrollEvent ev;
slider_moved (ev);
- } else if (p == VideoContentProperty::VIDEO_CROP) {
+ } else if (p == VideoContentProperty::VIDEO_CROP || p == VideoContentProperty::VIDEO_RATIO) {
update_from_decoder ();
}
}
return;
}
- _player->seek_forward ();
get_frame ();
_panel->Refresh ();
_panel->Update ();
projects / dcpomatic.git / blobdiff