diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-08-05 18:32:59 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-08-05 21:46:44 +0200 |
| commit | 010a6240453384e35d4aa848af00ed58244fe16d (patch) | |
| tree | dd95b63a5f949fada976d072807fdf4b8e2edc9f /src/lib/ffmpeg_file_encoder.h | |
| parent | 1d73cca7a3adfc4d64a2529e3f6e8c7b6d6cc38d (diff) | |
Allow export with one audio stream per channel.v2.15.95
Diffstat (limited to 'src/lib/ffmpeg_file_encoder.h')
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h index 57f9135fa..1c23d5902 100644 --- a/src/lib/ffmpeg_file_encoder.h +++ b/src/lib/ffmpeg_file_encoder.h @@ -31,6 +31,10 @@ extern "C" { #include <libavformat/avformat.h> } + +class ExportAudioStream; + + class FFmpegFileEncoder { public: @@ -40,6 +44,7 @@ public: int audio_frame_rate, int channels, ExportFormat, + bool audio_stream_per_channel, int x264_crf, boost::filesystem::path output #ifdef DCPOMATIC_VARIANT_SWAROOP @@ -67,11 +72,10 @@ private: AVCodec* _video_codec; AVCodecContext* _video_codec_context; - AVCodec* _audio_codec; - AVCodecContext* _audio_codec_context; + std::vector<boost::shared_ptr<ExportAudioStream> > _audio_streams; + bool _audio_stream_per_channel; AVFormatContext* _format_context; AVStream* _video_stream; - AVStream* _audio_stream; AVPixelFormat _pixel_format; AVSampleFormat _sample_format; AVDictionary* _video_options; @@ -95,7 +99,7 @@ private: boost::mutex _pending_images_mutex; static int _video_stream_index; - static int _audio_stream_index; + static int _audio_stream_index_base; }; #endif |