diff --git a/src/manager.cpp b/src/manager.cpp index f07eaad4f54186b364811975fe40139293110b0a..782f67b22a1be783f4804b8ecac4194f6832f4a3 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -3069,25 +3069,6 @@ Manager::getSinkClient(const std::string& id) return sink; return nullptr; } - -bool -Manager::getDecodingAccelerated() const -{ -#ifdef RING_ACCEL - return videoPreferences.getDecodingAccelerated(); -#else - return false; -#endif -} - -void -Manager::setDecodingAccelerated(bool isAccelerated) -{ -#ifdef RING_ACCEL - videoPreferences.setDecodingAccelerated(isAccelerated); - saveConfig(); -#endif -} #endif // RING_VIDEO RingBufferPool& diff --git a/src/manager.h b/src/manager.h index f496b79e69daca9256a1e33c88db80480751eb19..0fb4311c2290c254299b07d91409d81d6e08c92c 100644 --- a/src/manager.h +++ b/src/manager.h @@ -878,10 +878,6 @@ class Manager { std::shared_ptr<video::SinkClient> getSinkClient(const std::string& id); VideoManager& getVideoManager() const; - - bool getDecodingAccelerated() const; - - void setDecodingAccelerated(bool isAccelerated); #endif // RING_VIDEO std::atomic<unsigned> dhtLogLevel {0}; // default = disable diff --git a/src/media/media_decoder.cpp b/src/media/media_decoder.cpp index 06d4e789a12e71072db233bed55014d970bd46d2..90eee439504efa532ee35266f9175afda206ef84 100644 --- a/src/media/media_decoder.cpp +++ b/src/media/media_decoder.cpp @@ -115,7 +115,7 @@ int MediaDecoder::openInput(const DeviceParams& params) #ifdef RING_ACCEL // if there was a fallback to software decoding, do not enable accel // it has been disabled already by the video_receive_thread/video_input - enableAccel_ &= Manager::instance().getDecodingAccelerated(); + enableAccel_ &= Manager::instance().videoPreferences.getDecodingAccelerated(); #endif int ret = avformat_open_input( @@ -217,7 +217,7 @@ MediaDecoder::setupStream(AVMediaType mediaType) if (enableAccel_) { accel_ = video::setupHardwareDecoding(decoderCtx_); decoderCtx_->opaque = &accel_; - } else if (Manager::instance().getDecodingAccelerated()) { + } else if (Manager::instance().videoPreferences.getDecodingAccelerated()) { RING_WARN() << "Hardware accelerated decoding disabled because of previous failure"; } else { RING_WARN() << "Hardware accelerated decoding disabled by user preference";