Tidy up resource management of FFmpegFileEncoders so that they

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

diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index 803125bd3cf677f487a0fd70f9134083fea6e0db..e4ae04a78902b8f6161bd72dada0f3ee2312b7f4 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.h
+++ b/src/lib/ffmpeg_file_encoder.h
@@ -29,8 +29,9 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
+#include <boost/noncopyable.hpp>
 
-class FFmpegFileEncoder
+class FFmpegFileEncoder : public boost::noncopyable
 {
 public:
        FFmpegFileEncoder (
@@ -38,18 +39,21 @@ public:
                int video_frame_rate,
                int audio_frame_rate,
                int channels,
-               boost::shared_ptr<Log> log,
                ExportFormat,
                int x264_crf,
                boost::filesystem::path output
                );
 
+       ~FFmpegFileEncoder ();
+
        void video (boost::shared_ptr<PlayerVideo>, DCPTime);
        void audio (boost::shared_ptr<AudioBuffers>);
        void subtitle (PlayerText, DCPTimePeriod);
 
        void flush ();
 
+       static AVPixelFormat pixel_format (ExportFormat format);
+
 private:
        void setup_video ();
        void setup_audio ();
@@ -77,7 +81,6 @@ private:
        dcp::Size _video_frame_size;
        int _video_frame_rate;
        int _audio_frame_rate;
-       boost::shared_ptr<Log> _log;
 
        boost::shared_ptr<AudioBuffers> _pending_audio;
 
@@ -85,6 +88,7 @@ private:
            their data have been passed to FFmpeg.
        */
        std::map<uint8_t*, boost::shared_ptr<const Image> > _pending_images;
+       boost::mutex _pending_images_mutex;
 
        static int _video_stream_index;
        static int _audio_stream_index;