diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-08-14 13:44:58 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-13 20:23:29 +0200 |
| commit | d89f53b1ad09cf0f739533483915b702a26594b4 (patch) | |
| tree | 133813acde125aa371b0a30f75af2812e6459aa9 /src/lib/j2k_encoder_remote_backend.cc | |
| parent | 50e85cf64504b7fc38b4129aa750c2def28b95fd (diff) | |
wip: encoding; crashes on startup.
Diffstat (limited to 'src/lib/j2k_encoder_remote_backend.cc')
| -rw-r--r-- | src/lib/j2k_encoder_remote_backend.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/j2k_encoder_remote_backend.cc b/src/lib/j2k_encoder_remote_backend.cc index 831134718..40d9a1871 100644 --- a/src/lib/j2k_encoder_remote_backend.cc +++ b/src/lib/j2k_encoder_remote_backend.cc @@ -18,6 +18,7 @@ DCPOMATIC_ENABLE_WARNINGS using std::string; +using std::vector; using boost::optional; using boost::shared_ptr; using dcp::Data; @@ -32,9 +33,12 @@ J2KEncoderRemoteBackend::J2KEncoderRemoteBackend (EncodeServerDescription server } -optional<Data> -J2KEncoderRemoteBackend::encode (shared_ptr<DCPVideo> video) +vector<Data> +J2KEncoderRemoteBackend::encode (vector<shared_ptr<DCPVideo> > all_video) { + DCPOMATIC_ASSERT (all_video.size() == 1); + shared_ptr<DCPVideo> video = all_video.front(); + int const timeout = 30; try { @@ -90,7 +94,9 @@ J2KEncoderRemoteBackend::encode (shared_ptr<DCPVideo> video) /* This job succeeded, so remove any backoff */ _backoff = 0; - return e; + vector<Data> data; + data.push_back(e); + return data; } catch (std::exception& e) { if (_backoff < 60) { @@ -102,7 +108,7 @@ J2KEncoderRemoteBackend::encode (shared_ptr<DCPVideo> video) ); boost::this_thread::sleep (boost::posix_time::seconds(_backoff)); - return optional<Data>(); + return vector<Data>(); } } |