From 0b6f2d7b04819711228ed5fbc5d299b58cef997e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 14 Jun 2016 15:07:58 +0100 Subject: 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). --- src/lib/transcoder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/transcoder.h') diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h index 4256a5c91..14f363661 100644 --- a/src/lib/transcoder.h +++ b/src/lib/transcoder.h @@ -36,7 +36,7 @@ public: void go (); float current_encoding_rate () const; - int video_frames_out () const; + int video_frames_enqueued () const; /** @return true if we are in the process of calling Encoder::process_end */ bool finishing () const { -- cgit v1.2.3