Remove now-unused video_frames_enqueued().

4 files changed, 1 insertions, 26 deletions

diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index e35936b9a..bc4030531 100644
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -281,8 +281,6 @@ J2KEncoder::encode(shared_ptr<PlayerVideo> pv, DCPTime time)
 	}
 #endif
 
-	VideoEncoder::encode(pv, time);
-
 	_waker.nudge();
 
 	size_t threads = 0;
diff --git a/src/lib/mpeg2_encoder.cc b/src/lib/mpeg2_encoder.cc
index 38388431d..d7c570988 100644
--- a/src/lib/mpeg2_encoder.cc
+++ b/src/lib/mpeg2_encoder.cc
@@ -41,8 +41,6 @@ MPEG2Encoder::MPEG2Encoder(shared_ptr<const Film> film, Writer& writer)
 void
 MPEG2Encoder::encode(shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time)
 {
-	VideoEncoder::encode(pv, time);
-
 	auto image = pv->image(force(AV_PIX_FMT_YUV420P), VideoRange::VIDEO, false);
 
 	dcp::FFmpegImage ffmpeg_image(time.get() * _film->video_frame_rate() / dcpomatic::DCPTime::HZ);
diff --git a/src/lib/video_encoder.cc b/src/lib/video_encoder.cc
index 13c9fda46..060099984 100644
--- a/src/lib/video_encoder.cc
+++ b/src/lib/video_encoder.cc
@@ -35,25 +35,6 @@ VideoEncoder::VideoEncoder(shared_ptr<const Film> film, Writer& writer)
 }
 
 
-void
-VideoEncoder::encode(shared_ptr<PlayerVideo>, dcpomatic::DCPTime time)
-{
-	_last_player_video_time = time;
-}
-
-
-/** @return Number of video frames that have been queued for encoding */
-int
-VideoEncoder::video_frames_enqueued() const
-{
-	if (!_last_player_video_time) {
-		return 0;
-	}
-
-	return _last_player_video_time->frames_floor(_film->video_frame_rate());
-}
-
-
 int
 VideoEncoder::video_frames_encoded() const
 {
diff --git a/src/lib/video_encoder.h b/src/lib/video_encoder.h
index 7a9813ba8..593bc79d6 100644
--- a/src/lib/video_encoder.h
+++ b/src/lib/video_encoder.h
@@ -45,7 +45,7 @@ public:
 	virtual void begin() {}
 
 	/** Called to pass a bit of video to be encoded as the next DCP frame */
-	virtual void encode(std::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
+	virtual void encode(std::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time) = 0;
 
 	virtual void pause() = 0;
 	virtual void resume() = 0;
@@ -53,7 +53,6 @@ public:
 	/** Called when a processing run has finished */
 	virtual void end() = 0;
 
-	int video_frames_enqueued() const;
 	int video_frames_encoded() const;
 	boost::optional<float> current_encoding_rate() const;
 
@@ -62,7 +61,6 @@ protected:
 	std::shared_ptr<const Film> _film;
 	Writer& _writer;
 	EventHistory _history;
-	boost::optional<dcpomatic::DCPTime> _last_player_video_time;
 };