_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);
auto frame = av_frame_alloc ();
DCPOMATIC_ASSERT (frame);
- {
- boost::mutex::scoped_lock lm (_pending_images_mutex);
- auto key = image->data()[0];
- auto iter = _pending_images.find(key);
- if (iter != _pending_images.end()) {
- iter->second.second++;
- } else {
- _pending_images[key] = { image, 1 };
- }
- }
-
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);
- auto iter = _pending_images.find(data);
- if (iter != _pending_images.end()) {
- iter->second.second--;
- if (iter->second.second == 0) {
- _pending_images.erase(data);
- }
- }
-}