[PlayerInfo] Remove REST support and build the plugin in Linux Actions (#349)

* Remove REST support from PlayerInfo

* Try building PlayerInfo in Linux Actions with installing a GStreamer lib

* Make sure that PlayerInfo will also built on 32-bit

Author: VeithMetro

.github/workflows/Linux build template.yml

@@ -28,7 +28,7 @@ jobs:
           echo "deb http://archive.ubuntu.com/ubuntu/ jammy-updates main universe restricted multiverse" | sudo tee -a /etc/apt/sources.list
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev autoconf automake libtool libtool-bin pkg-config ${{matrix.architecture == '32' && 'zlib1g-dev:i386 libssl-dev:i386 gcc-13-multilib g++-13-multilib libarchive-dev:i386 libcurl4-openssl-dev:i386 libgpgme-dev:i386 libgpg-error-dev:i386' || 'zlib1g-dev libssl-dev libarchive-dev libcurl4-openssl-dev libgpgme-dev libgpg-error-dev'}}
+          sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev autoconf automake libtool libtool-bin pkg-config ${{matrix.architecture == '32' && 'zlib1g-dev:i386 libssl-dev:i386 gcc-13-multilib g++-13-multilib libarchive-dev:i386 libcurl4-openssl-dev:i386 libgpgme-dev:i386 libgpg-error-dev:i386 libgstreamer1.0-dev:i386' || 'zlib1g-dev libssl-dev libarchive-dev libcurl4-openssl-dev libgpgme-dev libgpg-error-dev libgstreamer1.0-dev'}}
           python3 -m venv venv
           source venv/bin/activate
           pip install jsonref
@@ -84,7 +84,7 @@ jobs:
     - name: Build ThunderNanoServicesRDK
       run: |
         source venv/bin/activate
-        export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
+        export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/${{matrix.architecture == '32' && 'i386' || 'x86_64'}}-linux-gnu/pkgconfig:$PKG_CONFIG_PATH
         cmake -G Ninja -S ThunderNanoServicesRDK -B ${{matrix.build_type}}/build/ThunderNanoServicesRDK \
         -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
         -DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
@@ -98,6 +98,7 @@ jobs:
         -DPLUGIN_MONITOR=ON \
         -DPLUGIN_OPENCDMI=ON \
         -DPLUGIN_PERFORMANCEMETRICS=ON \
+        -DPLUGIN_PLAYERINFO=ON \
         -DPLUGIN_PACKAGER=ON \
         ${{steps.plugins.outputs.first_match}}
         cmake --build ${{matrix.build_type}}/build/ThunderNanoServicesRDK --target install

PlayerInfo/PlayerInfo.cpp

@@ -37,9 +37,6 @@ namespace Plugin {
         );
     }
 
-    static Core::ProxyPoolType<Web::Response> responseFactory(4);
-    static Core::ProxyPoolType<Web::JSONBodyType<JsonData::PlayerInfo::CodecsData>> jsonResponseFactory(4);
-
     /* virtual */ const string PlayerInfo::Initialize(PluginHost::IShell* service)
     {
         ASSERT(service != nullptr);
@@ -141,58 +138,6 @@ namespace Plugin {
         return (string());
     }
 
-    /* virtual */ void PlayerInfo::Inbound(Web::Request& /* request */)
-    {
-    }
-
-    /* virtual */ Core::ProxyType<Web::Response> PlayerInfo::Process(const Web::Request& request)
-    {
-        ASSERT(_skipURL <= request.Path.length());
-
-        Core::ProxyType<Web::Response> result(PluginHost::IFactories::Instance().Response());
-
-        // By default, we assume everything works..
-        result->ErrorCode = Web::STATUS_OK;
-        result->Message = "OK";
-
-        // <GET> - currently, only the GET command is supported, returning system info
-        if (request.Verb == Web::Request::HTTP_GET) {
-
-            Core::ProxyType<Web::JSONBodyType<JsonData::PlayerInfo::CodecsData>> response(jsonResponseFactory.Element());
-
-            Core::TextSegmentIterator index(Core::TextFragment(request.Path, _skipURL, static_cast<uint32_t>(request.Path.length()) - _skipURL), false, '/');
-
-            // Always skip the first one, it is an empty part because we start with a '/' if there are more parameters.
-            index.Next();
-
-            Info(*response);
-            result->ContentType = Web::MIMETypes::MIME_JSON;
-            result->Body(Core::ProxyType<Web::IBody>(response));
-        } else {
-            result->ErrorCode = Web::STATUS_BAD_REQUEST;
-            result->Message = _T("Unsupported request for the [PlayerInfo] service.");
-        }
-
-        return result;
-    }
-
-    void PlayerInfo::Info(JsonData::PlayerInfo::CodecsData& playerInfo) const
-    {
-        Core::JSON::EnumType<JsonData::PlayerInfo::CodecsData::AudiocodecsType> audioCodec;
-        _audioCodecs->Reset(0);
-        Exchange::IPlayerProperties::AudioCodec audio;
-        while (_audioCodecs->Next(audio) == true) {
-            playerInfo.Audio.Add(audioCodec = static_cast<JsonData::PlayerInfo::CodecsData::AudiocodecsType>(audio));
-        }
-
-        Core::JSON::EnumType<JsonData::PlayerInfo::CodecsData::VideocodecsType> videoCodec;
-        Exchange::IPlayerProperties::VideoCodec video;
-        _videoCodecs->Reset(0);
-        while (_videoCodecs->Next(video) == true) {
-            playerInfo.Video.Add(videoCodec = static_cast<JsonData::PlayerInfo::CodecsData::VideocodecsType>(video));
-        }
-    }
-
     void PlayerInfo::Deactivated(RPC::IRemoteConnection* connection)
     {
         // This can potentially be called on a socket thread, so the deactivation (wich in turn kills this object) must be done

PlayerInfo/PlayerInfo.h

@@ -20,14 +20,13 @@
 #pragma once
 
 #include "Module.h"
-#include <interfaces/json/JsonData_PlayerInfo.h>
 #include <interfaces/json/JDolbyOutput.h>
 #include <interfaces/json/JPlayerProperties.h>
 
 namespace Thunder {
 namespace Plugin {
 
-    class PlayerInfo : public PluginHost::IPlugin, public PluginHost::IWeb, public PluginHost::JSONRPC {
+    class PlayerInfo : public PluginHost::IPlugin, public PluginHost::JSONRPC {
     private:
         class Notification : public RPC::IRemoteConnection::INotification {
         public:
@@ -125,7 +124,6 @@ namespace Plugin {
 
         BEGIN_INTERFACE_MAP(PlayerInfo)
         INTERFACE_ENTRY(PluginHost::IPlugin)
-        INTERFACE_ENTRY(PluginHost::IWeb)
         INTERFACE_ENTRY(PluginHost::IDispatcher)
         INTERFACE_AGGREGATE(Exchange::IPlayerProperties, _player)
         END_INTERFACE_MAP
@@ -137,14 +135,8 @@ namespace Plugin {
         void Deinitialize(PluginHost::IShell* service) override;
         string Information() const override;
 
-        //   IWeb methods
-        // -------------------------------------------------------------------------------------------------------
-        void Inbound(Web::Request& request) override;
-        Core::ProxyType<Web::Response> Process(const Web::Request& request) override;
-
     private:
         void Deactivated(RPC::IRemoteConnection* connection);
-        void Info(JsonData::PlayerInfo::CodecsData&) const;
 
     private:
         uint8_t _skipURL;