11881 temp

CMakeLists.txt

@@ -17,7 +17,12 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.5)
-project(Playergstinterface)
+project(Playergstinterface VERSION 0.1.0)
+
+# Set default install prefix
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Default install prefix" FORCE)
+endif()
 set(CMAKE_CXX_STANDARD 17)
 find_package(OpenSSL REQUIRED)
 option(DISABLE_SECURITY_TOKEN "Disable security token" OFF)
@@ -343,6 +348,18 @@ install (TARGETS subtec
 	PUBLIC_HEADER DESTINATION include
 )
 
+# Configure pkg-config file for subtec
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libsubtec.pc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/libsubtec.pc"
+    @ONLY
+)
+
+# Install pkg-config file for subtec
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libsubtec.pc"
+    DESTINATION lib/pkgconfig
+)
+
 if (CMAKE_GST_SUBTEC_ENABLED)
 	set(CMAKE_SUBTITLE_SUPPORT TRUE)
 	message("CMAKE_GST_SUBTEC_ENABLED set")
@@ -369,6 +386,19 @@ if (CMAKE_SUBTITLE_SUPPORT)
 	target_link_libraries(subtec_connector playerlogmanager)
 	install(TARGETS subtec_connector DESTINATION lib)
 
+	# Configure pkg-config file for subtec_connector
+	configure_file(
+	    "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libsubtec_connector.pc.in"
+	    "${CMAKE_CURRENT_BINARY_DIR}/libsubtec_connector.pc"
+	    @ONLY
+	)
+
+	# Install pkg-config file for subtec_connector
+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libsubtec_connector.pc"
+	    DESTINATION lib/pkgconfig
+		)
+
+
 	set(LIBPLAYERGSTINTERFACE_SOURCES ${LIBPLAYERGSTINTERFACE_SOURCES} closedcaptions/subtec/PlayerSubtecCCManager.cpp closedcaptions/rialto/PlayerRialtoCCManager.cpp)
 endif()
 add_library(playergstinterface SHARED ${SOURCES} ${LIBPLAYERGSTINTERFACE_HEADERS} ${LIBPLAYERGSTINTERFACE_SOURCES} ${LIBPLAYERGSTINTERFACE_DRM_SOURCES} ${LIBPLAYERGSTINTERFACE_HELP_SOURCES})
@@ -405,10 +435,24 @@ target_link_libraries(playergstinterface ${GSTVIDEO_LIBRARIES} ${LIBPLAYERGSTINT
 
 set_target_properties(playergstinterface PROPERTIES COMPILE_FLAGS "${LIBPLAYERGSTINTERFACE_DEFINES} ${OS_CXX_FLAGS}")
 
+# Configure pkg-config file
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libplayergstinterface.pc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/libplayergstinterface.pc"
+    @ONLY
+)
+
+
 install(TARGETS playergstinterface
 	LIBRARY DESTINATION lib
 	PUBLIC_HEADER DESTINATION lib/include
 )
+
+# Install pkg-config file
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libplayergstinterface.pc"
+    DESTINATION lib/pkgconfig
+	)
+
 target_link_libraries(subtec playerlogmanager)
 target_link_libraries(playergstinterface ${GSTVIDEO_LIBRARIES} ${LIBPLAYERGSTINTERFACE_DEPENDS})
 target_link_libraries(playergstinterface subtec)

GstHandlerControl.cpp

@@ -60,6 +60,11 @@ GstHandlerControl::ScopeHelper GstHandlerControl::getScopeHelper()
 
 bool GstHandlerControl::waitForDone(int MaximumDelayMilliseconds, std::string name)
 {
+	if (MaximumDelayMilliseconds < 0)
+	{
+		MW_LOG_ERR("Invalid MaximumDelayMilliseconds: %d", MaximumDelayMilliseconds);
+		return false;
+	}
 	const std::chrono::steady_clock::time_point end =
 	std::chrono::milliseconds{MaximumDelayMilliseconds} + std::chrono::steady_clock::now();
 
@@ -74,7 +79,7 @@ bool GstHandlerControl::waitForDone(int MaximumDelayMilliseconds, std::string na
 	if(mInstanceCount)
 	{
 		MW_LOG_ERR("GstPlayer: %d instance%s of %s running", 
-		mInstanceCount, mInstanceCount?"s":"", name.c_str());
+		mInstanceCount, mInstanceCount > 1 ?"s":"", name.c_str());
 		return false;
 	}
 	else

GstUtils.h

@@ -26,7 +26,7 @@
  * @enum GstMediaType
  * @brief Media types
  * 
- * @note Please maintain the order video, audio and subtitle in future.
+ * @note Please maintain the order video, audio, subtitle, and aux_audio in future.
  * This order is to be maintained across fragment, init, and playlist media types.
  * These enums are used in a lot of calculations in AAMP code and breaking the order will bring a lot of issues.
  * This order is also followed in other enums like AampCurlInstance and TrackType.
@@ -36,18 +36,18 @@ enum GstMediaType
         eGST_MEDIATYPE_VIDEO,               /**< Type video */
         eGST_MEDIATYPE_AUDIO,               /**< Type audio */
         eGST_MEDIATYPE_SUBTITLE,            /**< Type subtitle */
-        eGST_MEDIATYPE_RESERVED,            /**< Reserved for future */
+        eGST_MEDIATYPE_AUX_AUDIO,           /**< Type auxiliary audio */
         eGST_MEDIATYPE_MANIFEST,            /**< Type manifest */
         eGST_MEDIATYPE_LICENCE,             /**< Type license */
         eGST_MEDIATYPE_IFRAME,              /**< Type iframe */
         eGST_MEDIATYPE_INIT_VIDEO,          /**< Type video init fragment */
         eGST_MEDIATYPE_INIT_AUDIO,          /**< Type audio init fragment */
         eGST_MEDIATYPE_INIT_SUBTITLE,       /**< Type subtitle init fragment */
-        eGST_MEDIATYPE_INIT_RESERVED,       /**< Reserved for future */
+        eGST_MEDIATYPE_INIT_AUX_AUDIO,      /**< Type auxiliary audio init fragment */
         eGST_MEDIATYPE_PLAYLIST_VIDEO,      /**< Type video playlist */
         eGST_MEDIATYPE_PLAYLIST_AUDIO,      /**< Type audio playlist */
         eGST_MEDIATYPE_PLAYLIST_SUBTITLE,   /**< Type subtitle playlist */
-        eGST_MEDIATYPE_PLAYLIST_RESERVED,   /**< Reserved for future */
+        eGST_MEDIATYPE_PLAYLIST_AUX_AUDIO,  /**< Type auxiliary audio playlist */
         eGST_MEDIATYPE_PLAYLIST_IFRAME,     /**< Type Iframe playlist */
         eGST_MEDIATYPE_INIT_IFRAME,         /**< Type IFRAME init fragment */
         eGST_MEDIATYPE_DSM_CC,              /**< Type digital storage media command and control (DSM-CC) */

InterfacePlayerPriv.h

@@ -42,7 +42,7 @@
 #include "GstUtils.h"
 
 #define GST_ELEMENT_GET_STATE_RETRY_CNT_MAX 5
-#define GST_TRACK_COUNT 3 /**< internal use - audio+video+sub track */
+#define GST_TRACK_COUNT 4 /**< internal use - audio+video+sub+aux track */
 #define VIDEO_COORDINATES_SIZE 32
 #define GST_TASK_ID_INVALID 0
 #define GST_NORMAL_PLAY_RATE 1
@@ -120,10 +120,6 @@ typedef enum
 	eGST_STATE_BLOCKED               /**< 14 - Player has blocked and cant play content*/
 } GstPrivPlayerState;
 
-/**
- * @struct gst_media_stream
- * @brief Holds information about each media stream
- */
 struct gst_media_stream
 {
 	GstElement *sinkbin;              /**< Sink element to consume data */
@@ -225,6 +221,7 @@ struct GstPlayerPriv
 	int decodeErrorCBCount;                                                                  /**< Total decode error cb received within threshold time */
 	bool progressiveBufferingEnabled;
 	bool progressiveBufferingStatus;
+	bool forwardAudioBuffers;                                 /**< flag denotes if audio buffers to be forwarded to aux pipeline */
 	bool enableSEITimeCode;                                   /**< Enables SEI Time Code handling */
 	bool firstVideoFrameReceived;                     /**< flag that denotes if first video frame was notified. */
 	bool firstAudioFrameReceived;                     /**< flag that denotes if first audio frame was notified */
@@ -305,5 +302,13 @@ class InterfacePlayerPriv
 		 * @ret TRUE if override is enabled, FALSE otherwise
 		 */
 		gboolean SendQtDemuxOverrideEvent(int mediaType, GstClockTime pts, bool enablePTSReStamp, int vodTrickModeFPS, const void *ptr = nullptr, size_t len = 0);
+
+		/**
+		 * @fn ForwardBuffersToAuxPipeline
+		 *
+		 * @param[in] buffer - input buffer to be forwarded
+		 */
+		void ForwardBuffersToAuxPipeline(GstBuffer *buffer, bool pauseInjector, void *user_data);
+
 };
 #endif