diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-08-13 14:55:20 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-13 20:23:29 +0200 |
| commit | 50e85cf64504b7fc38b4129aa750c2def28b95fd (patch) | |
| tree | 12d30de6149bc7fa39ab388397da128a7d426a44 /src/lib/encode_server.cc | |
| parent | dbb5577ff761cfd25f154fc54c2dc7e111a31c77 (diff) | |
Rearrange encoding so that the different methods / backends are not all crammed into DCPVideo.
Diffstat (limited to 'src/lib/encode_server.cc')
| -rw-r--r-- | src/lib/encode_server.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index f4224798b..85f3ca7b0 100644 --- a/src/lib/encode_server.cc +++ b/src/lib/encode_server.cc @@ -141,11 +141,11 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st throw NetworkError ("Checksums do not match"); } - DCPVideo dcp_video_frame (pvf, xml); + shared_ptr<DCPVideo> frame(new DCPVideo(pvf, xml)); gettimeofday (&after_read, 0); - Data encoded = dcp_video_frame.encode_locally (); + Data encoded = *_cpu_encoder.encode (frame); gettimeofday (&after_encode, 0); @@ -154,12 +154,12 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st socket->write (encoded.size()); socket->write (encoded.data().get(), encoded.size()); } catch (std::exception& e) { - cerr << "Send failed; frame " << dcp_video_frame.index() << "\n"; - LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index()); + cerr << "Send failed; frame " << frame->index() << "\n"; + LOG_ERROR ("Send failed; frame %1", frame->index()); throw; } - return dcp_video_frame.index (); + return frame->index (); } void |