projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up test film naming.
[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 3fdefcb38ccd39a1c26b6ca9d018a0869e3dc2aa..69d445b09c62cb73d85f47c6e32a1672363a686c 100644
(file)
--- a/
src/lib/j2k_wav_encoder.h
+++ b/
src/lib/j2k_wav_encoder.h
@@
-39,6
+39,7
@@
class DCPVideoFrame;
class Image;
class Log;
class Subtitle;
class Image;
class Log;
class Subtitle;
+class AudioBuffers;
/** @class J2KWAVEncoder
* @brief An encoder which writes JPEG2000 and WAV files.
/** @class J2KWAVEncoder
* @brief An encoder which writes JPEG2000 and WAV files.
@@
-49,14
+50,14
@@
public:
J2KWAVEncoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Log *);
~J2KWAVEncoder ();
J2KWAVEncoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Log *);
~J2KWAVEncoder ();
- void process_begin (int64_t audio_channel_layout
, AVSampleFormat audio_sample_format
);
+ void process_begin (int64_t audio_channel_layout);
void process_video (boost::shared_ptr<Image>, int, boost::shared_ptr<Subtitle>);
void process_video (boost::shared_ptr<Image>, int, boost::shared_ptr<Subtitle>);
- void process_audio (
float**, int
);
+ void process_audio (
boost::shared_ptr<const AudioBuffers>
);
void process_end ();
private:
void process_end ();
private:
- void write_audio (
float** data, int frames
);
+ void write_audio (
boost::shared_ptr<const AudioBuffers> audio
);
void encoder_thread (ServerDescription *);
void close_sound_files ();
void terminate_worker_threads ();
void encoder_thread (ServerDescription *);
void close_sound_files ();
void terminate_worker_threads ();
@@
-66,6
+67,7
@@
private:
#endif
std::vector<SNDFILE*> _sound_files;
#endif
std::vector<SNDFILE*> _sound_files;
+ int64_t _audio_frames_written;
bool _process_end;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
bool _process_end;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;