diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-20 15:40:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-20 20:05:08 +0100 |
| commit | b996eb8276dc4645745540190c9a2f5e2c875c0c (patch) | |
| tree | 0dc0cef257733a52cc347197cb0ed08ae53fe4f4 /src/lib/j2k_wav_encoder.h | |
| parent | a6976df179011056027a99ae210fb28117c36840 (diff) | |
Rework audio to deinterleave straight away and pass data
around as floats. Should simplify things.
Diffstat (limited to 'src/lib/j2k_wav_encoder.h')
| -rw-r--r-- | src/lib/j2k_wav_encoder.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/j2k_wav_encoder.h b/src/lib/j2k_wav_encoder.h index 87068ad3d..3fdefcb38 100644 --- a/src/lib/j2k_wav_encoder.h +++ b/src/lib/j2k_wav_encoder.h @@ -51,12 +51,12 @@ public: void process_begin (int64_t audio_channel_layout, AVSampleFormat audio_sample_format); void process_video (boost::shared_ptr<Image>, int, boost::shared_ptr<Subtitle>); - void process_audio (uint8_t *, int); + void process_audio (float**, int); void process_end (); private: - void write_audio (uint8_t* data, int size); + void write_audio (float** data, int frames); void encoder_thread (ServerDescription *); void close_sound_files (); void terminate_worker_threads (); @@ -66,8 +66,6 @@ private: #endif std::vector<SNDFILE*> _sound_files; - int _deinterleave_buffer_size; - uint8_t* _deinterleave_buffer; bool _process_end; std::list<boost::shared_ptr<DCPVideoFrame> > _queue; |