Feature/rdk 56050

.github/workflows/L1-tests.yml

@@ -38,8 +38,34 @@ jobs:
         with:
           name: ctest-results
           path: test/utests/build/ctest-results.xml
+
+
+      # Install AAMP
+      - name: Install AAMP
+        run: yes | ./install-middleware.sh -s -k file
+
+      # Run L1 tests
+      - name: Run unit tests
+        working-directory: ./middleware/test/utests
+        run: ./run.sh
+
+      # Publish test results
+      - name: Publish L1 test results
+        uses: dorny/test-reporter@v1
+        if: always()
+        with:
+          name: Unit Test Results
+          path: middleware/test/utests/build/ctest-results.xml
+          reporter: java-junit
+
+      # Upload artifact (middleware/test/utests/build/ctest-results.xml)
+      - name: Upload test result file
+        uses: actions/upload-artifact@v4
+        with:
+          name: ctest-results
+          path: middleware/test/utests/build/ctest-results.xml
 
       # Show failure
       - name: Show failure details (if any)
         if: failure()
-        run: tail -n 50 test/utests/build/ctest-results.xml
+        run: tail -n 50 test/utests/build/ctest-results.xml

AampConfig.cpp

@@ -862,6 +862,8 @@ void AampConfig::ApplyDeviceCapabilities()
 	bool isSecMgr = isSecManagerEnabled();
 	SetConfigValue(AAMP_DEFAULT_SETTING, eAAMPConfig_UseSecManager, isSecMgr);
 
+	bool isGstSubtec = SocUtils::isGstSubtecEnabled();
+	SetConfigValue(AAMP_DEFAULT_SETTING, eAAMPConfig_GstSubtecEnabled, isGstSubtec);
 }
 
 std::string AampConfig::GetUserAgentString()

AampDRMLicPreFetcher.cpp

@@ -460,8 +460,8 @@ void AampLicensePreFetcher::NotifyDrmFailure(LicensePreFetchObjectPtr fetchObj,
 bool AampLicensePreFetcher::CreateDRMSession(LicensePreFetchObjectPtr fetchObj)
 {
 	bool ret = false;
-
-	DrmMetaDataEventPtr e = std::make_shared<DrmMetaDataEvent>(AAMP_TUNE_FAILURE_UNKNOWN, "", 0, 0, mIsSecClientError, mPrivAAMP->GetSessionId());
+	bool isSecClientError = isSecFeatureEnabled();
+	DrmMetaDataEventPtr e = std::make_shared<DrmMetaDataEvent>(AAMP_TUNE_FAILURE_UNKNOWN, "", 0, 0, isSecClientError, mPrivAAMP->GetSessionId());
 
 	if (mPrivAAMP == nullptr)
 	{

AampEvent.cpp

@@ -1024,7 +1024,7 @@ void DrmMetaDataEvent::ConvertToVerboseErrorCode(int32_t httpCode, int32_t httpE
 	mSecManagerClass = SECMANAGER_CLASS_RESULT_DRM_FAIL;
 	mSecManagerReasonCode = SECMANAGER_REASON_DRM_GENERAL_FAILURE;
 	//look for the correct code from the lookup
-	if (getAsVerboseErrorCode(httpCode, mSecManagerClass, mSecManagerReasonCode)) 
+	if (getAsVerboseErrorCode(httpCode, mSecManagerClass, mSecManagerReasonCode))
 	{
 		if(412 == httpCode && 401 == httpExtStatusCode) 
 		{

CMakeLists.txt

@@ -199,7 +199,6 @@ if (CMAKE_INBUILT_AAMP_DEPENDENCIES)
 
 	add_subdirectory(support/aampabr)
 	add_subdirectory(support/aampmetrics)
-	add_subdirectory(plugins/gst-plugins-rdk-aamp)
 	set(LIBAAMP_DEPENDS ${LIBAAMP_DEPENDS} abr metrics)
 endif()
 
@@ -322,7 +321,6 @@ set(LIBAAMP_SOURCES
 	dash/utils/Url.cpp
 	dash/utils/StringEx.cpp
 	dash/utils/Path.cpp
-	ProcessHandler.cpp
 	AampMPDDownloader.cpp
 	AampMPDParseHelper.cpp
 	AampMPDUtils.cpp
@@ -342,35 +340,7 @@ set(LIBAAMP_SOURCES
 	scte35/AampSCTE35.cpp
 	subtec/subtecparser/WebvttSubtecDevParser.cpp
 	AampTrackWorker.cpp
-	test/gstTestHarness/mp4demux.cpp
-	middleware/drm/aes/Aes.cpp
-	middleware/drm/helper/DrmHelper.cpp
-	middleware/gstplayertaskpool.cpp
-	middleware/PlayerUtils.cpp
-	middleware/drm/base64.cpp
-	middleware/drm/DrmJsonObject.cpp
-	middleware/vendor/SocInterface.cpp
-	middleware/vendor/amlogic/AmlogicSocInterface.cpp
-	middleware/vendor/realtek/RealtekSocInterface.cpp
-	middleware/vendor/brcm/BrcmSocInterface.cpp
-	middleware/vendor/default/DefaultSocInterface.cpp
-	middleware/PlayerScheduler.cpp
-	middleware/gstplayertaskpool.cpp
-	middleware/GstHandlerControl.cpp
-	middleware/GstUtils.cpp
-	middleware/InterfacePlayerRDK.cpp
-	middleware/SocUtils.cpp
-	middleware/closedcaptions/PlayerCCManager.cpp
-	middleware/PlayerUtils.cpp
-	middleware/playerLogManager/PlayerLogManager.cpp
-	middleware/playerisobmff/playerisobmffbox.cpp
-	middleware/playerisobmff/playerisobmffbuffer.cpp
-	middleware/subtec/subtecparser/WebVttSubtecParser.cpp
-	middleware/subtec/subtecparser/TtmlSubtecParser.cpp
-	middleware/subtec/subtecparser/WebvttSubtecDevInterface.cpp
-	middleware/subtec/subtecparser/TextStyleAttributes.cpp
-	middleware/playerjsonobject/PlayerJsonObject.cpp
-)
+	test/gstTestHarness/mp4demux.cpp)
 
 if(CMAKE_SOC_PLATFORM_RPI)
 	message("CMAKE_SOC_PLATFORM_RPI set")
@@ -384,93 +354,6 @@ if(CMAKE_USE_RDK_PLUGINS)
 	set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DCREATE_PIPE_SESSION_TO_XRE")
 endif()
 
-if(CMAKE_IARM_MGR)
-	message("CMAKE_IARM_MGR set")
-	if (CMAKE_IARM_MGR_MOCKS)
-		message("CMAKE_IARM_MGR_MOCKS set, building IARM stubs")
-		set(LIBAAMP_MOCK_SOURCES ${LIBAAMP_MOCK_SOURCES} test/mocks/iarmMgrMocks.cpp)
-		set(LIBAAMP_MOCK_DEPENDS -lgmock -lgtest)
-		find_path(STAGING_INCDIR rdk/iarmbus)
-		include_directories(${STAGING_INCDIR}/rdk/iarmbus)
-		find_path(STAGING_INCDIR rdk/tr69hostif)
-		include_directories(${STAGING_INCDIR}/rdk/tr69hostif)
-		find_path(STAGING_INCDIR rdk/ds)
-		include_directories(${STAGING_INCDIR}/rdk/ds
-							${STAGING_INCDIR}/rdk/ds-hal
-							${STAGING_INCDIR}/rdk/ds-rpc)
-		find_path(STAGING_INCDIR rdk/iarmmgrs/ir)
-		include_directories(${STAGING_INCDIR}/rdk/iarmmgrs/ir)
-	endif()
-endif()
-
-# Sources common to all forms of OpenCDM and CDM
-set(LIBAAMP_DRM_SOURCES
-	middleware/drm/DrmSessionManager.cpp
-	middleware/drm/PlayerHlsDrmSessionInterface.cpp
-	middleware/drm/processProtectionHls.cpp
-	middleware/drm/DrmSession.cpp
-	middleware/drm/DrmSessionFactory.cpp
-	middleware/drm/helper/DrmHelperFactory.cpp
-	middleware/drm/DrmUtils.cpp
-	middleware/drm/DrmSystems.h
-	middleware/drm/HlsOcdmBridgeInterface.cpp
-)
-
-if(CMAKE_USE_THUNDER_OCDM_API_0_2)
-	set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DUSE_THUNDER_OCDM_API_0_2")
-endif()
-
-if(CMAKE_USE_OPENCDM_ADAPTER)
-	message("OpenCDM support enabled")
-	set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DUSE_OPENCDM_ADAPTER -DTARGET_LITTLE_ENDIAN=1 -DTARGET_SUPPORTS_UNALIGNED_DWORD_POINTERS=0")
-	set(LIBAAMP_DRM_SOURCES
-		"${LIBAAMP_DRM_SOURCES}"
-		middleware/drm/HlsDrmSessionManager.cpp
-		middleware/drm/HlsOcdmBridge.cpp
-		middleware/drm/processProtectionHls.cpp
-		middleware/drm/ocdm/opencdmsessionadapter.cpp
-		middleware/drm/ocdm/OcdmBasicSessionAdapter.cpp
-		middleware/drm/ocdm/OcdmGstSessionAdapter.cpp
-	)
-
-	# DRM Helpers
-	if(CMAKE_USE_WIDEVINE)
-		set(LIBAAMP_DRM_SOURCES "${LIBAAMP_DRM_SOURCES}" middleware/drm/helper/WidevineDrmHelper.cpp)
-	endif()
-
-	if(CMAKE_USE_CLEARKEY)
-		set(LIBAAMP_DRM_SOURCES "${LIBAAMP_DRM_SOURCES}" middleware/drm/helper/ClearKeyHelper.cpp)
-	endif()
-
-	if(CMAKE_USE_PLAYREADY)
-		set(LIBAAMP_DRM_SOURCES "${LIBAAMP_DRM_SOURCES}" middleware/drm/helper/PlayReadyHelper.cpp)
-	endif()
-
-	if(CMAKE_USE_VERIMATRIX)
-		message("CMAKE_USE_VERIMATRIX set")
-		set(LIBAAMP_DRM_SOURCES "${LIBAAMP_DRM_SOURCES}" middleware/drm/helper/VerimatrixHelper.cpp)
-	endif()
-
-	if(CMAKE_USE_OPENCDM_ADAPTER_MOCKS)
-		set(LIBAAMP_MOCK_SOURCES ${LIBAAMP_MOCK_SOURCES} test/mocks/opencdmMocks.cpp)
-		set(LIBAAMP_MOCK_DEPENDS -lgmock -lgtest)
-	else()
-		set(LIBAAMP_DEPENDS ${LIBAAMP_DEPENDS} "-locdm -lgstvideo-1.0")
-	endif()
-	find_path (STAGING_INCDIR opencdm)
-	include_directories(${STAGING_INCDIR}/opencdm)
-else()
-	message("No OpenCDM support enabled")
-	if(CMAKE_USE_CLEARKEY)
-		message("CMAKE_USE_CLEARKEY set")
-		set(LIBAAMP_DRM_SOURCES
-			"${LIBAAMP_DRM_SOURCES}"
-			middleware/drm/ClearKeyDrmSession.cpp
-			middleware/drm/helper/ClearKeyHelper.cpp
-		)
-		set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DUSE_CLEARKEY")
-	endif()
-endif()
 
 # AAMP Telemetry 2.0 support
 if (CMAKE_TELEMETRY_2_0_REQUIRED)
@@ -482,28 +365,7 @@ if (CMAKE_TELEMETRY_2_0_REQUIRED)
 	endif()
 endif()
 
-if (CMAKE_AAMP_RFC_REQUIRED)
-	message("AAMP RFC set")
-	if(CMAKE_USE_RFC_MOCKS)
-		copy_staging_header_file(tr181api.h)
-		set(LIBAAMP_MOCK_SOURCES ${LIBAAMP_MOCK_SOURCES} test/mocks/rfcMocks.cpp)
-		set(LIBAAMP_MOCK_DEPENDS -lgmock -lgtest)
-	endif()
-endif()
-
-set(AAMP_SUBTEC_SOURCES
-	middleware/playerLogManager/PlayerLogManager.cpp
-	middleware/subtec/libsubtec/PacketSender.cpp
-	middleware/subtec/libsubtec/SubtecChannel.cpp
-)
-
-add_library(subtec SHARED ${AAMP_SUBTEC_SOURCES})
-# Public headers are to be installed
-set(AAMP_SUBTEC_PUBLIC_HEADERS
-	middleware/subtec/libsubtec/SubtecChannel.hpp
-	middleware/subtec/libsubtec/SubtecAttribute.hpp
-	middleware/PlayerMetadata.hpp
-)
+set(AAMP_SUBTEC_CLASS_SOURCES subtec/subtecparser/WebvttSubtecDevParser.cpp)
 set_target_properties(subtec PROPERTIES PUBLIC_HEADER "${AAMP_SUBTEC_PUBLIC_HEADERS}")
 set(AAMP_SUBTEC_COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -DSUBTEC_PACKET_DEBUG=1")
 if(CMAKE_PLATFORM_UBUNTU)
@@ -521,32 +383,6 @@ if (CMAKE_GST_SUBTEC_ENABLED)
 	set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DGST_SUBTEC_ENABLED")
 endif()
 
-if (CMAKE_SUBTITLE_SUPPORT)
-	message("CMAKE_SUBTITLE_SUPPORT set")
-	set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DSUBTITLE_SUPPORTED")
-	find_path(STAGING_INCDIR closedcaption/ccDataReader.h)
-	include_directories(${STAGING_INCDIR}/closedcaption)
-	if (CMAKE_USE_CC_MANAGER_MOCKS)
-		set(LIBAAMP_MOCK_SOURCES ${LIBAAMP_MOCK_SOURCES} test/fakes/ccManagerFakes.cpp)
-	else()
-		set(LIBSUBTECCONNECTOR_DEPENDS pthread rdkCCReader subtec)
-	endif()
-
-	set(LIBSUBTECCONNECTOR_SOURCES
-		${AAMP_SUBTEC_SOURCES}
-		middleware/closedcaptions/subtec/SubtecConnector.cpp
-		middleware/closedcaptions/subtec/CCDataController.cpp
-	)
-
-	add_library(subtec_connector SHARED ${LIBSUBTECCONNECTOR_SOURCES})
-	target_link_libraries(subtec_connector ${LIBSUBTECCONNECTOR_DEPENDS})
-	install(TARGETS subtec_connector
-			DESTINATION lib
-	)
-	set(LIBAAMP_SOURCES "${LIBAAMP_SOURCES}" middleware/closedcaptions/subtec/PlayerSubtecCCManager.cpp)
-	set(LIBAAMP_DEPENDS ${LIBAAMP_DEPENDS} subtec_connector)
-endif()
-
 if (COVERAGE_ENABLED)
 	set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} --coverage")
 	set(LIBAAMP_DEPENDS ${LIBAAMP_DEPENDS} "--coverage")
@@ -582,9 +418,9 @@ if(CMAKE_ENABLE_PTS_RESTAMP)
 	set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DENABLE_PTS_RESTAMP")
 endif()
 
-set(LIBAAMP_SOURCES "${LIBAAMP_SOURCES}" "${LIBAAMP_DRM_SOURCES}" "${LIBAAMP_MOCK_SOURCES}")
+set(LIBAAMP_SOURCES "${LIBAAMP_SOURCES}" "${LIBAAMP_MOCK_SOURCES}")
 add_library(aamp SHARED ${LIBAAMP_SOURCES})
-target_link_libraries(aamp subtec tsb playerfbinterface ${LIBAAMP_DEPENDS} ${LIBAAMP_MOCK_DEPENDS})
+target_link_libraries(aamp tsb playergstinterface playerfbinterface ${LIBAAMP_DEPENDS} ${LIBAAMP_MOCK_DEPENDS})
 set_target_properties(aamp PROPERTIES COMPILE_FLAGS "${LIBAAMP_DEFINES} ${OS_CXX_FLAGS}")
 set_target_properties(aamp PROPERTIES PUBLIC_HEADER "main_aamp.h")
 set_target_properties(aamp PROPERTIES PRIVATE_HEADER "priv_aamp.h")
@@ -605,8 +441,9 @@ set(AAMP_CLI_SOURCES
 	test/aampcli/AampcliSubtecSimulator.cpp
 )
 add_executable(aamp-cli ${AAMP_CLI_SOURCES})
-target_link_libraries(aamp-cli aamp subtec tsb playerfbinterface ${AAMP_CLI_LD_FLAGS} "-lreadline")
+target_link_libraries(aamp-cli aamp tsb playergstinterface playerfbinterface ${AAMP_CLI_LD_FLAGS} "-lreadline")
 #aamp-cli is not an ideal standalone app. It uses private aamp instance for debugging purposes
+
 set_target_properties(aamp-cli PROPERTIES COMPILE_FLAGS "${LIBAAMP_DEFINES} ${OS_CXX_FLAGS}")
 install(TARGETS aamp-cli
 		DESTINATION bin
@@ -658,14 +495,6 @@ xcode_define_schema(gstTestHarness)
 install(FILES 
 	Accessibility.hpp AampEvent.h AampConfig.h AampCMCDCollector.h AampEventManager.h
 	AampDefine.h AampEventListener.h AampMediaType.h AampLogManager.h
-	middleware/drm/DrmMemorySystem.h middleware/drm/DrmSessionManager.h
-	middleware/drm/DrmSystems.h middleware/drm/DrmData.h middleware/drm/DrmInfo.h
-	middleware/drm/DrmMediaFormat.h middleware/drm/DrmCallbacks.h
-	middleware/drm/DrmSession.h middleware/drm/ClearKeyDrmSession.h
-	middleware/drm/DrmUtils.h middleware/drm/DrmSessionFactory.h
-	middleware/drm/ocdm/opencdmsessionadapter.h middleware/PlayerUtils.h
-	middleware/drm/DrmConstants.h middleware/GstUtils.h
-	middleware/drm/helper/DrmHelper.h
 	subtitle/vttCue.h AampUtils.h
 	AampProfiler.h AampConstants.h iso639map.h AampGrowableBuffer.h
 	AampScheduler.h
@@ -683,18 +512,10 @@ install(FILES
 	AampTSBSessionManager.h
 	AampTsbReader.h
 	tsb/api/TsbApi.h
-	middleware/closedcaptions/CCTrackInfo.h
-	middleware/PlayerScheduler.h
-	middleware/gstplayertaskpool.h
-	middleware/GstHandlerControl.h
-	middleware/GstUtils.h
-	middleware/InterfacePlayerRDK.h
-	middleware/SocUtils.h
-	middleware/closedcaptions/PlayerCCManager.h
-	middleware/PlayerUtils.h
 	DESTINATION include
 )
 
+
 if (UTEST_ENABLED)
 	add_subdirectory(test/utests EXCLUDE_FROM_ALL)
 endif()
@@ -705,5 +526,4 @@ endif()
 
 message("LIBAAMP_DEFINES is ${LIBAAMP_DEFINES}")
 message("LIBAAMP_DEPENDS is ${LIBAAMP_DEPENDS}")
-message("LIBAAMP_DRM_SOURCES is ${LIBAAMP_DRM_SOURCES}")
-message("LIBAAMP_SOURCES is ${LIBAAMP_SOURCES}")
+message("LIBAAMP_SOURCES is ${LIBAAMP_SOURCES}")

NOTICE

@@ -8,10 +8,10 @@ listed below. Your use of this material within the component is also subject to
 conditions of these licenses. The LICENSE file contains the text of all the licenses which apply
 within this component, except as indicated in the following paragraph.
 
-The gst-plugins-rdk-aamp directory tree within this component contains some software which is
-Copyright (c) 2022 RDK Management and licensed to you under the LGPL-2.1 License.  The gst-plugins-rdk-aamp
+The gst-plugins directory tree within this component contains some software which is
+Copyright (c) 2022 RDK Management and licensed to you under the LGPL-2.1 License.  The gst-plugins
 directory contains its own license file, called COPYING, which describes the licensing of the
-software under the gst-plugins-rdk-aamp directory.
+software under the gst-plugins directory.
 
 Code in patch files takes the license of the source which is being patched.
 

README.md

@@ -143,7 +143,7 @@ disableLowLatencyABR		Enable/Disable Low Latency ABR. Default: true
 enableLowLatencyCorrection	Enable/Disable Low Latency Correction. Default: false
 enableFogConfig			Enable/Disable setting player configurations to Fog. Default: true
 suppressDecode			Enable/Disable setting to suppress decode of content for playback, only Downloader test. Default: false
-gstSubtecEnabled		Enable/Disable subtec via gstreamer plugins (plugins in gst-plugins-rdk-aamp repo)
+gstSubtecEnabled		Enable/Disable subtec via gstreamer plugins (plugins in middleware/gst-plugins repo)
 sendLicenseResponseHeaders	Enable/Disable Sending License response header as a part of DRMMetadata event(Non SecClient/SecManager DRM license).
 useTCPServerSink		Enable "tcpserverSink" in conjunction with playbin. For use in automated testing when there is no window for video output
 sendUserAgentInLicense		Enable/disable sending user agent in the DRM license request header. Default: disabled.