projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change how video timing is done.
[dcpomatic.git]
/
src
/
lib
/
player_video.cc
diff --git
a/src/lib/player_video.cc
b/src/lib/player_video.cc
index 081147434ad4846bf751cf9340ff7859da8587ce..b020ca1cd8172ba1cd5193c5658d42c621166171 100644
(file)
--- a/
src/lib/player_video.cc
+++ b/
src/lib/player_video.cc
@@
-45,6
+45,7
@@
using std::weak_ptr;
using boost::optional;
using dcp::Data;
using dcp::raw_convert;
using boost::optional;
using dcp::Data;
using dcp::raw_convert;
+using namespace dcpomatic;
PlayerVideo::PlayerVideo (
PlayerVideo::PlayerVideo (
@@
-58,7
+59,7
@@
PlayerVideo::PlayerVideo (
optional<ColourConversion> colour_conversion,
VideoRange video_range,
weak_ptr<Content> content,
optional<ColourConversion> colour_conversion,
VideoRange video_range,
weak_ptr<Content> content,
- optional<
Frame> video_fra
me,
+ optional<
ContentTime> video_ti
me,
bool error
)
: _in (in)
bool error
)
: _in (in)
@@
-71,7
+72,7
@@
PlayerVideo::PlayerVideo (
, _colour_conversion (colour_conversion)
, _video_range (video_range)
, _content (content)
, _colour_conversion (colour_conversion)
, _video_range (video_range)
, _content (content)
- , _video_
frame (video_fra
me)
+ , _video_
time(video_ti
me)
, _error (error)
{
, _error (error)
{
@@
-298,7
+299,7
@@
PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
AVPixelFormat
AVPixelFormat
-PlayerVideo::force (AVPixelFormat
, AVPixelFormat
force_to)
+PlayerVideo::force (AVPixelFormat force_to)
{
return force_to;
}
{
return force_to;
}
@@
-343,7
+344,7
@@
PlayerVideo::shallow_copy () const
_colour_conversion,
_video_range,
_content,
_colour_conversion,
_video_range,
_content,
- _video_
fra
me,
+ _video_
ti
me,
_error
);
}
_error
);
}
@@
-356,12
+357,12
@@
bool
PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
{
auto content = _content.lock();
PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
{
auto content = _content.lock();
- if (!content || !_video_
fra
me) {
+ if (!content || !_video_
ti
me) {
return false;
}
_crop = content->video->actual_crop();
return false;
}
_crop = content->video->actual_crop();
- _fade = content->video->fade(film, _video_
fra
me.get());
+ _fade = content->video->fade(film, _video_
ti
me.get());
_inter_size = scale_for_display(
content->video->scaled_size(film->frame_size()),
player_video_container_size,
_inter_size = scale_for_display(
content->video->scaled_size(film->frame_size()),
player_video_container_size,