Feature/vplay 11066 rialto standalone liblink

CMakeLists.txt

@@ -27,7 +27,8 @@ function(xcode_define_schema new_schema)
 endfunction()
 
 project (AAMP)
-set(CMAKE_CXX_STANDARD 11)
+#set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format -Wno-multichar -Wno-non-virtual-dtor -Wno-psabi")
@@ -95,8 +96,8 @@ if(CMAKE_PLATFORM_UBUNTU OR CMAKE_SYSTEM_NAME STREQUAL Darwin)
 			COMMAND bash -c "xcrun --show-sdk-path" OUTPUT_VARIABLE osxSdkPath OUTPUT_STRIP_TRAILING_WHITESPACE
 		)
 		set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -g -x objective-c++ -Wno-inconsistent-missing-override -F${osxSdkPath}/System/Library/Frameworks")
-		set(OS_LD_FLAGS "${OS_LD_FLAGS} -F${osxSdkPath}/System/Library/Frameworks -framework Cocoa -L${osxSdkPath}/../MacOSX.sdk/usr/lib -L.libs/lib -L/usr/local/lib/")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isysroot ${osxSdkPath}/../MacOSX.sdk -I/usr/local/include")
+		set(OS_LD_FLAGS "${OS_LD_FLAGS} -F${osxSdkPath}/System/Library/Frameworks -framework Cocoa -L${osxSdkPath}/../MacOSX26.1.sdk/usr/lib -L.libs/lib -L/usr/local/lib/")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isysroot ${osxSdkPath}/../MacOSX26.1.sdk -I/usr/local/include")
 		string(STRIP ${OS_LD_FLAGS} OS_LD_FLAGS)
 		pkg_check_modules(GSTREAMERVIDEO REQUIRED gstreamer-video-1.0)
 		set(AAMP_CLI_LD_FLAGS ${AAMP_CLI_LD_FLAGS} ${GSTREAMERVIDEO_LINK_LIBRARIES})
@@ -456,29 +457,47 @@ set(GSTTESTHARNESS_DEPENDS
 	${CURL_LINK_LIBRARIES}
 )
 set(GSTTESTHARNESS_SOURCES
-	test/gstTestHarness/gst-port.cpp
-	test/gstTestHarness/gst-port.h
-	test/gstTestHarness/gst-utils.cpp
-	test/gstTestHarness/gst-utils.h
-	test/gstTestHarness/gst-test.cpp
-	test/gstTestHarness/gst-test.h
+	test/gstTestHarness/rialto-api-test.cpp
+	test/gstTestHarness/rialto-gst-pipeline.cpp
+	test/gstTestHarness/rialto-gst-pipeline.h
 	test/gstTestHarness/mp4demux.hpp
-	test/gstTestHarness/dash_adapter.cpp
-	test/gstTestHarness/dash_adapter.hpp
-	test/gstTestHarness/downloader.cpp
-	test/gstTestHarness/downloader.hpp
-	test/gstTestHarness/stream_utils.cpp
-	test/gstTestHarness/stream_utils.hpp
-	test/gstTestHarness/string_utils.cpp
-	test/gstTestHarness/string_utils.hpp
-	test/gstTestHarness/tsdemux.hpp
-	test/gstTestHarness/turbo_xml.hpp
 )
-add_executable(gstTestHarness ${GSTTESTHARNESS_SOURCES})
-target_link_libraries(gstTestHarness ${GSTTESTHARNESS_DEPENDS} "-lreadline")
-install(TARGETS gstTestHarness
-		DESTINATION bin
+
+find_path( RIALTO_INCLUDE_DIR NAMES IMediaPipeline.h PATH_SUFFIXES rialto)
+
+
+find_library( RIALTO_LIBRARY NAMES libRialtoClient.so RialtoClient )
+
+include( FindPackageHandleStandardArgs )
+
+find_package_handle_standard_args( RIALTO DEFAULT_MSG
+        RIALTO_LIBRARY RIALTO_INCLUDE_DIR )
+
+mark_as_advanced(
+    RIALTO_INCLUDE_DIR
+    RIALTO_LIBRARY
+    RIALTO_GSTREAMER_INCLUDE_DIR
 )
+
+if( RIALTO_FOUND )
+    set( RIALTO_LIBRARIES ${RIALTO_LIBRARY} )
+    set(RIALTO_INCLUDE_DIRS
+		${RIALTO_INCLUDE_DIR}
+		${RIALTO_GSTREAMER_INCLUDE_DIR}
+)
+endif()
+
+if( RIALTO_FOUND AND NOT TARGET Rialto::RialtoClient )
+    add_library( Rialto::RialtoClient SHARED IMPORTED )
+    set_target_properties( Rialto::RialtoClient PROPERTIES
+            IMPORTED_LOCATION "${RIALTO_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${RIALTO_INCLUDE_DIR}" )
+endif()
+
+add_executable(gstTestHarness ${GSTTESTHARNESS_SOURCES})
+target_link_libraries(gstTestHarness ${GSTTESTHARNESS_DEPENDS} "-lreadline" Rialto::RialtoClient)
+
+install(TARGETS gstTestHarness DESTINATION bin)
 # XCode schema target
 xcode_define_schema(gstTestHarness)
 
@@ -507,7 +526,6 @@ install(FILES
 	DESTINATION include
 )
 
-
 if (UTEST_ENABLED)
 	add_subdirectory(test/utests EXCLUDE_FROM_ALL)
 endif()

test/gstTestHarness/mp4demux.hpp

@@ -53,7 +53,7 @@ struct Mp4Sample
 
 class Mp4Demux
 {
-private:
+public: // temp workaround - used directly in rialtoTest
 	struct
 	{
 		uint16_t channel_count;