*/
+#include "compose.hpp"
+#include "cross.h"
#include "ffmpeg_encoder.h"
#include "ffmpeg_wrapper.h"
#include "film.h"
+#include "image.h"
#include "job.h"
+#include "log.h"
#include "player.h"
#include "player_video.h"
-#include "log.h"
-#include "image.h"
-#include "cross.h"
-#include "compose.hpp"
+extern "C" {
+#include <libavutil/channel_layout.h>
+}
#include <iostream>
#include "i18n.h"
using std::cout;
using std::make_shared;
-using std::pair;
-using std::runtime_error;
using std::shared_ptr;
using std::string;
-using std::weak_ptr;
using boost::bind;
-using boost::optional;
using namespace dcpomatic;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
return false;
}
- void write (int size, int channel_offset, int channels, float** data, int64_t sample_offset)
+ void write (int size, int channel_offset, int channels, float* const* data, int64_t sample_offset)
{
DCPOMATIC_ASSERT (size);
auto frame = av_frame_alloc ();
DCPOMATIC_ASSERT (frame);
- int const buffer_size = av_samples_get_buffer_size (0, channels, size, _codec_context->sample_fmt, 0);
+ int line_size;
+ int const buffer_size = av_samples_get_buffer_size (&line_size, channels, size, _codec_context->sample_fmt, 0);
DCPOMATIC_ASSERT (buffer_size >= 0);
auto samples = av_malloc (buffer_size);
}
case AV_SAMPLE_FMT_FLTP:
{
- float* q = reinterpret_cast<float*> (samples);
for (int i = 0; i < channels; ++i) {
- memcpy (q, data[i + channel_offset], sizeof(float) * size);
- q += size;
+ memcpy (reinterpret_cast<float*>(static_cast<uint8_t*>(samples) + i * line_size), data[i + channel_offset], sizeof(float) * size);
}
break;
}
_audio_codec_name = "aac";
av_dict_set_int (&_video_options, "crf", x264_crf, 0);
break;
- case ExportFormat::H264_PCM:
- _sample_format = AV_SAMPLE_FMT_S32;
- _video_codec_name = "libx264";
- _audio_codec_name = "pcm_s24le";
- av_dict_set_int (&_video_options, "crf", x264_crf, 0);
- break;
default:
DCPOMATIC_ASSERT (false);
}
throw EncodeError (N_("avformat_write_header"), N_("FFmpegFileEncoder::FFmpegFileEncoder"), r);
}
- _pending_audio.reset (new AudioBuffers(channels, 0));
+ _pending_audio = make_shared<AudioBuffers>(channels, 0);
}
case ExportFormat::PRORES:
return AV_PIX_FMT_YUV422P10;
case ExportFormat::H264_AAC:
- case ExportFormat::H264_PCM:
return AV_PIX_FMT_YUV420P;
default:
DCPOMATIC_ASSERT (false);
{
/* All our output formats are video range at the moment */
auto image = video->image (
- bind (&PlayerVideo::force, _1, _pixel_format),
+ bind (&PlayerVideo::force, _pixel_format),
VideoRange::VIDEO,
- true,
false
);