Merge pull request #2 from rdkcentral/sprint/24Q2

Rebase with remote sprint/24Q2
rdkcentral · May 24, 2024 · ebe7665 · ebe7665
2 parents 9b6e781 + 1169392
commit ebe7665
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/SystemAudioPlayer/impl/AudioPlayer.cpp b/SystemAudioPlayer/impl/AudioPlayer.cpp
@@ -1014,7 +1014,7 @@ void AudioPlayer::setVolume( int thisVol)
         g_object_set(G_OBJECT(m_audioVolume), "stream-volume", (double)thisVol/100, NULL);
     }
 #elif defined(PLATFORM_REALTEK)
-    g_object_set(G_OBJECT(m_audioVolume), "volume", (double) 4.0 * (thisVol/100), NULL);
+    g_object_set(G_OBJECT(m_audioVolume), "volume", (double)thisVol/100, NULL);
 #elif defined(PLATFORM_BROADCOM)
     g_object_set(G_OBJECT(m_audioVolume), "volume", (double)thisVol/100, NULL);
 #endif

diff --git a/Tests/L1Tests/tests/test_RDKShell.cpp b/Tests/L1Tests/tests/test_RDKShell.cpp
@@ -61,6 +61,7 @@ TEST_F(RDKShellTest, RegisteredMethods){
     EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("addAnimation")));
     EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("addKeyIntercept")));
     EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("addKeyIntercepts")));
+    EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("setKeyIntercepts")));
     EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("addKeyListener")));
     EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("addKeyMetadataListener")));
     EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("exitAgingMode")));

diff --git a/Tests/mocks/rdkshell.cpp b/Tests/mocks/rdkshell.cpp
@@ -269,6 +269,10 @@ bool CompositorController::addKeyIntercept(const std::string& client, const uint
 {
     return impl->addKeyIntercept(client, keyCode, flags);
 }
+bool CompositorController::setKeyIntercept(const std::string& client, const uint32_t& keyCode, const uint32_t& flags, const bool always)
+{
+    return impl->setKeyIntercept(client, keyCode, flags, always);
+}
 bool CompositorController::removeKeyIntercept(const std::string& client, const uint32_t& keyCode, const uint32_t& flags)
 {
      return impl->removeKeyIntercept(client, keyCode, flags);

diff --git a/Tests/mocks/rdkshell.h b/Tests/mocks/rdkshell.h
@@ -262,6 +262,7 @@ namespace RdkShell
      virtual bool addNativeKeyListener(const std::string& client, const uint32_t& keyCode, const uint32_t& flags, std::map<std::string, RdkShellData> &listenerProperties) = 0;
      virtual bool addKeyListener(const std::string& client, const uint32_t& keyCode, const uint32_t& flags, std::map<std::string, RdkShellData> &listenerProperties) = 0;
      virtual bool addKeyIntercept(const std::string& client, const uint32_t& keyCode, const uint32_t& flags) = 0;
+     virtual bool setKeyIntercept(const std::string& client, const uint32_t& keyCode, const uint32_t& flags, const bool always) = 0;
      virtual bool kill(const std::string& client) = 0;
      virtual void setInactivityInterval(const double minutes) = 0;
   };
@@ -284,6 +285,7 @@ namespace RdkShell
                     static bool getFocused(std::string& client);
                     static bool kill(const std::string& client);
                     static bool addKeyIntercept(const std::string& client, const uint32_t& keyCode, const uint32_t& flags);
+                    static bool setKeyIntercept(const std::string& client, const uint32_t& keyCode, const uint32_t& flags, const bool always);
                     static bool removeKeyIntercept(const std::string& client, const uint32_t& keyCode, const uint32_t& flags);
                     static bool addKeyListener(const std::string& client, const uint32_t& keyCode, const uint32_t& flags, std::map<std::string, RdkShellData> &listenerProperties);
                     static bool addNativeKeyListener(const std::string& client, const uint32_t& keyCode, const uint32_t& flags, std::map<std::string, RdkShellData> &listenerProperties);

diff --git a/Tests/mocks/rdkshellmock.h b/Tests/mocks/rdkshellmock.h
@@ -157,6 +157,7 @@ class CompositorImplMock : public RdkShell::CompositorControllerImpl {
     MOCK_METHOD(bool, addNativeKeyListener, (const std::string& client, const uint32_t& keyCode, const uint32_t& flags, (std::map<std::string, RdkShell::RdkShellData> &listenerProperties)), (override));
     MOCK_METHOD(bool, addKeyListener, (const std::string& client, const uint32_t& keyCode, const uint32_t& flags, (std::map<std::string, RdkShell::RdkShellData> &listenerProperties)), (override));
     MOCK_METHOD(bool, addKeyIntercept, (const std::string& client, const uint32_t& keyCode, const uint32_t& flags), (override));
+    MOCK_METHOD(bool, setKeyIntercept, (const std::string& client, const uint32_t& keyCode, const uint32_t& flags, const bool always), (override));
     MOCK_METHOD(bool, kill, (const std::string& client), (override));
     MOCK_METHOD(void, setInactivityInterval, (const double minutes), (override));
 };

diff --git a/TextToSpeech/impl/TTSURLConstructer.cpp b/TextToSpeech/impl/TTSURLConstructer.cpp
@@ -7,6 +7,14 @@ static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *use
     return size * nmemb;
 }
 
+static const std::map<std::string, int> speechRateMap = {
+    {"slow", 25},
+    {"medium", 50},
+    {"fast", 75},
+    {"faster", 90},
+    {"fastest", 100}
+};
+
 namespace TTS
 {
 
@@ -45,9 +53,16 @@ std::string TTSURLConstructer::httpgetURL(TTSConfiguration &config, std::string
         ttsRequest.append(config.language());
     }
 
-    if(!isLocal && ((config.endPointType().compare("TTS2")) == 0)) {
-        ttsRequest.append("&speaking_rate=");
-        ttsRequest.append(config.speechRate());
+    if(((config.endPointType().compare("TTS2")) == 0)) {
+        if(!isLocal) {
+            ttsRequest.append("&speaking_rate=");
+            ttsRequest.append(config.speechRate());
+        } else {
+            //rate mapping for offline VG
+            ttsRequest.append("&rate=");
+            auto it = speechRateMap.find(config.speechRate());
+            ttsRequest.append(std::to_string((speechRateMap.end() != it ) ? it->second : 50));
+        }
     } else {
         // Rate / speed
         ttsRequest.append("&rate=");