Feature/xre 19922

CMakeLists.txt

@@ -274,6 +274,7 @@ install(FILES closedcaptions/CCTrackInfo.h
 	subtec/libsubtec/SubtecPacket.hpp
 	playerisobmff/playerisobmffbuffer.h
 	playerisobmff/playerisobmffbox.h
+	closedcaptions/direct-rialto/IDirectRialtoCC.h
 	DESTINATION include)
 
 # Install the generated version header
@@ -476,7 +477,7 @@ if (CMAKE_SUBTITLE_SUPPORT)
 		)
 
 
-	set(LIBPLAYERGSTINTERFACE_SOURCES ${LIBPLAYERGSTINTERFACE_SOURCES} closedcaptions/subtec/PlayerSubtecCCManager.cpp closedcaptions/rialto/PlayerRialtoCCManager.cpp)
+	set(LIBPLAYERGSTINTERFACE_SOURCES ${LIBPLAYERGSTINTERFACE_SOURCES} closedcaptions/subtec/PlayerSubtecCCManager.cpp closedcaptions/rialto/PlayerRialtoCCManager.cpp closedcaptions/direct-rialto/PlayerDirectRialtoCCManager.cpp)
 endif()
 add_library(playergstinterface SHARED ${SOURCES} ${LIBPLAYERGSTINTERFACE_HEADERS} ${LIBPLAYERGSTINTERFACE_SOURCES} ${LIBPLAYERGSTINTERFACE_DRM_SOURCES} ${LIBPLAYERGSTINTERFACE_HELP_SOURCES})
 
@@ -490,6 +491,7 @@ target_include_directories(playergstinterface PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}/playerjsonobject
 	${CMAKE_CURRENT_SOURCE_DIR}/closedcaptions
 	${CMAKE_CURRENT_SOURCE_DIR}/closedcaptions/subtec
+	${CMAKE_CURRENT_SOURCE_DIR}/closedcaptions/direct-rialto
 	${CMAKE_CURRENT_SOURCE_DIR}/vendor)
 
 if (CMAKE_SUBTITLE_SUPPORT)

DemuxDataTypes.h

@@ -94,6 +94,11 @@ struct MediaCodecInfo
 	GstStreamOutputFormat mCodecFormat; // GST_FORMAT_VIDEO_ES_H264, etc
 	std::vector<uint8_t> mCodecData; // codec private data, e.g. avcC box
 	bool mIsEncrypted;
+	// True when NAL units are length-prefixed (AVCC/HVCC, e.g. avcC/hvcC
+	// sample entries per ISO/IEC 14496-15); false for Annex-B (start-code
+	// delimited) bitstreams such as HLS-TS ES output. Meaningless for
+	// non-NAL-unit codecs (audio/subtitle), where it stays false.
+	bool mNaluLengthPrefixed;
 	union
 	{
 		struct
@@ -116,7 +121,7 @@ struct MediaCodecInfo
 	 *       Uniform initialization is preferred for C++ types as it's type-safe, clearer in intent,
 	 *       and works correctly with all C++ types including those with constructors.
 	 */
-	MediaCodecInfo() : mCodecFormat(GST_FORMAT_INVALID), mIsEncrypted(false), mCodecData(), mInfo{0}
+	MediaCodecInfo() : mCodecFormat(GST_FORMAT_INVALID), mIsEncrypted(false), mNaluLengthPrefixed(false), mCodecData(), mInfo{0}
 	{
 	}
 
@@ -128,7 +133,7 @@ struct MediaCodecInfo
 	 *       Uniform initialization is preferred for C++ types as it's type-safe, clearer in intent,
 	 *       and works correctly with all C++ types including those with constructors.
 	 */
-	MediaCodecInfo(GstStreamOutputFormat format) : mCodecFormat(format), mIsEncrypted(false), mCodecData(), mInfo{0}
+	MediaCodecInfo(GstStreamOutputFormat format) : mCodecFormat(format), mIsEncrypted(false), mNaluLengthPrefixed(false), mCodecData(), mInfo{0}
 	{
 	}
 
@@ -144,6 +149,7 @@ struct MediaCodecInfo
         : mCodecFormat(exchange(other.mCodecFormat, GST_FORMAT_INVALID))
         , mCodecData(exchange(other.mCodecData, {}))
         , mIsEncrypted(exchange(other.mIsEncrypted, false))
+        , mNaluLengthPrefixed(exchange(other.mNaluLengthPrefixed, false))
         , mInfo(exchange(other.mInfo, {})) // POD union - exchange with zero-initialized union
     {
     }
@@ -160,12 +166,24 @@ struct MediaCodecInfo
 			mCodecFormat = exchange(other.mCodecFormat, GST_FORMAT_INVALID);
 			mCodecData = exchange(other.mCodecData, {});
 			mIsEncrypted = exchange(other.mIsEncrypted, false);
+			mNaluLengthPrefixed = exchange(other.mNaluLengthPrefixed, false);
 			mInfo = exchange(other.mInfo, {}); // POD union - exchange with zero-initialized union
 		}
 		return *this;
 	}
 };
 
+/*
+ * @struct StreamCodecInfo
+ * @brief Codec information for all tracks in a stream
+ */
+struct StreamCodecInfo
+{
+	MediaCodecInfo video;
+	MediaCodecInfo audio;
+	MediaCodecInfo subtitle;
+};
+
 /*
  * @struct MediaDrmMetadata
  * @brief DRM metadata for encrypted samples

InterfacePlayerPriv.h

@@ -125,6 +125,7 @@ struct gst_media_stream
 	GstElement *sinkbin;              /**< Sink element to consume data */
 	GstElement *source;                       /**< to provide data to the pipeline */
 	GstStreamOutputFormat format; /**< Stream output format for this stream */
+	MediaCodecInfo codecInfo; /**< Codec and encryption information for this stream */
 	bool pendingSeek;                         /**< Flag denotes if a seek event has to be sent to the source */
 	bool resetPosition;                       /**< To indicate that the position of the stream is reset */
 	bool bufferUnderrun;
@@ -137,7 +138,7 @@ struct gst_media_stream
 	GstPad *demuxPad;                  /**< Demux src pad >*/
 	gulong demuxProbeId;       /**< Demux pad probe ID >*/
 
-	gst_media_stream() : sinkbin(NULL), source(NULL), format(GST_FORMAT_INVALID),
+	gst_media_stream() : sinkbin(NULL), source(NULL), format(GST_FORMAT_INVALID), codecInfo(),
 	pendingSeek(false), resetPosition(false),
 	bufferUnderrun(false), eosReached(false), sourceConfigured(false), sourceLock(PTHREAD_MUTEX_INITIALIZER), timeScale(1), trackId(-1), firstBufferProcessed(false), demuxPad(NULL), demuxProbeId(0)
 	{