From 240a2e44f7ac22d43137e9d149013a8ba8a5b1d0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Jul 2023 00:20:15 +0200 Subject: [PATCH] Formatting, variable name tidying and some const correctness. --- src/lib/dcp_encoder.cc | 11 +++++++++-- src/lib/dcp_encoder.h | 5 +++-- src/lib/dcp_video.cc | 13 ++++++++----- src/lib/dcp_video.h | 7 ++++--- src/lib/encoder.h | 4 ++-- src/lib/j2k_encoder.cc | 37 ++++++++++++++++++++++--------------- src/lib/j2k_encoder.h | 8 ++++---- src/lib/transcode_job.cc | 10 ++++++++-- 8 files changed, 60 insertions(+), 35 deletions(-) diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc index 7088225cd..a03f689b0 100644 --- a/src/lib/dcp_encoder.cc +++ b/src/lib/dcp_encoder.cc @@ -118,13 +118,20 @@ DCPEncoder::go () _writer.finish(_film->dir(_film->dcp_name())); } -void DCPEncoder::pause(void) { + +void +DCPEncoder::pause() +{ _j2k_encoder.pause(); } -void DCPEncoder::resume(void) { + +void +DCPEncoder::resume() +{ _j2k_encoder.resume(); } + void DCPEncoder::video (shared_ptr data, DCPTime time) { diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h index a8043887e..771679a98 100644 --- a/src/lib/dcp_encoder.h +++ b/src/lib/dcp_encoder.h @@ -52,8 +52,9 @@ public: bool finishing () const override { return _finishing; } - void pause(void) override; - void resume(void) override; + + void pause() override; + void resume() override; private: diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 204c390ee..3769a3285 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -118,15 +118,17 @@ DCPVideo::convert_to_xyz (shared_ptr frame) } dcp::Size -DCPVideo::get_size(void) { - auto image = _frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false); +DCPVideo::get_size() const +{ + auto image = _frame->image(bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false); return image->size(); } -void -DCPVideo::convert_to_xyz (uint16_t *dst) { - auto image = _frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false); +void +DCPVideo::convert_to_xyz(uint16_t* dst) const +{ + auto image = _frame->image(bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false); if (_frame->colour_conversion()) { dcp::rgb_to_xyz ( image->data()[0], @@ -138,6 +140,7 @@ DCPVideo::convert_to_xyz (uint16_t *dst) { } } + /** J2K-encode this frame on the local host. * @return Encoded data. */ diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h index 23c920ede..67a2c9f44 100644 --- a/src/lib/dcp_video.h +++ b/src/lib/dcp_video.h @@ -49,7 +49,7 @@ class PlayerVideo; class DCPVideo { public: - DCPVideo (void) : DCPVideo(nullptr,0,0,0,Resolution::TWO_K){} + DCPVideo() : DCPVideo(nullptr, 0, 0, 0, Resolution::TWO_K) {} DCPVideo (std::shared_ptr, int index, int dcp_fps, int bandwidth, Resolution r); DCPVideo (std::shared_ptr, cxml::ConstNodePtr); @@ -69,8 +69,9 @@ public: static std::shared_ptr convert_to_xyz(std::shared_ptr frame); - void convert_to_xyz (uint16_t *dst); - dcp::Size get_size(void); + void convert_to_xyz(uint16_t* dst) const; + dcp::Size get_size() const; + private: void add_metadata (xmlpp::Element *) const; diff --git a/src/lib/encoder.h b/src/lib/encoder.h index f921fcb51..aeaf7f620 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -58,8 +58,8 @@ public: /** @return the number of frames that are done */ virtual Frame frames_done () const = 0; virtual bool finishing () const = 0; - virtual void pause(void) {} - virtual void resume(void) {} + virtual void pause() {} + virtual void resume() {} protected: std::shared_ptr _film; diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc index e2fca09b1..defde2227 100644 --- a/src/lib/j2k_encoder.cc +++ b/src/lib/j2k_encoder.cc @@ -61,9 +61,9 @@ static grk_plugin::GrokInitializer grokInitializer; J2KEncoder::J2KEncoder(shared_ptr film, Writer& writer) : _film (film) , _history (200) - , _writer (writer) , - dcpomaticContext_(film,writer,_history, Config::instance()->gpu_binary_location ()), - context_(Config::instance()->enable_gpu () ? new grk_plugin::GrokContext(dcpomaticContext_) : nullptr) + , _writer (writer) + , _dcpomatic_context(film, writer, _history, Config::instance()->gpu_binary_location()) + , _context(Config::instance()->enable_gpu() ? new grk_plugin::GrokContext(_dcpomatic_context) : nullptr) { } @@ -77,7 +77,7 @@ J2KEncoder::~J2KEncoder () terminate_threads (); } - delete context_; + delete _context; } void @@ -89,18 +89,25 @@ J2KEncoder::begin () servers_list_changed (); } -void J2KEncoder::pause(void){ - if (Config::instance()->enable_gpu ()) + +void +J2KEncoder::pause() +{ + if (Config::instance()->enable_gpu()) { end(false); + } } -void J2KEncoder::resume(void){ - if (Config::instance()->enable_gpu ()) { - context_ = new grk_plugin::GrokContext(dcpomaticContext_); - servers_list_changed (); + +void J2KEncoder::resume() +{ + if (Config::instance()->enable_gpu()) { + _context = new grk_plugin::GrokContext(_dcpomatic_context); + servers_list_changed(); } } + void J2KEncoder::end (bool isFinal) { @@ -141,7 +148,7 @@ J2KEncoder::end (bool isFinal) if (isFinal) { for (auto & i: _queue) { if (Config::instance()->enable_gpu ()) { - if (!context_->scheduleCompress(i)){ + if (!_context->scheduleCompress(i)){ LOG_GENERAL (N_("[%1] J2KEncoder thread pushes frame %2 back onto queue after failure"), thread_id(), i.index()); // handle error } @@ -161,8 +168,8 @@ J2KEncoder::end (bool isFinal) } } } - delete context_; - context_ = nullptr; + delete _context; + _context = nullptr; } @@ -367,8 +374,8 @@ try } } else { - if (context_) { - if (!context_->launch(vf, config->selected_gpu()) || !context_->scheduleCompress(vf)) { + if (_context) { + if (!_context->launch(vf, config->selected_gpu()) || !_context->scheduleCompress(vf)) { LOG_GENERAL (N_("[%1] J2KEncoder thread pushes frame %2 back onto queue after failure"), thread_id(), vf.index()); _queue.push_front (vf); } diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h index a3ea9f3e8..1d31274b3 100644 --- a/src/lib/j2k_encoder.h +++ b/src/lib/j2k_encoder.h @@ -70,8 +70,8 @@ public: /** Called to pass a bit of video to be encoded as the next DCP frame */ void encode (std::shared_ptr pv, dcpomatic::DCPTime time); - void pause(void); - void resume(void); + void pause(); + void resume(); /** Called when a processing run has finished */ void end (bool isFinal); @@ -111,8 +111,8 @@ private: boost::signals2::scoped_connection _server_found_connection; - grk_plugin::DcpomaticContext dcpomaticContext_; - grk_plugin::GrokContext *context_; + grk_plugin::DcpomaticContext _dcpomatic_context; + grk_plugin::GrokContext *_context; }; diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index e907cbe03..b260bc44b 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -147,15 +147,21 @@ TranscodeJob::run () } } -void TranscodeJob::pause() { + +void +TranscodeJob::pause() +{ _encoder->pause(); } -void TranscodeJob::resume() { + +void TranscodeJob::resume() +{ _encoder->resume(); Job::resume(); } + string TranscodeJob::status () const { -- 2.30.2