Tidy up careful_string_filter and add some extra transliterations.

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

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 5db3e31a69f97e90687e652afb2ce19902ef9f6e..d4f0b4b472612bb7ee449bd7b51bad00d81fd9f6 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -108,7 +108,7 @@ FFmpegEncoder::FFmpegEncoder (
        }
 
        _butler = std::make_shared<Butler>(
-               _film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false
+               _film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false
                );
 }
 
@@ -161,7 +161,7 @@ FFmpegEncoder::go ()
 
        auto const video_frame = DCPTime::from_frames (1, _film->video_frame_rate ());
        int const audio_frames = video_frame.frames_round(_film->audio_frame_rate());
-       float* interleaved = new float[_output_audio_channels * audio_frames];
+       std::vector<float> interleaved(_output_audio_channels * audio_frames);
        auto deinterleaved = make_shared<AudioBuffers>(_output_audio_channels, audio_frames);
        int const gets_per_frame = _film->three_d() ? 2 : 1;
        for (DCPTime i; i < _film->length(); i += video_frame) {
@@ -176,7 +176,7 @@ FFmpegEncoder::go ()
 
                for (int j = 0; j < gets_per_frame; ++j) {
                        Butler::Error e;
-                       auto v = _butler->get_video (true, &e);
+                       auto v = _butler->get_video (Butler::Behaviour::BLOCKING, &e);
                        _butler->rethrow ();
                        if (v.first) {
                                auto fe = encoder->get (v.first->eyes());
@@ -204,9 +204,9 @@ FFmpegEncoder::go ()
 
                waker.nudge ();
 
-               _butler->get_audio (interleaved, audio_frames);
+               _butler->get_audio (Butler::Behaviour::BLOCKING, interleaved.data(), audio_frames);
                /* XXX: inefficient; butler interleaves and we deinterleave again */
-               float* p = interleaved;
+               float* p = interleaved.data();
                for (int j = 0; j < audio_frames; ++j) {
                        for (int k = 0; k < _output_audio_channels; ++k) {
                                deinterleaved->data(k)[j] = *p++;
@@ -214,7 +214,6 @@ FFmpegEncoder::go ()
                }
                encoder->audio (deinterleaved);
        }
-       delete[] interleaved;
 
        for (auto i: file_encoders) {
                i.flush ();