, _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 ();
throw runtime_error ("could not create FFmpeg output audio stream");
}
+DCPOMATIC_DISABLE_WARNINGS
_video_stream->id = _video_stream_index;
_video_stream->codec = _video_codec_context;
_audio_stream->id = _audio_stream_index;
_audio_stream->codec = _audio_codec_context;
+DCPOMATIC_ENABLE_WARNINGS
if (avcodec_open2 (_video_codec_context, _video_codec, &_video_options) < 0) {
throw runtime_error ("could not open FFmpeg video codec");
throw runtime_error (String::compose ("could not open FFmpeg audio codec (%1)", buffer));
}
- if (avio_open_boost (&_format_context->pb, _output, AVIO_FLAG_WRITE) < 0) {
- throw runtime_error ("could not open FFmpeg output file");
+ r = avio_open_boost (&_format_context->pb, _output, AVIO_FLAG_WRITE);
+ if (r < 0) {
+ throw runtime_error (String::compose("could not open FFmpeg output file %1 (%2)", _output.string(), r));
}
AVDictionary* options = 0;
packet.size = 0;
int got_packet;
+DCPOMATIC_DISABLE_WARNINGS
avcodec_encode_video2 (_video_codec_context, &packet, 0, &got_packet);
+DCPOMATIC_ENABLE_WARNINGS
if (got_packet) {
packet.stream_index = 0;
av_interleaved_write_frame (_format_context, &packet);
packet.data = 0;
packet.size = 0;
+DCPOMATIC_DISABLE_WARNINGS
avcodec_encode_audio2 (_audio_codec_context, &packet, 0, &got_packet);
+DCPOMATIC_ENABLE_WARNINGS
if (got_packet) {
packet.stream_index = 0;
av_interleaved_write_frame (_format_context, &packet);
{
boost::mutex::scoped_lock lm (_pending_images_mutex);
- DCPOMATIC_ASSERT (_pending_images.find(image->data()[0]) != _pending_images.end());
_pending_images[image->data()[0]] = image;
}
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);
packet.size = 0;
int got_packet;
+DCPOMATIC_DISABLE_WARNINGS
if (avcodec_encode_video2 (_video_codec_context, &packet, frame, &got_packet) < 0) {
throw EncodeError ("FFmpeg video encode failed");
}
+DCPOMATIC_ENABLE_WARNINGS
if (got_packet && packet.size) {
packet.stream_index = _video_stream_index;
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;
packet.size = 0;
int got_packet;
+DCPOMATIC_DISABLE_WARNINGS
if (avcodec_encode_audio2 (_audio_codec_context, &packet, frame, &got_packet) < 0) {
throw EncodeError ("FFmpeg audio encode failed");
}
+DCPOMATIC_ENABLE_WARNINGS
if (got_packet && packet.size) {
packet.stream_index = _audio_stream_index;
av_frame_free (&frame);
_pending_audio->trim_start (size);
+ _audio_frames += size;
}
void