From f385ef03e5ea27519a31c0839447735a7fba0602 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 14:19:50 +0100 Subject: Various stuff; mostly change to decoder scaling and adding subtitle; scaling test. --- src/lib/encoder.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/lib/encoder.h') diff --git a/src/lib/encoder.h b/src/lib/encoder.h index 6815fa6f6..8f724525c 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -40,7 +40,6 @@ extern "C" { #include "audio_sink.h" class Image; -class Subtitle; class AudioBuffers; class Film; class ServerDescription; @@ -52,7 +51,7 @@ class Job; /** @class Encoder * @brief Encoder to J2K and WAV for DCP. * - * Video is supplied to process_video as YUV frames, and audio + * Video is supplied to process_video as RGB frames, and audio * is supplied as uncompressed PCM in blocks of various sizes. */ @@ -68,9 +67,8 @@ public: /** Call with a frame of video. * @param i Video frame image. * @param same true if i is the same as the last time we were called. - * @param s A subtitle that should be on this frame, or 0. */ - void process_video (boost::shared_ptr i, bool same, boost::shared_ptr s, Time); + void process_video (boost::shared_ptr i, bool same, Time); /** Call with some audio data */ void process_audio (boost::shared_ptr, Time); -- cgit v1.2.3