return out;
}
-FFmpegEncoder::FFmpegEncoder (shared_ptr<const Film> film, weak_ptr<Job> job, boost::filesystem::path output, Format format)
+FFmpegEncoder::FFmpegEncoder (shared_ptr<const Film> film, weak_ptr<Job> job, boost::filesystem::path output, Format format, bool mixdown_to_stereo)
: Encoder (film, job)
, _video_options (0)
, _history (1000)
, _output (output)
- , _pending_audio (new AudioBuffers (film->audio_channels(), 0))
{
switch (format) {
case FORMAT_PRORES:
_player->set_always_burn_subtitles (true);
_player->set_play_referenced ();
+
+ int const ch = film->audio_channels ();
+
+ if (mixdown_to_stereo) {
+ _audio_mapping = AudioMapping (ch, 2);
+ float const overall_gain = 2 / (4 + sqrt(2));
+ float const minus_3dB = 1 / sqrt(2);
+ _audio_mapping.set (dcp::LEFT, 0, overall_gain);
+ _audio_mapping.set (dcp::RIGHT, 1, overall_gain);
+ _audio_mapping.set (dcp::CENTRE, 0, overall_gain * minus_3dB);
+ _audio_mapping.set (dcp::CENTRE, 1, overall_gain * minus_3dB);
+ _audio_mapping.set (dcp::LS, 0, overall_gain);
+ _audio_mapping.set (dcp::RS, 1, overall_gain);
+ _pending_audio.reset (new AudioBuffers (2, 0));
+ } else {
+ _audio_mapping = AudioMapping (ch, ch);
+ _pending_audio.reset (new AudioBuffers (ch, 0));
+ for (int i = 0; i < ch; ++i) {
+ _audio_mapping.set (i, i, 1);
+ }
+ }
}
void
_audio_codec_context->bit_rate = 256 * 1024;
_audio_codec_context->sample_fmt = _sample_format;
_audio_codec_context->sample_rate = _film->audio_frame_rate ();
- _audio_codec_context->channel_layout = av_get_default_channel_layout (_film->audio_channels ());
- _audio_codec_context->channels = _film->audio_channels ();
+ _audio_codec_context->channel_layout = av_get_default_channel_layout (_audio_mapping.output_channels ());
+ _audio_codec_context->channels = _audio_mapping.output_channels ();
}
void
packet.data = 0;
packet.size = 0;
- avcodec_encode_audio2 (_video_codec_context, &packet, 0, &got_packet);
+ avcodec_encode_audio2 (_audio_codec_context, &packet, 0, &got_packet);
if (got_packet) {
packet.stream_index = 0;
av_interleaved_write_frame (_format_context, &packet);
DCPOMATIC_ASSERT (frame);
for (int i = 0; i < 3; ++i) {
- size_t const size = image->stride()[i] * image->size().height;
+ size_t const size = image->stride()[i] * image->sample_size(i).height;
AVBufferRef* buffer = av_buffer_alloc (size);
DCPOMATIC_ASSERT (buffer);
/* XXX: inefficient */
}
}
+/** Called when the player gives us some audio */
void
FFmpegEncoder::audio (shared_ptr<AudioBuffers> audio, DCPTime)
{
- _pending_audio->append (audio);
+ _pending_audio->append (remap (audio, _audio_mapping.output_channels(), _audio_mapping));
- while (_pending_audio->frames() >= _audio_codec_context->frame_size) {
- audio_frame (_audio_codec_context->frame_size);
+ int frame_size = _audio_codec_context->frame_size;
+ if (frame_size == 0) {
+ /* codec has AV_CODEC_CAP_VARIABLE_FRAME_SIZE */
+ frame_size = 2000;
+ }
+
+ while (_pending_audio->frames() >= frame_size) {
+ audio_frame (frame_size);
}
}
void
FFmpegEncoder::audio_frame (int size)
{
+ DCPOMATIC_ASSERT (size);
+
AVFrame* frame = av_frame_alloc ();
DCPOMATIC_ASSERT (frame);
- int const channels = _audio_codec_context->channels;
+ int const channels = _pending_audio->channels();
+ DCPOMATIC_ASSERT (channels);
int const buffer_size = av_samples_get_buffer_size (0, channels, size, _audio_codec_context->sample_fmt, 0);
DCPOMATIC_ASSERT (buffer_size >= 0);
{
int16_t* q = reinterpret_cast<int16_t*> (samples);
for (int i = 0; i < size; ++i) {
- for (int j = 0; j < channels; ++i) {
+ for (int j = 0; j < channels; ++j) {
*q++ = p[j][i] * 32767;
}
}