Switch encoding to ffmpeg send/receive API.

diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 8bce0c8abac7137a9ea3f62bdb396dfa774be696..5b7baf0e50fdc98d75f13608f4f558131601def3 100644 (file)
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -46,11 +46,11 @@ public:
        {}
 
        explicit DecodeError (std::string function, std::string caller)
-               : std::runtime_error (String::compose("%1 failed in %2", function, caller))
+               : std::runtime_error (String::compose("%1 failed [%2", function, caller))
        {}
 
        explicit DecodeError (std::string function, std::string caller, int error)
-               : std::runtime_error (String::compose("%1 failed in %2 (%3)", function, caller, error))
+               : std::runtime_error (String::compose("%1 failed [%2] (%3)", function, caller, error))
        {}
 };
 
@@ -62,6 +62,7 @@ public:
        {}
 };
 
+
 /** @class EncodeError
  *  @brief A low-level problem with an encoder.
  */
@@ -71,8 +72,17 @@ public:
        explicit EncodeError (std::string s)
                : std::runtime_error (s)
        {}
+
+       explicit EncodeError (std::string function, std::string caller)
+               : std::runtime_error (String::compose("%1 failed [%2]", function, caller))
+       {}
+
+       explicit EncodeError (std::string function, std::string caller, int error)
+               : std::runtime_error (String::compose("%1 failed [%2] (%3)", function, caller, error))
+       {}
 };
 
+
 /** @class FileError.
  *  @brief Parent class for file-related errors.
  */

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 18b90e0b599b54cb6d1b13d866d45387122d11c7..29ee7455b5d4ed680ff93c0791946cbb1fb9b917 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -20,6 +20,7 @@
 
 
 #include "ffmpeg_encoder.h"
+#include "ffmpeg_wrapper.h"
 #include "film.h"
 #include "job.h"
 #include "player.h"
@@ -61,16 +62,14 @@ public:
        {
                _codec = avcodec_find_encoder_by_name (codec_name.c_str());
                if (!_codec) {
-                       throw runtime_error (String::compose("could not find FFmpeg encoder %1", codec_name));
+                       throw EncodeError (String::compose("avcodec_find_encoder_by_name failed for %1", codec_name));
                }
 
                _codec_context = avcodec_alloc_context3 (_codec);
                if (!_codec_context) {
-                       throw runtime_error ("could not allocate FFmpeg audio context");
+                       throw std::bad_alloc ();
                }
 
-               avcodec_get_context_defaults3 (_codec_context, _codec);
-
                /* XXX: configurable */
                _codec_context->bit_rate = channels * 128 * 1024;
                _codec_context->sample_fmt = sample_format;
@@ -78,22 +77,21 @@ public:
                _codec_context->channel_layout = av_get_default_channel_layout (channels);
                _codec_context->channels = channels;
 
+               int r = avcodec_open2 (_codec_context, _codec, 0);
+               if (r < 0) {
+                       throw EncodeError (N_("avcodec_open2"), N_("ExportAudioStream::ExportAudioStream"), r);
+               }
+
                _stream = avformat_new_stream (format_context, _codec);
                if (!_stream) {
-                       throw runtime_error ("could not create FFmpeg output audio stream");
+                       throw EncodeError (N_("avformat_new_stream"), N_("ExportAudioStream::ExportAudioStream"));
                }
 
                _stream->id = stream_index;
                _stream->disposition |= AV_DISPOSITION_DEFAULT;
-DCPOMATIC_DISABLE_WARNINGS
-               _stream->codec = _codec_context;
-DCPOMATIC_ENABLE_WARNINGS
-
-               int r = avcodec_open2 (_codec_context, _codec, 0);
+               r = avcodec_parameters_from_context (_stream->codecpar, _codec_context);
                if (r < 0) {
-                       char buffer[256];
-                       av_strerror (r, buffer, sizeof(buffer));
-                       throw runtime_error (String::compose("could not open FFmpeg audio codec (%1)", buffer));
+                       throw EncodeError (N_("avcodec_parameters_from_context"), N_("ExportAudioStream::ExportAudioStream"), r);
                }
        }
 
@@ -111,24 +109,23 @@ DCPOMATIC_ENABLE_WARNINGS
 
        bool flush ()
        {
-               AVPacket packet;
-               av_init_packet (&packet);
-               packet.data = 0;
-               packet.size = 0;
-               bool flushed = false;
-
-               int got_packet;
-DCPOMATIC_DISABLE_WARNINGS
-               avcodec_encode_audio2 (_codec_context, &packet, 0, &got_packet);
-DCPOMATIC_ENABLE_WARNINGS
-               if (got_packet) {
-                       packet.stream_index = 0;
-                       av_interleaved_write_frame (_format_context, &packet);
-               } else {
-                       flushed = true;
+               int r = avcodec_send_frame (_codec_context, nullptr);
+               if (r < 0 && r != AVERROR_EOF) {
+                       /* We get EOF if we've already flushed the stream once */
+                       throw EncodeError (N_("avcodec_send_frame"), N_("ExportAudioStream::flush"), r);
+               }
+
+               ffmpeg::Packet packet;
+               r = avcodec_receive_packet (_codec_context, packet.get());
+               if (r == AVERROR_EOF) {
+                       return true;
+               } else if (r < 0) {
+                       throw EncodeError (N_("avcodec_receive_packet"), N_("ExportAudioStream::flush"), r);
                }
-               av_packet_unref (&packet);
-               return flushed;
+
+               packet->stream_index = _stream_index;
+               av_interleaved_write_frame (_format_context, packet.get());
+               return false;
        }
 
        void write (int size, int channel_offset, int channels, float** data, int64_t sample_offset)
@@ -145,6 +142,8 @@ DCPOMATIC_ENABLE_WARNINGS
                DCPOMATIC_ASSERT (samples);
 
                frame->nb_samples = size;
+               frame->format = _codec_context->sample_fmt;
+               frame->channels = channels;
                int r = avcodec_fill_audio_frame (frame, channels, _codec_context->sample_fmt, (const uint8_t *) samples, buffer_size, 0);
                DCPOMATIC_ASSERT (r >= 0);
 
@@ -185,26 +184,21 @@ DCPOMATIC_ENABLE_WARNINGS
                DCPOMATIC_ASSERT (_codec_context->time_base.num == 1);
                frame->pts = sample_offset * _codec_context->time_base.den / _codec_context->sample_rate;
 
-               AVPacket packet;
-               av_init_packet (&packet);
-               packet.data = 0;
-               packet.size = 0;
-               int got_packet;
-
-               DCPOMATIC_DISABLE_WARNINGS
-               if (avcodec_encode_audio2 (_codec_context, &packet, frame, &got_packet) < 0) {
-                       throw EncodeError ("FFmpeg audio encode failed");
+               r = avcodec_send_frame (_codec_context, frame);
+               av_free (samples);
+               av_frame_free (&frame);
+               if (r < 0) {
+                       throw EncodeError (N_("avcodec_send_frame"), N_("ExportAudioStream::write"), r);
                }
-               DCPOMATIC_ENABLE_WARNINGS
 
-               if (got_packet && packet.size) {
-                       packet.stream_index = _stream_index;
-                       av_interleaved_write_frame (_format_context, &packet);
-                       av_packet_unref (&packet);
+               ffmpeg::Packet packet;
+               r = avcodec_receive_packet (_codec_context, packet.get());
+               if (r < 0 && r != AVERROR(EAGAIN)) {
+                       throw EncodeError (N_("avcodec_receive_packet"), N_("ExportAudioStream::write"), r);
+               } else if (r >= 0) {
+                       packet->stream_index = _stream_index;
+                       av_interleaved_write_frame (_format_context, packet.get());
                }
-
-               av_free (samples);
-               av_frame_free (&frame);
        }
 
 private:
@@ -261,7 +255,7 @@ FFmpegFileEncoder::FFmpegFileEncoder (
 
        int r = avformat_alloc_output_context2 (&_format_context, 0, 0, _output.string().c_str());
        if (!_format_context) {
-               throw runtime_error (String::compose("could not allocate FFmpeg format context (%1)", r));
+               throw EncodeError (N_("avformat_alloc_output_context2"), "FFmpegFileEncoder::FFmpegFileEncoder", r);
        }
 
        setup_video ();
@@ -269,13 +263,14 @@ FFmpegFileEncoder::FFmpegFileEncoder (
 
        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));
+               throw EncodeError (String::compose(_("Could not open output file %1 (%2)"), _output.string(), r));
        }
 
        AVDictionary* options = nullptr;
 
-       if (avformat_write_header (_format_context, &options) < 0) {
-               throw runtime_error ("could not write header to FFmpeg output file");
+       r = avformat_write_header (_format_context, &options);
+       if (r < 0) {
+               throw EncodeError (N_("avformat_write_header"), N_("FFmpegFileEncoder::FFmpegFileEncoder"), r);
        }
 
        _pending_audio.reset (new AudioBuffers(channels, 0));
@@ -312,16 +307,14 @@ FFmpegFileEncoder::setup_video ()
 {
        _video_codec = avcodec_find_encoder_by_name (_video_codec_name.c_str());
        if (!_video_codec) {
-               throw runtime_error (String::compose ("could not find FFmpeg encoder %1", _video_codec_name));
+               throw EncodeError (String::compose("avcodec_find_encoder_by_name failed for %1", _video_codec_name));
        }
 
        _video_codec_context = avcodec_alloc_context3 (_video_codec);
        if (!_video_codec_context) {
-               throw runtime_error ("could not allocate FFmpeg video context");
+               throw std::bad_alloc ();
        }
 
-       avcodec_get_context_defaults3 (_video_codec_context, _video_codec);
-
        /* Variable quantisation */
        _video_codec_context->global_quality = 0;
        _video_codec_context->width = _video_frame_size.width;
@@ -330,18 +323,19 @@ FFmpegFileEncoder::setup_video ()
        _video_codec_context->pix_fmt = _pixel_format;
        _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"));
+       }
+
        _video_stream = avformat_new_stream (_format_context, _video_codec);
        if (!_video_stream) {
-               throw runtime_error ("could not create FFmpeg output video stream");
+               throw EncodeError (N_("avformat_new_stream"), N_("FFmpegFileEncoder::setup_video"));
        }
 
        _video_stream->id = _video_stream_index;
-DCPOMATIC_DISABLE_WARNINGS
-       _video_stream->codec = _video_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");
+       int r = avcodec_parameters_from_context (_video_stream->codecpar, _video_codec_context);
+       if (r < 0) {
+               throw EncodeError (N_("avcodec_parameters_from_context"), N_("FFmpegFileEncoder::setup_video"), r);
        }
 }
 
@@ -373,22 +367,22 @@ FFmpegFileEncoder::flush ()
        bool flushed_audio = false;
 
        while (!flushed_video || !flushed_audio) {
-               AVPacket packet;
-               av_init_packet (&packet);
-               packet.data = 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);
-               } else {
+               int r = avcodec_send_frame (_video_codec_context, nullptr);
+               if (r < 0 && r != AVERROR_EOF) {
+                       /* We get EOF if we've already flushed the stream once */
+                       throw EncodeError (N_("avcodec_send_frame"), N_("FFmpegFileEncoder::flush"), r);
+               }
+
+               ffmpeg::Packet packet;
+               r = avcodec_receive_packet (_video_codec_context, packet.get());
+               if (r == AVERROR_EOF) {
                        flushed_video = true;
+               } else if (r < 0) {
+                       throw EncodeError (N_("avcodec_receive_packet"), N_("FFmpegFileEncoder::flush"), r);
+               } else {
+                       packet->stream_index = _video_stream_index;
+                       av_interleaved_write_frame (_format_context, packet.get());
                }
-               av_packet_unref (&packet);
 
                flushed_audio = true;
                for (auto i: _audio_streams) {
@@ -435,26 +429,20 @@ FFmpegFileEncoder::video (shared_ptr<PlayerVideo> video, DCPTime time)
        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.data = 0;
-       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");
+       int r = avcodec_send_frame (_video_codec_context, frame);
+       av_frame_free (&frame);
+       if (r < 0) {
+               throw EncodeError (N_("avcodec_send_frame"), N_("FFmpegFileEncoder::video"), r);
        }
-DCPOMATIC_ENABLE_WARNINGS
 
-       if (got_packet && packet.size) {
-               packet.stream_index = _video_stream_index;
-               av_interleaved_write_frame (_format_context, &packet);
-               av_packet_unref (&packet);
+       ffmpeg::Packet packet;
+       r = avcodec_receive_packet (_video_codec_context, packet.get());
+       if (r < 0 && r != AVERROR(EAGAIN)) {
+               throw EncodeError (N_("avcodec_receive_packet"), N_("FFmpegFileEncoder::video"), r);
+       } else if (r >= 0) {
+               packet->stream_index = _video_stream_index;
+               av_interleaved_write_frame (_format_context, packet.get());
        }
-
-       av_frame_free (&frame);
-
 }
 
 

diff --git a/src/lib/ffmpeg_wrapper.cc b/src/lib/ffmpeg_wrapper.cc
new file mode 100644 (file)
index 0000000..aacaeaa
--- /dev/null
+++ b/src/lib/ffmpeg_wrapper.cc
@@ -0,0 +1,45 @@
+/*
+    Copyright (C) 2021 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+extern "C" {
+#include <libavformat/avformat.h>
+}
+#include "ffmpeg_wrapper.h"
+#include <new>
+
+
+using namespace ffmpeg;
+
+
+Packet::Packet ()
+{
+       _packet = av_packet_alloc ();
+       if (!_packet) {
+               throw std::bad_alloc ();
+       }
+}
+
+
+Packet::~Packet ()
+{
+       av_packet_free (&_packet);
+}
+

diff --git a/src/lib/ffmpeg_wrapper.h b/src/lib/ffmpeg_wrapper.h
new file mode 100644 (file)
index 0000000..ee01818
--- /dev/null
+++ b/src/lib/ffmpeg_wrapper.h
@@ -0,0 +1,49 @@
+/*
+    Copyright (C) 2021 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+struct AVPacket;
+
+
+namespace ffmpeg {
+
+class Packet
+{
+public:
+       Packet ();
+       ~Packet ();
+
+       Packet (Packet const&) = delete;
+       Packet& operator= (Packet const&) = delete;
+
+       AVPacket* operator->() const {
+               return _packet;
+       }
+
+       AVPacket* get () const {
+               return _packet;
+       }
+
+private:
+       AVPacket* _packet = nullptr;
+};
+
+}
+

diff --git a/src/lib/wscript b/src/lib/wscript
index fcd33cec194d6fae04bc4b8a43c78fa68d595924..06bb555b26f627b55ca927516fcb05ef0993ff87 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -102,13 +102,14 @@ sources = """
           ffmpeg_content.cc
           ffmpeg_decoder.cc
           ffmpeg_encoder.cc
-          ffmpeg_file_encoder.cc
           ffmpeg_examiner.cc
+          ffmpeg_file_encoder.cc
+          ffmpeg_image_proxy.cc
           ffmpeg_stream.cc
           ffmpeg_subtitle_stream.cc
+          ffmpeg_wrapper.cc
           film.cc
           filter.cc
-          ffmpeg_image_proxy.cc
           font.cc
           font_data.cc
           frame_interval_checker.cc