Split Options into encode / decode.

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

diff --git a/src/lib/j2k_wav_encoder.h b/src/lib/j2k_wav_encoder.h
index 3f01ac48099a0bfceac5f58d4d88074c16f5835e..064f4221ed648ff98ba4189f75075916ca1d88d0 100644 (file)
--- a/src/lib/j2k_wav_encoder.h
+++ b/src/lib/j2k_wav_encoder.h
@@ -38,6 +38,8 @@ class ServerDescription;
 class DCPVideoFrame;
 class Image;
 class Log;
+class Subtitle;
+class AudioBuffers;
 
 /** @class J2KWAVEncoder
  *  @brief An encoder which writes JPEG2000 and WAV files.
@@ -45,19 +47,18 @@ class Log;
 class J2KWAVEncoder : public Encoder
 {
 public:
-       J2KWAVEncoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Log *);
+       J2KWAVEncoder (boost::shared_ptr<const Film>, boost::shared_ptr<const EncodeOptions>);
        ~J2KWAVEncoder ();
 
-       void process_begin (int64_t audio_channel_layout, AVSampleFormat audio_sample_format);
-       void process_video (boost::shared_ptr<Image>, int);
-       void process_audio (uint8_t *, int);
+       void process_begin ();
        void process_end ();
 
 private:
 
-       int target_sample_rate () const;
-
-       void write_audio (uint8_t* data, int size);
+       void do_process_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
+       void do_process_audio (boost::shared_ptr<AudioBuffers>);
+       
+       void write_audio (boost::shared_ptr<const AudioBuffers> audio);
        void encoder_thread (ServerDescription *);
        void close_sound_files ();
        void terminate_worker_threads ();
@@ -67,8 +68,7 @@ private:
 #endif 
 
        std::vector<SNDFILE*> _sound_files;
-       int _deinterleave_buffer_size;
-       uint8_t* _deinterleave_buffer;
+       int64_t _audio_frames_written;
 
        bool _process_end;
        std::list<boost::shared_ptr<DCPVideoFrame> > _queue;