L1tests ocdm

.github/workflows/Build ThunderClientLibraries.yml

@@ -0,0 +1,88 @@
+name: CMake ThunderClientLibraries
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+
+jobs:
+  ThunderInterfaces:
+    uses: rdkcentral/ThunderInterfaces/.github/workflows/Build ThunderInterfaces.yml@master
+
+  Interfaces:
+    needs: ThunderInterfaces
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        build_type: [Debug, Release, MinSizeRel]
+
+    name: Build type - ${{matrix.build_type}}
+    steps:
+    - name: Install necessary packages
+      uses: nick-fields/retry@v2
+      with:
+        timeout_minutes: 10
+        max_attempts: 10
+        command: |
+          sudo gem install apt-spy2
+          sudo apt-spy2 fix --commit --launchpad --country=US
+          sudo apt-get update
+          sudo apt install python3-pip
+          pip install jsonref
+          sudo apt install build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev libssl-dev
+
+    - name: Checkout Thunder
+      uses: actions/checkout@v3
+      with:
+        path: Thunder
+        repository: ${{github.repository_owner}}/Thunder
+
+    - name: Checkout ThunderInterfaces
+      uses: actions/checkout@v3
+      with:
+        path: ThunderInterfaces
+        repository: ${{github.repository_owner}}/ThunderInterfaces
+
+    - name: Download artifacts
+      uses: actions/download-artifact@v3
+      with:
+        name: ThunderInterfaces-${{matrix.build_type}}-artifact
+        path: ${{matrix.build_type}}
+
+    - name: Unpack files
+      run: |
+        tar -xvzf ${{matrix.build_type}}/${{matrix.build_type}}.tar.gz
+        rm ${{matrix.build_type}}/${{matrix.build_type}}.tar.gz
+
+    - name: Checkout ThunderClientLibraries
+      uses: actions/checkout@v3
+      with:
+        path: ThunderClientLibraries
+        repository: ${{github.repository_owner}}/ThunderClientLibraries
+
+    - name: Build ThunderClientLibraries
+      run: |
+        cmake -G Ninja -S ThunderClientLibraries -B ${{matrix.build_type}}/build/ThunderClientLibraries \
+        -DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
+        -DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules" \
+        -DBLUETOOTHAUDIOSINK=ON \
+        -DDEVICEINFO=ON \
+        -DDISPLAYINFO=ON \
+        -DLOCALTRACER=ON \
+        -DSECURITYAGENT=ON \
+        -DPLAYERINFO=ON \
+        -DPROTOCOLS=ON \
+        -DVIRTUALINPUT=ON
+        cmake --build ${{matrix.build_type}}/build/ThunderClientLibraries --target install
+
+    - name: Tar files
+      run: tar -czvf ${{matrix.build_type}}.tar.gz ${{matrix.build_type}}
+
+    - name: Upload
+      uses: actions/upload-artifact@v3
+      with:
+        name: ThunderClientLibraries-${{matrix.build_type}}-artifact
+        path: ${{matrix.build_type}}.tar.gz

.gitignore

@@ -36,3 +36,6 @@ install_manifest.txt
 Source/deviceinfo/device_info/device_info
 Source/displayinfo/display_info/display_info
 Source/playerinfo/player_info/player_info
+*/*/*/*/*tests
+*/*/generated
+*/*/*/*/lib*.a

CMakeLists.txt

@@ -19,9 +19,39 @@
 cmake_minimum_required(VERSION 3.3)
 project(ClientLibraries)
 
+find_package(WPEFramework)
+
+option(BLUETOOTHAUDIOSINK
+        "Include the bluetoothaudiosink library." OFF)
+option(BLUETOOTHAUDIOSOURCE
+        "Include the bluetoothaudiosource library." OFF)
+option(PROTOCOLS
+        "Include the protocols library." ON)
+option(COMPOSITORCLIENT
+        "Include a graphics backend abstraction for external applications." OFF)
+option(DEVICEINFO
+        "Include the deviceinfo COMRPC abstraction library." OFF)
+option(DISPLAYINFO
+        "Include the displayinfo COMRPC abstraction library." OFF)
+option(SECURITYAGENT
+        "Include the securityagent library." OFF)
+option(PLAYERINFO
+        "Include the playerinfo COMRPC abstraction library." OFF)
+option(PROVISIONPROXY
+        "Include the provisionproxy library." OFF)
+option(CDMI
+        "Include OpenCDM interface." OFF)
+option(CRYPTOGRAPHY
+        "Include the cryptography library." OFF)
+
+option(INSTALL_TESTS "Install the test applications" OFF)
+
+option(L1_TESTS "Install the test applications" OFF)
+
 if (BUILD_REFERENCE)
     add_definitions (-DBUILD_REFERENCE=${BUILD_REFERENCE})
 endif()
 
 add_subdirectory(Source)
+add_subdirectory(Tests)
 

Source/CMakeLists.txt

@@ -15,29 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-option(BLUETOOTHAUDIOSINK
-        "Include the bluetoothaudiosink library." OFF)
-option(PROTOCOLS
-        "Include the protocols library." ON)
-option(COMPOSITORCLIENT
-        "Include a graphics backend abstraction for external applications." OFF)
-option(DEVICEINFO
-        "Include the deviceinfo COMRPC abstraction library." OFF)
-option(DISPLAYINFO
-        "Include the displayinfo COMRPC abstraction library." OFF)
-option(SECURITYAGENT
-        "Include the securityagent library." OFF)
-option(PLAYERINFO
-        "Include the playerinfo COMRPC abstraction library." OFF)
-option(PROVISIONPROXY
-        "Include the provisionproxy library." OFF)
-option(CDMI
-        "Include OpenCDM interface." OFF)
-option(CRYPTOGRAPHY
-        "Include the cryptography library." OFF)
-option(LOCALTRACER
-        "Header only library to locally print traces coming from Messaging without the need of running Thunder/WPEFramework." OFF)
-
 if(BLUETOOTHAUDIOSINK)
     add_subdirectory(bluetoothaudiosink)
 endif()

Source/compositorclient/Client.h

@@ -58,7 +58,7 @@ namespace Compositor {
             };
 
             // Lifetime management
-            virtual void AddRef() const = 0;
+            virtual uint32_t AddRef() const = 0;
             virtual uint32_t Release() const = 0;
 
             // Methods
@@ -78,7 +78,7 @@ namespace Compositor {
             };
 
             // Lifetime management
-            virtual void AddRef() const = 0;
+            virtual uint32_t AddRef() const = 0;
             virtual uint32_t Release() const = 0;
 
             // Methods
@@ -90,7 +90,7 @@ namespace Compositor {
             virtual ~IWheel() {}
 
             // Lifetime management
-            virtual void AddRef() const = 0;
+            virtual uint32_t AddRef() const = 0;
             virtual uint32_t Release() const = 0;
 
             // Methods
@@ -107,7 +107,7 @@ namespace Compositor {
             };
 
             // Lifetime management
-            virtual void AddRef() const = 0;
+            virtual uint32_t AddRef() const = 0;
             virtual uint32_t Release() const = 0;
 
             // Methods
@@ -118,7 +118,7 @@ namespace Compositor {
             virtual ~ISurface(){};
 
             // Lifetime management
-            virtual void AddRef() const = 0;
+            virtual uint32_t AddRef() const = 0;
             virtual uint32_t Release() const = 0;
 
             // Methods
@@ -187,7 +187,7 @@ namespace Compositor {
         virtual ~IDisplay() {}
 
         // Lifetime management
-        virtual void AddRef() const = 0;
+        virtual uint32_t AddRef() const = 0;
         virtual uint32_t Release() const = 0;
 
         // Methods

Source/compositorclient/Mesa/Implementation.cpp

@@ -702,12 +702,12 @@ namespace Linux {
             return (*result);
         }
 
-        void AddRef() const override
+        uint32_t AddRef() const override
         {
             if (Core::InterlockedIncrement(_refCount) == 1) {
                 const_cast<Display*>(this)->Initialize();
             }
-            return;
+            return Core::ERROR_NONE;
         }
         uint32_t Release() const override
         {
@@ -724,7 +724,7 @@ namespace Linux {
 
                 const_cast<Display*>(this)->Deinitialize();
 
-                return (Core::ERROR_CONNECTION_CLOSED);
+                return (Core::ERROR_DESTRUCTION_SUCCEEDED);
             }
             return (Core::ERROR_NONE);
         }

Source/compositorclient/RPI/Implementation.cpp

@@ -703,12 +703,12 @@ class Display : public Compositor::IDisplay {
         return (*result);
     } 
 
-    void AddRef() const override
+    uint32_t AddRef() const override
     {
         if (Core::InterlockedIncrement(_refCount) == 1) {
             const_cast<Display*>(this)->Initialize();
         }
-        return;
+        return (Core::ERROR_NONE);
     }
 
     uint32_t Release() const override

Source/compositorclient/Wayland/Implementation.h

@@ -120,17 +120,18 @@ namespace Wayland {
             virtual ~SurfaceImplementation();
 
         public:
-            void AddRef() const override
+            uint32_t AddRef() const override
             {
                 _refcount++;
-                return;
+                return Core::ERROR_NONE;
             }
             uint32_t Release() const override
             {
                 if (--_refcount == 0) {
                     delete const_cast<SurfaceImplementation*>(this);
+                    return Core::ERROR_DESTRUCTION_SUCCEEDED;
                 }
-                return (0);
+                return Core::ERROR_NONE;
             }
             EGLNativeWindowType Native() const override
             {
@@ -531,7 +532,7 @@ namespace Wayland {
 
     public:
         // Lifetime management
-        virtual void AddRef() const;
+        virtual uint32_t AddRef() const;
         virtual uint32_t Release() const;
 
         // Methods

Source/compositorclient/Wayland/Westeros.cpp

@@ -1212,12 +1212,12 @@ namespace Wayland {
         return result;
     }
 
-    void Display::AddRef() const
+    uint32_t Display::AddRef() const
     {
         if (Core::InterlockedIncrement(_refCount) == 1) {
             const_cast<Display*>(this)->Initialize();
         }
-        return;
+        return Core::ERROR_NONE;
     }
 
     uint32_t Display::Release() const
@@ -1226,7 +1226,7 @@ namespace Wayland {
             const_cast<Display*>(this)->Deinitialize();
 
             //Indicate Wayland connection is closed properly
-            return (Core::ERROR_CONNECTION_CLOSED);
+            return (Core::ERROR_DESTRUCTION_SUCCEEDED);
         }
         return (Core::ERROR_NONE);
     }

Source/compositorclient/Wayland/Weston.cpp

@@ -1078,12 +1078,12 @@ namespace Wayland {
         return result;
     }
 
-    void Display::AddRef() const
+    uint32_t Display::AddRef() const
     {
         if (Core::InterlockedIncrement(_refCount) == 1) {
             const_cast<Display*>(this)->Initialize();
         }
-        return;
+        return Core::ERROR_NONE;
     }
 
     uint32_t Display::Release() const
@@ -1092,7 +1092,7 @@ namespace Wayland {
             const_cast<Display*>(this)->Deinitialize();
 
             //Indicate Wayland connection is closed properly
-            return (Core::ERROR_CONNECTION_CLOSED);
+            return (Core::ERROR_DESTRUCTION_SUCCEEDED);
         }
         return (Core::ERROR_NONE);
     }

Source/cryptography/CMakeLists.txt

@@ -35,26 +35,16 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed")
 
 option(INCLUDE_SOFTWARE_CRYPTOGRAPHY_LIBRARY "Include explicitly a software based cryptography library" OFF)
 
-find_package(ProxyStubGenerator REQUIRED)
-
 find_package(CompileSettingsDebug CONFIG REQUIRED)
 find_package(${NAMESPACE}Core REQUIRED)
 find_package(${NAMESPACE}COM REQUIRED)
 
-ProxyStubGenerator(
-    NAMESPACE "WPEFramework::Cryptography" 
-    INPUT "${CMAKE_CURRENT_LIST_DIR}"
-    OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated/proxystubs"
-)
-
 add_subdirectory(implementation)
 
 add_library(${TARGET} SHARED
     Module.cpp
     Cryptography.cpp
     NetflixSecurity.cpp
-    "${CMAKE_CURRENT_BINARY_DIR}/generated/proxystubs/ProxyStubs_Cryptography.cpp"
-    "${CMAKE_CURRENT_BINARY_DIR}/generated/proxystubs/ProxyStubs_NetflixSecurity.cpp"
 )
 
 target_link_libraries(${TARGET}
@@ -73,11 +63,8 @@ target_include_directories(${TARGET}
 )
 
 set(PUBLIC_HEADERS
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/ICryptography.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/Module.h>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/INetflixSecurity.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/cryptography.h>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/cryptography_vault_ids.h>
 )
 
 set_target_properties(${TARGET} PROPERTIES