Various more hacks.

1 files changed, 51 insertions, 3 deletions

diff --git a/src/lib/black_decoder.cc b/src/lib/black_decoder.cc
index ef7458711..482cd2ce1 100644
--- a/src/lib/black_decoder.cc
+++ b/src/lib/black_decoder.cc
@@ -1,7 +1,26 @@
+/*
+    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include "black_decoder.h"
 
-BlackDecoder::BlackDecoder (shared_ptr<NullContent> c)
-	: Decoder (c)
+BlackDecoder::BlackDecoder (shared_ptr<Film> f, shared_ptr<NullContent> c)
+	: VideoDecoder (f, c)
 {
 
 }
@@ -9,5 +28,34 @@ BlackDecoder::BlackDecoder (shared_ptr<NullContent> c)
 void
 BlackDecoder::pass ()
 {
-	
+	if (!_image) {
+		_image.reset (new SimpleImage (AV_PIX_FMT_RGB24, video_size ()));
+		_image->make_black ();
+		video (_image, false, _next_video);
+	} else {
+		video (_image, true, _next_video);
+	}
+}
+
+float
+BlackDecoder::video_frame_rate () const
+{
+	boost::shared_ptr<const Film> f = _film.lock ();
+	if (!f) {
+		return 24;
+	}
+
+	return f->dcp_video_frame_rate ();
+}
+
+ContentVideoFrame
+BlackDecoder::video_length () const
+{
+	return _video_content->length() * video_frame_rate() / TIME_HZ;
+}
+
+Time
+BlackDecoder::next () const
+{
+	return _next_video;
 }