Another macOS std::list boost::thread SNAFU.

[dcpomatic.git] / src / lib / ffmpeg_file_encoder.cc

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 7409482aea004f96648faf284e30fa5f5d00e8f7..e9809008098536ee6591904e2047b378683d22d1 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -63,6 +63,7 @@ FFmpegFileEncoder::FFmpegFileEncoder (
        , _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);
 
@@ -74,19 +75,27 @@ FFmpegFileEncoder::FFmpegFileEncoder (
                av_dict_set (&_video_options, "profile", "3", 0);
                av_dict_set (&_video_options, "threads", "auto", 0);
                break;
-       case EXPORT_FORMAT_H264:
+       case EXPORT_FORMAT_H264_AAC:
                _sample_format = AV_SAMPLE_FMT_FLTP;
                _video_codec_name = "libx264";
                _audio_codec_name = "aac";
                av_dict_set_int (&_video_options, "crf", x264_crf, 0);
                break;
+       case EXPORT_FORMAT_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);
        }
 
        setup_video ();
        setup_audio ();
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-       int r = avformat_alloc_output_context2 (&_format_context, av_guess_format("mp4", 0, 0), 0, 0);
+       int r = avformat_alloc_output_context2 (&_format_context, av_guess_format("mov", 0, 0), 0, 0);
 #else
        int r = avformat_alloc_output_context2 (&_format_context, 0, 0, _output.string().c_str());
 #endif
@@ -155,7 +164,8 @@ FFmpegFileEncoder::pixel_format (ExportFormat format)
        switch (format) {
        case EXPORT_FORMAT_PRORES:
                return AV_PIX_FMT_YUV422P10;
-       case EXPORT_FORMAT_H264:
+       case EXPORT_FORMAT_H264_AAC:
+       case EXPORT_FORMAT_H264_PCM:
                return AV_PIX_FMT_YUV420P;
        default:
                DCPOMATIC_ASSERT (false);
@@ -271,7 +281,11 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
        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);
@@ -283,7 +297,8 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
        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);
@@ -355,6 +370,16 @@ FFmpegFileEncoder::audio_frame (int size)
                }
                break;
        }
+       case AV_SAMPLE_FMT_S32:
+       {
+               int32_t* q = reinterpret_cast<int32_t*> (samples);
+               for (int i = 0; i < size; ++i) {
+                       for (int j = 0; j < channels; ++j) {
+                               *q++ = p[j][i] * 2147483647;
+                       }
+               }
+               break;
+       }
        case AV_SAMPLE_FMT_FLTP:
        {
                float* q = reinterpret_cast<float*> (samples);
@@ -368,6 +393,9 @@ FFmpegFileEncoder::audio_frame (int size)
                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;
@@ -388,6 +416,7 @@ FFmpegFileEncoder::audio_frame (int size)
        av_frame_free (&frame);
 
        _pending_audio->trim_start (size);
+       _audio_frames += size;
 }
 
 void
@@ -405,5 +434,8 @@ FFmpegFileEncoder::buffer_free (void* opaque, uint8_t* data)
 void
 FFmpegFileEncoder::buffer_free2 (uint8_t* data)
 {
-       _pending_images.erase (data);
+       boost::mutex::scoped_lock lm (_pending_images_mutex);
+       if (_pending_images.find(data) != _pending_images.end()) {
+               _pending_images.erase (data);
+       }
 }