VPLAY-11143: AAMP Mp4Demux integration

Reason for change: Added function headers, split
up Mp4Demux.hpp to a .h and .cpp. Code cleanup
Test Procedure: Play clear and encrypted content using mp4demux
Risks: Low

Signed-off-by: Vinish100 <[email protected]>

Author: Vinish100

AampDemuxDataTypes.h

@@ -22,22 +22,30 @@
 
 #include <string>
 #include <vector>
+#include <cstring> // for std::memset
 #include "AampGrowableBuffer.h" // for AampGrowableBuffer
 #include "AampTime.h" // for AampTime
 #include "StreamOutputFormat.h" // for StreamOutputFormat
 #include "AampMediaType.h" // for AampMediaType
 
+/*
+ * @struct AampPsshData
+ * @brief PSSH data structure
+ */
 struct AampPsshData
 {
 	std::string systemID; // 16 bytes UUID
 	std::vector<uint8_t> pssh; // variable length
 };
 
+/*
+ * @struct AampCodecInfo
+ * @brief Codec information structure
+ */
 struct AampCodecInfo
 {
 	StreamOutputFormat mCodecFormat; // FORMAT_VIDEO_ES_H264, etc
 	std::vector<uint8_t> mCodecData; // codec private data, e.g. avcC box
-	AampMediaType mType;
 	bool mIsEncrypted;
 	union
 	{
@@ -76,23 +84,30 @@ struct AampCodecInfo
 	}
 };
 
+/*
+ * @struct AampDrmMetadata
+ * @brief DRM metadata for encrypted samples
+ */
 struct AampDrmMetadata
 {
 	bool mIsEncrypted;
 	std::string mKeyId; // 16 bytes UUID
 	std::vector<uint8_t> mIV; // 8 or 16 bytes
 	std::string mCipher; // e.g. 'cenc', 'cbcs'
-	std::string mOriginalMediaType; // 'vide' or 'soun'
 	std::vector<uint8_t> mSubSamples; // optional subsample encryption data
 	uint8_t mCryptByteBlock;
 	uint8_t mSkipByteBlock;
 
-	AampDrmMetadata() : mIsEncrypted(false), mKeyId(), mIV(), mCipher(), mOriginalMediaType(),
+	AampDrmMetadata() : mIsEncrypted(false), mKeyId(), mIV(), mCipher(),
 		mSubSamples(), mCryptByteBlock(0), mSkipByteBlock(0)
 	{
 	}
 };
 
+/*
+ * @struct AampMediaSample
+ * @brief Media sample structure
+ */
 struct AampMediaSample
 {
 	AampGrowableBuffer mData;

CMakeLists.txt

@@ -355,7 +355,7 @@ set(LIBAAMP_SOURCES
 	AampFragmentDescriptor.cpp
 	AampTimeBasedBufferManager.cpp
 	mp4demux/AampMp4Demuxer.cpp mp4demux/AampMp4Demuxer.h
-	mp4demux/Mp4Demux.hpp
+	mp4demux/MP4Demux.cpp mp4demux/MP4Demux.h
 	AampDemuxDataTypes.h
 )
 

StreamSink.h

@@ -393,6 +393,12 @@ class StreamSink
      */
     virtual void NotifyInjectorToPause() {};
 
+    /**
+     * @brief Set stream capabilities based on codec info
+     *
+     * @param[in] type - Media type
+     * @param[in] codecInfo - Codec information
+     */
     virtual void SetStreamCaps(AampMediaType type, const AampCodecInfo &codecInfo) {};
 
 };

aampgstplayer.cpp

@@ -699,6 +699,10 @@ bool AAMPGstPlayer::SendHelper(AampMediaType mediaType, MediaSample sample, bool
 	bool notifyFirstBufferProcessed = false;
 	bool resetTrickUTC = false;
 	bool firstBufferPushed = false;
+	// To be used in buffer control notification
+	double fpts = sample.pts;
+	double fdts = sample.dts;
+	double fDuration = sample.duration;
 
 	// This block checks if the data contain a valid ID3 header and if it is the case
 	// calls the callback function.
@@ -733,8 +737,7 @@ bool AAMPGstPlayer::SendHelper(AampMediaType mediaType, MediaSample sample, bool
 	}
 	if(bPushBuffer)
 	{
-		// TODO: Accessing values from a moved object
-		privateContext->mBufferControl[mediaType].notifyFragmentInject(this, mediaType, sample.pts, sample.dts, sample.duration, discontinuity);
+		privateContext->mBufferControl[mediaType].notifyFragmentInject(this, mediaType, fpts, fdts, fDuration, discontinuity);
 	}
 	if (eMEDIATYPE_VIDEO == mediaType)
 	{
@@ -1327,18 +1330,24 @@ void AAMPGstPlayer::StopMonitorAvTimer()
 	}
 }
 
+/**
+ * @brief Set stream capabilities based on codec info
+ *
+ * @param[in] type - Media type
+ * @param[in] codecInfo - Codec information
+ */
 void AAMPGstPlayer::SetStreamCaps(AampMediaType type, const AampCodecInfo &codecInfo)
 {
 	CodecInfo gstCodecInfo;
 	gstCodecInfo.codecFormat = (GstStreamOutputFormat)codecInfo.mCodecFormat;
 	gstCodecInfo.codecData = std::move(codecInfo.mCodecData);
 	gstCodecInfo.isEncrypted = codecInfo.mIsEncrypted;
-	if (codecInfo.mType == eMEDIATYPE_VIDEO)
+	if (type == eMEDIATYPE_VIDEO)
 	{
 		gstCodecInfo.info.video.width = codecInfo.mInfo.video.mWidth;
 		gstCodecInfo.info.video.height = codecInfo.mInfo.video.mHeight;
 	}
-	else if (codecInfo.mType == eMEDIATYPE_AUDIO)
+	else if (type == eMEDIATYPE_AUDIO)
 	{
 		gstCodecInfo.info.audio.channelCount = codecInfo.mInfo.audio.mChannelCount;
 		gstCodecInfo.info.audio.sampleRate = codecInfo.mInfo.audio.mSampleRate;
@@ -1367,7 +1376,6 @@ bool AAMPGstPlayer::SendSample(AampMediaType mediaType, AampMediaSample& sample)
 		gstSample.drmMetadata.cipher = std::move(sample.mDrmMetadata.mCipher);
 		gstSample.drmMetadata.cryptByteBlock = sample.mDrmMetadata.mCryptByteBlock;
 		gstSample.drmMetadata.skipByteBlock = sample.mDrmMetadata.mSkipByteBlock;
-		gstSample.drmMetadata.originalMediaType = std::move(sample.mDrmMetadata.mOriginalMediaType);
 	}
 	else
 	{

aampgstplayer.h

@@ -44,6 +44,9 @@ struct AAMPGstPlayerPriv;
 */
 class SegmentInfo_t;
 
+// Forward declaration of MediaSample
+struct MediaSample;
+
 /**
  * @struct TaskControlData
  * @brief data for scheduling and handling asynchronous tasks
@@ -427,6 +430,12 @@ class AAMPGstPlayer : public StreamSink
 	 */
 	int GetMonitorAVInterval() const { return mMonitorAVInterval; }
 
+	/**
+     * @brief Set stream capabilities based on codec info
+     *
+     * @param[in] type - Media type
+     * @param[in] codecInfo - Codec information
+     */
 	void SetStreamCaps(AampMediaType type, const AampCodecInfo &codecInfo) override;
 
 private:

middleware/InterfacePlayerRDK.cpp

@@ -239,7 +239,14 @@ const char *gstGetMediaTypeName(GstMediaType mediaType)
 
 
 static GstStateChangeReturn SetStateWithWarnings(GstElement *element, GstState targetState);
+
+/**
+ * @brief Decorate a GstBuffer with DRM metadata
+ * @param[in] buffer The GstBuffer to decorate
+ * @param[in] drmMetadata The DRM metadata
+ */
 static void DecorateGstBufferWithDrmMetadata(GstBuffer *buffer, const MediaDrmMetadata &drmMetadata);
+
 /**
  * @brief Configures the GStreamer pipeline.
  * @param format Video format.
@@ -2995,6 +3002,22 @@ void InterfacePlayerRDK::SetPlayerName(std::string name)
 	interfacePlayerPriv->mPlayerName = name;
 }
 
+/**
+ *  @brief Create GstBuffer with data copied from input data pointer
+ */
+static GstBuffer* CreateGstBufferWithData(gconstpointer data, gsize size)
+{
+	GstBuffer *buffer = gst_buffer_new_and_alloc(size);
+	if (buffer)
+	{
+		GstMapInfo map;
+		gst_buffer_map(buffer, &map, GST_MAP_WRITE);
+		memcpy(map.data, data, size );
+		gst_buffer_unmap(buffer, &map);
+	}
+	return buffer;
+}
+
 /**
  *  @brief Inject stream buffer to gstreamer pipeline
  */
@@ -3076,14 +3099,10 @@ bool InterfacePlayerRDK::SendHelper(int type, MediaSample sample, bool copy, boo
 
 		if(copy)
 		{
-			buffer = gst_buffer_new_and_alloc((guint)sample.dataSize);
+			buffer = CreateGstBufferWithData(sample.data, sample.dataSize);
 
 			if (buffer)
 			{
-				GstMapInfo map;
-				gst_buffer_map(buffer, &map, GST_MAP_WRITE);
-				memcpy(map.data, sample.data, sample.dataSize);
-				gst_buffer_unmap(buffer, &map);
 				GST_BUFFER_PTS(buffer) = pts;
 				GST_BUFFER_DTS(buffer) = dts;
 				GST_BUFFER_DURATION(buffer) = duration;
@@ -5296,6 +5315,11 @@ double InterfacePlayerRDK::FlushTrack(int mediaType, double pos, double audioDel
 	return rate;
 }
 
+/**
+ * @brief Sets the stream capabilities.
+ * @param[in] type The media type.
+ * @param[in] codecInfo The codec information.
+ */
 void InterfacePlayerRDK::SetStreamCaps(GstMediaType type, const CodecInfo &codecInfo)
 {
 	GstCaps *caps = GetCaps(codecInfo.codecFormat);
@@ -5374,19 +5398,11 @@ void InterfacePlayerRDK::SetStreamCaps(GstMediaType type, const CodecInfo &codec
 	}
 }
 
-static GstBuffer* CreateGstBufferWithData(gconstpointer data, gsize size)
-{
-	GstBuffer *buffer = gst_buffer_new_and_alloc( size );
-	if (buffer)
-	{
-		GstMapInfo map;
-		gst_buffer_map(buffer, &map, GST_MAP_WRITE);
-		memcpy(map.data, data, size );
-		gst_buffer_unmap(buffer, &map);
-	}
-	return buffer;
-}
-
+/**
+ * @brief Decorate a GstBuffer with DRM metadata
+ * @param[in] buffer The GstBuffer to decorate
+ * @param[in] drmMetadata The DRM metadata
+ */
 void DecorateGstBufferWithDrmMetadata(GstBuffer *buffer, const MediaDrmMetadata &drmMetadata)
 {
 	GstStructure *metadata = NULL;
@@ -5397,8 +5413,6 @@ void DecorateGstBufferWithDrmMetadata(GstBuffer *buffer, const MediaDrmMetadata
 										"application/x-cenc",
 										"encrypted", G_TYPE_BOOLEAN, TRUE,
 										"kid", GST_TYPE_BUFFER, kidBuffer,
-										// TODO: deprecate original-media-type from drmMetadata
-										//"original-media-type", G_TYPE_STRING, drmMetadata.originalMediaType.c_str(),
 										// TODO : cipher-mode to be added in caps and not drmMetadata
 										"cipher-mode", G_TYPE_STRING, drmMetadata.cipher.c_str(),
 										NULL);
@@ -5446,9 +5460,10 @@ void DecorateGstBufferWithDrmMetadata(GstBuffer *buffer, const MediaDrmMetadata
 	}
 
 	if (metadata)
-	{ // serialize and print the metadata
+	{
+		// serialize and print the metadata
 		gchar *metaStr = gst_structure_to_string( metadata );
-		MW_LOG_INFO("metadata: %s\n", metaStr);
+		MW_LOG_INFO("Added drm metadata: %s\n", metaStr);
 		g_free(metaStr);
 
 		gst_buffer_add_protection_meta(buffer, metadata);

middleware/InterfacePlayerRDK.h

@@ -146,7 +146,7 @@ enum class InterfaceCB
 	startNewSubtitleStream // Add more events here if needed
 };
 
-
+// Codec information structure
 struct CodecInfo
 {
 	GstStreamOutputFormat codecFormat; // 'avc1', 'mp4a', etc
@@ -166,20 +166,31 @@ struct CodecInfo
 			uint16_t height;
 		} video;
 	} info;
+
+	CodecInfo() : codecFormat(GST_FORMAT_INVALID), codecData(), isEncrypted(false)
+	{
+		memset(&info, 0, sizeof(info));
+	}
 };
 
+// DRM metadata structure
 struct MediaDrmMetadata
 {
 	bool isEncrypted;
 	std::string keyId; // 16 bytes UUID
 	std::vector<uint8_t> iv; // 8 or 16 bytes
 	std::string cipher; // e.g. 'cenc', 'cbcs'
-	std::string originalMediaType; // 'vide' or 'soun'
 	std::vector<uint8_t> subSamples; // optional subsample encryption data
 	uint8_t cryptByteBlock;
 	uint8_t skipByteBlock;
+
+	MediaDrmMetadata() : isEncrypted(false), keyId(), iv(), cipher(),
+		subSamples(), cryptByteBlock(0), skipByteBlock(0)
+	{
+	}
 };
 
+// Media sample structure
 struct MediaSample
 {
 	const void *data;
@@ -188,7 +199,11 @@ struct MediaSample
 	double dts;
 	double duration;
 	double ptsOffset;
-    MediaDrmMetadata drmMetadata; // DRM metadata
+	MediaDrmMetadata drmMetadata;
+
+	MediaSample() : data(nullptr), dataSize(0), pts(0.0), dts(0.0), duration(0.0), ptsOffset(0.0), drmMetadata()
+	{
+	}
 };
 
 // Class to encapsulate GStreamer-related functionality
@@ -812,6 +827,11 @@ class InterfacePlayerRDK
 		 */
 		const MonitorAVState& GetMonitorAVState();
 
+		/**
+		 * @brief Sets the stream capabilities.
+		 * @param[in] type The media type.
+		 * @param[in] codecInfo The codec information.
+		 */
 		void SetStreamCaps(GstMediaType type, const CodecInfo &codecInfo);
 
 	private:

mp4demux/AampMp4Demuxer.cpp

@@ -31,7 +31,7 @@
 AampMp4Demuxer::AampMp4Demuxer(PrivateInstanceAAMP* aamp, AampMediaType type) :
     MediaProcessor(), mMp4Demux(nullptr), mAamp(aamp), mEnable(true), mMediaType(type)
 {
-    AAMPLOG_INFO("AampMp4Demuxer Constructor");
+    AAMPLOG_WARN("Created AampMp4Demuxer(%p) for type %d", this, type);
     mMp4Demux = new Mp4Demux();
 }
 
@@ -40,7 +40,7 @@ AampMp4Demuxer::AampMp4Demuxer(PrivateInstanceAAMP* aamp, AampMediaType type) :
  */
 AampMp4Demuxer::~AampMp4Demuxer()
 {
-    AAMPLOG_INFO("AampMp4Demuxer Destructor");
+    AAMPLOG_DEBUG("AampMp4Demuxer destructor");
     if (mMp4Demux)
     {
         delete mMp4Demux;
@@ -82,13 +82,13 @@ bool AampMp4Demuxer::sendSegment(AampGrowableBuffer* pBuffer, double position, d
         else
         {
             const AampCodecInfo& codecInfo = mMp4Demux->getCodecInfo();
-            AAMPLOG_WARN("Updating codecInfo:%d", codecInfo.mCodecFormat);
+            AAMPLOG_WARN("Updating codecInfo with format:%d", codecInfo.mCodecFormat);
             mAamp->SetStreamCaps(mMediaType, codecInfo);
         }
     }
     else
     {
-        AAMPLOG_WARN("AampMp4Demuxer::sendSegment Invalid buffer or demuxer disabled");
+        AAMPLOG_WARN("Invalid buffer or demuxer disabled");
     }
     ptsError = false;
     return ret;

mp4demux/AampMp4Demuxer.h

@@ -26,7 +26,7 @@
 #define __AAMPMP4DEMUXER_H__
 
 #include "mediaprocessor.h"
-#include "Mp4Demux.hpp"
+#include "MP4Demux.h"
 #include "priv_aamp.h"
 
 class AampMp4Demuxer : public MediaProcessor