From 505ae0d7bd04a6e7166d1b22df1aa7d8028e4dde Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Wed, 23 Jan 2019 17:10:23 -0500
Subject: [PATCH] accel: get/set directly in video prefs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Declutters Manager a tiny bit.
Change-Id: I322685b865f71e96f85bb00117486053cf483d08
Reviewed-by: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
---
src/manager.cpp | 19 -------------------
src/manager.h | 4 ----
src/media/media_decoder.cpp | 4 ++--
3 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/src/manager.cpp b/src/manager.cpp
index f07eaad4f5..782f67b22a 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 f496b79e69..0fb4311c22 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 06d4e789a1..90eee43950 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";
--
GitLab