projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master and multifarious hackery.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.cc
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index e742a3e41b7ce9757f476fcd95abb1e4e7ccc97b..4b1fb442e12ba802e42eb32a70affcd81dfd68c6 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-1,3
+1,5
@@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
@@
-25,6
+27,7
@@
#include <iomanip>
#include <wx/tglbtn.h>
#include "lib/film.h"
#include <iomanip>
#include <wx/tglbtn.h>
#include "lib/film.h"
+#include "lib/container.h"
#include "lib/format.h"
#include "lib/util.h"
#include "lib/job_manager.h"
#include "lib/format.h"
#include "lib/util.h"
#include "lib/job_manager.h"
@@
-113,7
+116,7
@@
void
FilmViewer::film_changed (Film::Property p)
{
switch (p) {
FilmViewer::film_changed (Film::Property p)
{
switch (p) {
- case Film::
FORMAT
:
+ case Film::
CONTAINER
:
calculate_sizes ();
update_from_raw ();
break;
calculate_sizes ();
update_from_raw ();
break;
@@
-132,8
+135,6
@@
FilmViewer::film_changed (Film::Property p)
_panel->Update ();
break;
case Film::SCALER:
_panel->Update ();
break;
case Film::SCALER:
- case Film::FILTERS:
- case Film::CROP:
update_from_decoder ();
break;
default:
update_from_decoder ();
break;
default:
@@
-171,7
+172,7
@@
FilmViewer::set_film (shared_ptr<Film> f)
_film->ContentChanged.connect (boost::bind (&FilmViewer::film_content_changed, this, _1, _2));
film_changed (Film::CONTENT);
_film->ContentChanged.connect (boost::bind (&FilmViewer::film_content_changed, this, _1, _2));
film_changed (Film::CONTENT);
- film_changed (Film::
FORMAT
);
+ film_changed (Film::
CONTAINER
);
film_changed (Film::WITH_SUBTITLES);
film_changed (Film::SUBTITLE_OFFSET);
film_changed (Film::SUBTITLE_SCALE);
film_changed (Film::WITH_SUBTITLES);
film_changed (Film::SUBTITLE_OFFSET);
film_changed (Film::SUBTITLE_SCALE);
@@
-180,10
+181,11
@@
FilmViewer::set_film (shared_ptr<Film> f)
void
FilmViewer::update_from_decoder ()
{
void
FilmViewer::update_from_decoder ()
{
- if (!_player
|| _player->seek (_player->last_video_time ())
) {
+ if (!_player) {
return;
}
return;
}
+ _player->seek (_player->position ());
get_frame ();
_panel->Refresh ();
_panel->Update ();
get_frame ();
_panel->Refresh ();
_panel->Update ();
@@
-201,8
+203,8
@@
FilmViewer::timer (wxTimerEvent &)
get_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->
position() / _film->length(
);
if (new_slider_position != _slider->GetValue()) {
_slider->SetValue (new_slider_position);
}
if (new_slider_position != _slider->GetValue()) {
_slider->SetValue (new_slider_position);
}
@@
-258,12
+260,10
@@
FilmViewer::paint_panel (wxPaintEvent &)
void
FilmViewer::slider_moved (wxScrollEvent &)
{
void
FilmViewer::slider_moved (wxScrollEvent &)
{
- if (!_film || !_player) {
- return;
- }
-
- if (_player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()))) {
- return;
+ cout << "slider " << _slider->GetValue() << " " << _film->length() << "\n";
+
+ if (_film && _player) {
+ _player->seek (_slider->GetValue() * _film->length() / 4096);
}
get_frame ();
}
get_frame ();
@@
-300,15
+300,8
@@
FilmViewer::raw_to_display ()
return;
}
return;
}
- shared_ptr<Image> input = _raw_frame;
-
- pair<string, string> 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 */
/* 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);
+ _display_frame =
_raw_frame
->scale_and_convert_to_rgb (_film_size, 0, _film->scaler(), false);
if (_raw_sub) {
if (_raw_sub) {
@@
-316,7
+309,8
@@
FilmViewer::raw_to_display ()
when working out the scale that we are applying.
*/
when working out the scale that we are applying.
*/
- Size const cropped_size = _film->cropped_size (_film->video_size ());
+ /* 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,
Rect tx = subtitle_transformed_area (
float (_film_size.width) / cropped_size.width,
@@
-339,10
+333,10
@@
FilmViewer::calculate_sizes ()
return;
}
return;
}
-
Format const * format = _film->format
();
+
Container const * container = _film->container
();
float const panel_ratio = static_cast<float> (_panel_size.width) / _panel_size.height;
float const panel_ratio = static_cast<float> (_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 */
if (panel_ratio < film_ratio) {
/* panel is less widscreen than the film; clamp width */
@@
-358,9
+352,9
@@
FilmViewer::calculate_sizes ()
of our _display_frame.
*/
_display_frame_x = 0;
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;
-
}
+
//
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;
_film_size = _out_size;
_film_size.width -= _display_frame_x * 2;
@@
-380,19
+374,19
@@
FilmViewer::play_clicked (wxCommandEvent &)
void
FilmViewer::check_play_state ()
{
void
FilmViewer::check_play_state ()
{
- if (!_film) {
+ if (!_film
|| _film->dcp_video_frame_rate() == 0
) {
return;
}
if (_play_button->GetValue()) {
return;
}
if (_play_button->GetValue()) {
- _timer.Start (1000 / _film->video_frame_rate());
+ _timer.Start (1000 / _film->
dcp_
video_frame_rate());
} else {
_timer.Stop ();
}
}
void
} else {
_timer.Stop ();
}
}
void
-FilmViewer::process_video (shared_ptr<
Image> image, bool, shared_ptr<Subtitle> sub, doubl
e t)
+FilmViewer::process_video (shared_ptr<
const Image> image, bool, shared_ptr<Subtitle> sub, Tim
e t)
{
_raw_frame = image;
_raw_sub = sub;
{
_raw_frame = image;
_raw_sub = sub;
@@
-401,10
+395,10
@@
FilmViewer::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> s
_got_frame = true;
_got_frame = true;
- double const fps = _film->video_frame_rate ();
- _frame->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps))));
+ double const fps = _film->
dcp_
video_frame_rate ();
+ _frame->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps
/ TIME_HZ
))));
- double w =
t
;
+ double w =
static_cast<double>(t) / TIME_HZ
;
int const h = (w / 3600);
w -= h * 3600;
int const m = (w / 60);
int const h = (w / 3600);
w -= h * 3600;
int const m = (w / 60);
@@
-474,7
+468,9
@@
FilmViewer::film_content_changed (weak_ptr<Content>, int p)
/* Force an update to our frame */
wxScrollEvent ev;
slider_moved (ev);
/* Force an update to our frame */
wxScrollEvent ev;
slider_moved (ev);
- }
+ } else if (p == VideoContentProperty::VIDEO_CROP) {
+ update_from_decoder ();
+ }
}
void
}
void