diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-14 15:07:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-14 15:07:58 +0100 |
| commit | 0b6f2d7b04819711228ed5fbc5d299b58cef997e (patch) | |
| tree | 6acc37024cadbcc50755e8cc7c5075749893e231 /src/lib/player.cc | |
| parent | 2a72bebc04cc5d0b34c81840f10bd1387955a7a4 (diff) | |
Clean up of 3D->2D conversion.
It makes slightly more sense to discard 2D in the Transcoder
rather than the Encoder. Unfortunately this requires quite
invasive changes, mainly to remove Encoder::_position and instead
derive this information from the PlayerVideo that is being handled.
This is also nicer than before, I think.
A notable change is that in player.cc; using time rather than
content_video_to_dcp(). This means we are assuming that the decoder
returns video at the time we ask it to, rather than checking
what it has returned. I can't think of a problem with this (yet).
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index c70ac8852..30313d39d 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -374,7 +374,7 @@ Player::get_video (DCPTime time, bool accurate) shared_ptr<PlayerVideo> ( new PlayerVideo ( i->image, - content_video_to_dcp (piece, i->frame.index()), + time, piece->content->video->crop (), piece->content->video->fade (i->frame.index()), image_size, |