projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a0614e6
)
Slightly cleaner implementations of Player::dcp_to_content_video and vice versa.
author
Carl Hetherington
<cth@carlh.net>
Tue, 14 Jul 2015 11:46:53 +0000
(12:46 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 14 Jul 2015 11:46:53 +0000
(12:46 +0100)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 83131e2008997588fb2ea1f3b6a9f91f7f71f76d..c551c988603e4f015324f3ed5c44cca038d6dcd6 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-521,18
+521,23
@@
Player::get_audio (DCPTime time, DCPTime length, bool accurate)
Frame
Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
{
Frame
Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
{
+ shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (piece->content);
+
DCPTime s = t - piece->content->position () + piece->content->trim_start ();
s = DCPTime (max (DCPTime::Type (0), s.get ()));
s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
DCPTime s = t - piece->content->position () + piece->content->trim_start ();
s = DCPTime (max (DCPTime::Type (0), s.get ()));
s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
- /* Convert this to the content frame */
- return s.frames (_film->video_frame_rate()) / piece->frc.factor ();
+ return ContentTime (s, piece->frc).frames (vc->video_frame_rate ());
}
DCPTime
Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
{
}
DCPTime
Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
{
- DCPTime t = DCPTime::from_frames (f * piece->frc.factor (), _film->video_frame_rate()) - piece->content->trim_start () + piece->content->position ();
+ shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (piece->content);
+
+ ContentTime const c = ContentTime::from_frames (f, vc->video_frame_rate ());
+ DCPTime t = DCPTime (c, piece->frc) - piece->content->trim_start () + piece->content->position ();
+
if (t < DCPTime ()) {
t = DCPTime ();
}
if (t < DCPTime ()) {
t = DCPTime ();
}