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);
_pixel_format = pixel_format (format);
switch (format) {
- case ExportFormat::PRORES:
+ case ExportFormat::PRORES_4444:
+ _sample_format = AV_SAMPLE_FMT_S16;
+ _video_codec_name = "prores_ks";
+ _audio_codec_name = "pcm_s16le";
+ av_dict_set(&_video_options, "profile", "4", 0);
+ av_dict_set(&_video_options, "threads", "auto", 0);
+ break;
+ case ExportFormat::PRORES_HQ:
_sample_format = AV_SAMPLE_FMT_S16;
_video_codec_name = "prores_ks";
_audio_codec_name = "pcm_s16le";
_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);
}
{
_audio_streams.clear ();
avcodec_close (_video_codec_context);
+ avio_close (_format_context->pb);
avformat_free_context (_format_context);
}
FFmpegFileEncoder::pixel_format (ExportFormat format)
{
switch (format) {
- case ExportFormat::PRORES:
+ case ExportFormat::PRORES_4444:
+ return AV_PIX_FMT_YUV444P10;
+ case ExportFormat::PRORES_HQ:
return AV_PIX_FMT_YUV422P10;
case ExportFormat::H264_AAC:
- case ExportFormat::H264_PCM:
return AV_PIX_FMT_YUV420P;
default:
DCPOMATIC_ASSERT (false);
_video_codec_context->flags |= AV_CODEC_FLAG_QSCALE | AV_CODEC_FLAG_GLOBAL_HEADER;
if (avcodec_open2 (_video_codec_context, _video_codec, &_video_options) < 0) {
- throw EncodeError (N_("avcodec_open"), N_("FFmpegFileEncoder::setup_video"));
+ throw EncodeError(N_("avcodec_open2"), N_("FFmpegFileEncoder::setup_video"));
}
_video_stream = avformat_new_stream (_format_context, _video_codec);
{
/* 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,
false
);
auto frame = av_frame_alloc ();
DCPOMATIC_ASSERT (frame);
- {
- boost::mutex::scoped_lock lm (_pending_images_mutex);
- _pending_images[image->data()[0]] = image;
- }
-
for (int i = 0; i < 3; ++i) {
- auto buffer = av_buffer_create(image->data()[i], image->stride()[i] * image->size().height, &buffer_free, this, 0);
+ auto buffer = _pending_images.create_buffer(image, i);
frame->buf[i] = av_buffer_ref (buffer);
frame->data[i] = buffer->data;
frame->linesize[i] = image->stride()[i];
{
}
-
-
-void
-FFmpegFileEncoder::buffer_free (void* opaque, uint8_t* data)
-{
- reinterpret_cast<FFmpegFileEncoder*>(opaque)->buffer_free2(data);
-}
-
-
-void
-FFmpegFileEncoder::buffer_free2 (uint8_t* data)
-{
- boost::mutex::scoped_lock lm (_pending_images_mutex);
- if (_pending_images.find(data) != _pending_images.end()) {
- _pending_images.erase (data);
- }
-}