, _video_frame_size (video_frame_size)
, _video_frame_rate (video_frame_rate)
, _audio_frame_rate (audio_frame_rate)
+ , _audio_frames (0)
{
_pixel_format = pixel_format (format);
_audio_codec_name = "pcm_s24le";
av_dict_set_int (&_video_options, "crf", x264_crf, 0);
break;
+ default:
+ DCPOMATIC_ASSERT (false);
}
setup_video ();
AVFrame* frame = av_frame_alloc ();
DCPOMATIC_ASSERT (frame);
- _pending_images[image->data()[0]] = image;
+ {
+ boost::mutex::scoped_lock lm (_pending_images_mutex);
+ _pending_images[image->data()[0]] = image;
+ }
+
for (int i = 0; i < 3; ++i) {
AVBufferRef* buffer = av_buffer_create(image->data()[i], image->stride()[i] * image->size().height, &buffer_free, this, 0);
frame->buf[i] = av_buffer_ref (buffer);
frame->width = image->size().width;
frame->height = image->size().height;
frame->format = _pixel_format;
- frame->pts = time.seconds() / av_q2d (_video_stream->time_base);
+ DCPOMATIC_ASSERT (_video_stream->time_base.num == 1);
+ frame->pts = time.get() * _video_stream->time_base.den / DCPTime::HZ;
AVPacket packet;
av_init_packet (&packet);
DCPOMATIC_ASSERT (false);
}
+ DCPOMATIC_ASSERT (_audio_stream->time_base.num == 1);
+ frame->pts = _audio_frames * _audio_stream->time_base.den / _audio_frame_rate;
+
AVPacket packet;
av_init_packet (&packet);
packet.data = 0;
av_frame_free (&frame);
_pending_audio->trim_start (size);
+ _audio_frames += size;
}
void
void
FFmpegFileEncoder::buffer_free2 (uint8_t* data)
{
- /* XXX: does this need a lock to prevent cross-thread access to _pending_images? */
+ boost::mutex::scoped_lock lm (_pending_images_mutex);
if (_pending_images.find(data) != _pending_images.end()) {
_pending_images.erase (data);
}