summaryrefslogtreecommitdiff
path: root/src/lib/player_video.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-07-01 15:05:13 +0100
committerCarl Hetherington <cth@carlh.net>2014-07-01 15:05:13 +0100
commit6f071ce94bb7cff1106e2ef6d8eb4363694435f2 (patch)
tree65fa1844ae470bc9011733ecff4f016ba5a4671e /src/lib/player_video.cc
parent15f23b356b757a9697bf1a9ec30c243ab8070404 (diff)
Remove FFmpegDecoder minimal_run and care on seeking, as the VideoDecoder/AudioDecoder has to cope with stuff per-stream anyway.
Diffstat (limited to 'src/lib/player_video.cc')
-rw-r--r--src/lib/player_video.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index f8e4a3e66..3c513848a 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -30,6 +30,7 @@ using dcp::raw_convert;
PlayerVideo::PlayerVideo (
shared_ptr<const ImageProxy> in,
+ DCPTime time,
Crop crop,
dcp::Size inter_size,
dcp::Size out_size,
@@ -39,6 +40,7 @@ PlayerVideo::PlayerVideo (
ColourConversion colour_conversion
)
: _in (in)
+ , _time (time)
, _crop (crop)
, _inter_size (inter_size)
, _out_size (out_size)
@@ -52,6 +54,7 @@ PlayerVideo::PlayerVideo (
PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket, shared_ptr<Log> log)
{
+ _time = DCPTime (node->number_child<DCPTime::Type> ("Time"));
_crop = Crop (node);
_inter_size = dcp::Size (node->number_child<int> ("InterWidth"), node->number_child<int> ("InterHeight"));
@@ -118,6 +121,7 @@ PlayerVideo::image () const
void
PlayerVideo::add_metadata (xmlpp::Node* node) const
{
+ node->add_child("Time")->add_child_text (raw_convert<string> (_time.get ()));
_crop.as_xml (node);
_in->add_metadata (node->add_child ("In"));
node->add_child("InterWidth")->add_child_text (raw_convert<string> (_inter_size.width));