diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-11-21 14:29:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-11-22 23:59:43 +0100 |
| commit | 33acff363c978914cdcbf21fb8fa3d1c4c6991b7 (patch) | |
| tree | 4bd8de953c0692d816e48e59d036a1625b9d3ff2 /src/lib/j2k_encoder_remote_backend.cc | |
| parent | 0a49cc2ebbfc3809313f252208a0050a3fce1e97 (diff) | |
Allow J2K encode backends to accept more than one frame at once.
Diffstat (limited to 'src/lib/j2k_encoder_remote_backend.cc')
| -rw-r--r-- | src/lib/j2k_encoder_remote_backend.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/j2k_encoder_remote_backend.cc b/src/lib/j2k_encoder_remote_backend.cc index 8bf1a0caf..df5d6e30d 100644 --- a/src/lib/j2k_encoder_remote_backend.cc +++ b/src/lib/j2k_encoder_remote_backend.cc @@ -41,6 +41,7 @@ using std::make_shared; using std::shared_ptr; using std::string; using std::unique_ptr; +using std::vector; using boost::optional; using dcp::raw_convert; @@ -53,9 +54,12 @@ J2KEncoderRemoteBackend::J2KEncoderRemoteBackend (J2KEncoderRemoteBackend&& othe } -optional<dcp::ArrayData> -J2KEncoderRemoteBackend::encode (DCPVideo video) +vector<dcp::ArrayData> +J2KEncoderRemoteBackend::encode (vector<DCPVideo> const& all_video) { + DCPOMATIC_ASSERT (all_video.size() == 1); + auto video = all_video.front(); + try { boost::asio::io_service io_service; boost::asio::ip::tcp::resolver resolver (io_service); @@ -103,7 +107,7 @@ J2KEncoderRemoteBackend::encode (DCPVideo video) LOG_DEBUG_ENCODE (N_("Finished remotely-encoded frame %1"), video.index()); _backoff = 0; - return enc; + return { enc }; } catch (std::exception& e) { if (_backoff < 60) { |