projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trying to create export audio encoders with between 9 and 15 channels
[dcpomatic.git]
/
src
/
lib
/
encode_server.cc
diff --git
a/src/lib/encode_server.cc
b/src/lib/encode_server.cc
index 16c65dba76f6df8d62c3546d9105fea6ea8662a2..c30fc8f30323ae52682682e2332c9fcb0e09300a 100644
(file)
--- a/
src/lib/encode_server.cc
+++ b/
src/lib/encode_server.cc
@@
-36,9
+36,12
@@
#include "dcpomatic_log.h"
#include "encoded_log_entry.h"
#include "version.h"
#include "dcpomatic_log.h"
#include "encoded_log_entry.h"
#include "version.h"
+#include "warnings.h"
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/algorithm/string.hpp>
#include <boost/scoped_array.hpp>
#include <boost/foreach.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/scoped_array.hpp>
#include <boost/foreach.hpp>
@@
-87,15
+90,9
@@
EncodeServer::~EncodeServer ()
_full_condition.notify_all ();
}
_full_condition.notify_all ();
}
- BOOST_FOREACH (boost::thread* i, _worker_threads) {
- /* Ideally this would be a DCPOMATIC_ASSERT(i->joinable()) but we
- can't throw exceptions from a destructor.
- */
- if (i->joinable ()) {
- i->join ();
- }
- delete i;
- }
+ try {
+ _worker_threads.join_all ();
+ } catch (...) {}
{
boost::mutex::scoped_lock lm (_broadcast.mutex);
{
boost::mutex::scoped_lock lm (_broadcast.mutex);
@@
-107,14
+104,12
@@
EncodeServer::~EncodeServer ()
}
_broadcast.io_service.stop ();
}
_broadcast.io_service.stop ();
- if (_broadcast.thread) {
- /* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
- can't throw exceptions from a destructor.
- */
- if (_broadcast.thread->joinable ()) {
- _broadcast.thread->join ();
+ if (_broadcast.thread.joinable()) {
+ try {
+ _broadcast.thread.join ();
+ } catch (...) {
+
}
}
- delete _broadcast.thread;
}
}
}
}
@@
-124,6
+119,8
@@
EncodeServer::~EncodeServer ()
int
EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, struct timeval& after_encode)
{
int
EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, struct timeval& after_encode)
{
+ Socket::ReadDigestScope ds (socket);
+
uint32_t length = socket->read_uint32 ();
scoped_array<char> buffer (new char[length]);
socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
uint32_t length = socket->read_uint32 ();
scoped_array<char> buffer (new char[length]);
socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
@@
-142,6
+139,10
@@
EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
+ if (!ds.check()) {
+ throw NetworkError ("Checksums do not match");
+ }
+
DCPVideo dcp_video_frame (pvf, xml);
gettimeofday (&after_read, 0);
DCPVideo dcp_video_frame (pvf, xml);
gettimeofday (&after_read, 0);
@@
-151,6
+152,7
@@
EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
gettimeofday (&after_encode, 0);
try {
gettimeofday (&after_encode, 0);
try {
+ Socket::WriteDigestScope ds (socket);
socket->write (encoded.size());
socket->write (encoded.data().get(), encoded.size());
} catch (std::exception& e) {
socket->write (encoded.size());
socket->write (encoded.data().get(), encoded.size());
} catch (std::exception& e) {
@@
-237,16
+239,17
@@
EncodeServer::run ()
}
for (int i = 0; i < _num_threads; ++i) {
}
for (int i = 0; i < _num_threads; ++i) {
- thread* t = new thread (bind (&EncodeServer::worker_thread, this));
#ifdef DCPOMATIC_LINUX
#ifdef DCPOMATIC_LINUX
+ boost::thread* t = _worker_threads.create_thread (bind(&EncodeServer::worker_thread, this));
pthread_setname_np (t->native_handle(), "encode-server-worker");
pthread_setname_np (t->native_handle(), "encode-server-worker");
+#else
+ _worker_threads.create_thread (bind(&EncodeServer::worker_thread, this));
#endif
#endif
- _worker_threads.push_back (t);
}
}
- _broadcast.thread =
new thread (bind
(&EncodeServer::broadcast_thread, this));
+ _broadcast.thread =
thread (bind
(&EncodeServer::broadcast_thread, this));
#ifdef DCPOMATIC_LINUX
#ifdef DCPOMATIC_LINUX
- pthread_setname_np (_broadcast.thread
->
native_handle(), "encode-server-broadcast");
+ pthread_setname_np (_broadcast.thread
.
native_handle(), "encode-server-broadcast");
#endif
Server::run ();
#endif
Server::run ();
@@
-326,6
+329,9
@@
EncodeServer::handle (shared_ptr<Socket> socket)
{
boost::mutex::scoped_lock lock (_mutex);
{
boost::mutex::scoped_lock lock (_mutex);
+ Waker waker;
+ waker.nudge ();
+
/* Wait until the queue has gone down a bit */
while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {
_full_condition.wait (lock);
/* Wait until the queue has gone down a bit */
while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {
_full_condition.wait (lock);