diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-11-28 19:21:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-11-29 23:32:32 +0100 |
| commit | 97bf621156ac86867b0b247fcdec1c49cb3e7f16 (patch) | |
| tree | 6722f0782259f504e4e3e3ba3e1c352e7faab16b /src/lib/grok | |
| parent | 92eab12404eca23db0a96ad7574d8d500f3d0f8a (diff) | |
Cleanup: some coding standard fixes.
Diffstat (limited to 'src/lib/grok')
| -rw-r--r-- | src/lib/grok/context.h | 2 | ||||
| -rw-r--r-- | src/lib/grok/messenger.h | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h index c2125ea96..70181466b 100644 --- a/src/lib/grok/context.h +++ b/src/lib/grok/context.h @@ -217,7 +217,7 @@ public: auto s = dcpv.get_size(); _dcpomatic_context->set_dimensions(s.width, s.height); auto grok = Config::instance()->grok().get_value_or({}); - if (!_messenger->launchGrok( + if (!_messenger->launch_grok( _dcpomatic_context->location, _dcpomatic_context->width, _dcpomatic_context->width, diff --git a/src/lib/grok/messenger.h b/src/lib/grok/messenger.h index 78154c57c..e43e58858 100644 --- a/src/lib/grok/messenger.h +++ b/src/lib/grok/messenger.h @@ -530,7 +530,7 @@ struct Messenger sendQueue.push(oss.str()); } - bool launchGrok( + bool launch_grok( boost::filesystem::path const& dir, uint32_t width, uint32_t stride, @@ -548,21 +548,23 @@ struct Messenger { std::unique_lock<std::mutex> lk(shutdownMutex_); - if (async_result_.valid()) + if (async_result_.valid()) { return true; - if(MessengerInit::firstLaunch(true)) + } + if (MessengerInit::firstLaunch(true)) { init_.unlink(); + } startThreads(); - char _cmd[4096]; auto fullServer = server + ":" + std::to_string(port); - sprintf(_cmd, + char cmd[4096]; + sprintf(cmd, "./grk_compress -batch_src %s,%d,%d,%d,%d,%d -out_fmt j2k -k 1 " "-G %d -%s %d,%d -j %s -J %s -v", GRK_MSGR_BATCH_IMAGE.c_str(), width, stride, height, samplesPerPixel, depth, device, is4K ? "cinema4K" : "cinema2K", fps, bandwidth, license.c_str(), fullServer.c_str()); - return launch(_cmd, dir); + return launch(cmd, dir); } void initClient(size_t uncompressedFrameSize, size_t compressedFrameSize, size_t numFrames) { |