Reword again: Text -> Caption and Plain -> Text.

[dcpomatic.git] / src / lib / ffmpeg_encoder.h

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 5e6dcecf75d1ee556314d9ff8cddea1f49d12752..35fd850640a795ec0b22881a8ab107172558eacf 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -53,14 +53,17 @@ public:
 
 private:
        void video (boost::shared_ptr<PlayerVideo>, DCPTime);
-       void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-       void subtitle (PlayerSubtitles, DCPTimePeriod);
+       void audio (boost::shared_ptr<AudioBuffers>);
+       void subtitle (PlayerCaption, DCPTimePeriod);
 
        void setup_video ();
        void setup_audio ();
 
        void audio_frame (int size);
 
+       static void buffer_free(void* opaque, uint8_t* data);
+       void buffer_free2(uint8_t* data);
+
        AVCodec* _video_codec;
        AVCodecContext* _video_codec_context;
        AVCodec* _audio_codec;
@@ -90,6 +93,11 @@ private:
 
        boost::shared_ptr<Butler> _butler;
 
+       /** Store of shared_ptr<Image> to keep them alive whilst raw pointers into
+           their data have been passed to FFmpeg.
+       */
+       std::map<uint8_t*, boost::shared_ptr<const Image> > _pending_images;
+
        static int _video_stream_index;
        static int _audio_stream_index;
 };