VPLAY-11143: AAMP Mp4Demux Integration

Vinish100 · Vinish100 · commit 72c6d26b8e6d · 2025-11-24T18:19:24.000+05:30
Reason for change: Ensure coding guidelines are
strictly followed. Code cleanup. Enforce encrypted
caps are persisted when processing clear samples
in between
Test Procedure: As mentioned in the ticket
Risks: None

Signed-off-by: Vinish100 &lt;vinish.balan@gmail.com&gt;
diff --git a/AampDemuxDataTypes.h b/AampDemuxDataTypes.h
@@ -82,6 +82,19 @@ struct AampCodecInfo
 	{
 		std::memset(&mInfo, 0, sizeof(mInfo));
 	}
+
+	AampCodecInfo(AampCodecInfo&& other) noexcept
+        : mCodecFormat(other.mCodecFormat)
+        , mCodecData(std::move(other.mCodecData))
+        , mIsEncrypted(other.mIsEncrypted)
+        , mInfo(other.mInfo)
+    {
+        // Reset the source object to default state
+        other.mCodecFormat = FORMAT_INVALID;
+        other.mIsEncrypted = false;
+        std::memset(&other.mInfo, 0, sizeof(other.mInfo));
+        // mCodecData is already empty after std::move
+    }
 };
 
 /*
diff --git a/ElementaryProcessor.cpp b/ElementaryProcessor.cpp
@@ -83,7 +83,6 @@ bool ElementaryProcessor::setTuneTimePTS(char *segment, const size_t& size, doub
 
 	AAMPLOG_INFO("ElementaryProcessor:: sending segment at pos:%f dur:%f", position, duration);
 
-	// Logic for Audio Track
 	// Wait for video to parse PTS
 	std::unique_lock<std::mutex> guard(accessMutex);
 
diff --git a/StreamAbstractionAAMP.h b/StreamAbstractionAAMP.h
@@ -1993,8 +1993,6 @@ class StreamAbstractionAAMP : public AampLicenseFetcher
 	 */	
 	void ReinitializeInjection(double rate);
 
-	virtual void GetStreamCodecInfo (AampCodecInfo &videoCodec, AampCodecInfo &audioCodec, AampCodecInfo &textCodec) { (void)videoCodec; (void)audioCodec; (void)textCodec; }
-
 protected:
 	/**
 	 *   @brief Get stream information of a profile from subclass.
diff --git a/StreamOutputFormat.h b/StreamOutputFormat.h
@@ -31,6 +31,7 @@ enum StreamOutputFormat
     FORMAT_ISO_BMFF,        /**< ISO Base Media File format */
     FORMAT_AUDIO_ES_MP3,    /**< MP3 Audio Elementary Stream */
     FORMAT_AUDIO_ES_AAC,    /**< AAC Audio Elementary Stream */
+    FORMAT_AUDIO_ES_AAC_RAW,/**< AAC Raw Audio Elementary Stream */
     FORMAT_AUDIO_ES_AC3,    /**< AC3 Audio Elementary Stream */
     FORMAT_AUDIO_ES_EC3,    /**< Dolby Digital Plus Elementary Stream */
     FORMAT_AUDIO_ES_ATMOS,  /**< ATMOS Audio stream */
diff --git a/fragmentcollector_mpd.cpp b/fragmentcollector_mpd.cpp
@@ -10483,17 +10483,23 @@ StreamOutputFormat GetSubtitleFormat(std::string mimeType)
  */
 void StreamAbstractionAAMP_MPD::GetStreamFormat(StreamOutputFormat &primaryOutputFormat, StreamOutputFormat &audioOutputFormat, StreamOutputFormat &auxOutputFormat, StreamOutputFormat &subtitleOutputFormat)
 {
+	StreamOutputFormat format = FORMAT_ISO_BMFF; // Default format
+	if (ISCONFIGSET(eAAMPConfig_UseMp4Demux))
+	{
+		// Mp4Demuxer will set the format later once the init fragment is parsed
+		format = FORMAT_UNKNOWN;
+	}
 	if(mMediaStreamContext[eMEDIATYPE_VIDEO] && mMediaStreamContext[eMEDIATYPE_VIDEO]->enabled )
 	{
-		primaryOutputFormat = FORMAT_ISO_BMFF;
+		primaryOutputFormat = format;
 	}
 	else
 	{
 		primaryOutputFormat = FORMAT_INVALID;
 	}
 	if(mMediaStreamContext[eMEDIATYPE_AUDIO] && mMediaStreamContext[eMEDIATYPE_AUDIO]->enabled )
 	{
-		audioOutputFormat = FORMAT_ISO_BMFF;
+		audioOutputFormat = format;
 	}
 	else
 	{
@@ -10503,6 +10509,8 @@ void StreamAbstractionAAMP_MPD::GetStreamFormat(StreamOutputFormat &primaryOutpu
 	if ((mMediaStreamContext[eMEDIATYPE_AUX_AUDIO] && mMediaStreamContext[eMEDIATYPE_AUX_AUDIO]->enabled) ||
 		(mMediaStreamContext[eMEDIATYPE_SUBTITLE] && mMediaStreamContext[eMEDIATYPE_SUBTITLE]->enabled && mMediaStreamContext[eMEDIATYPE_SUBTITLE]->type == eTRACK_AUX_AUDIO))
 	{
+		// Mp4Demuxer is not used in aux audio track as of now, so setting FORMAT_ISO_BMFF directly
+		// Aux audio to be deprecated soon
 		auxOutputFormat = FORMAT_ISO_BMFF;
 	}
 	else
@@ -10533,6 +10541,7 @@ void StreamAbstractionAAMP_MPD::GetStreamFormat(StreamOutputFormat &primaryOutpu
 			else
 			{
 				AAMPLOG_INFO("mimeType empty");
+				// Mp4Demux is skipped for subtitles
 				subtitleOutputFormat = FORMAT_SUBTITLE_MP4;
 			}
 		}
@@ -14212,35 +14221,4 @@ bool StreamAbstractionAAMP_MPD::DoStreamSinkFlushOnDiscontinuity()
 void StreamAbstractionAAMP_MPD::clearFirstPTS(void)
 {
 	mFirstPTS = 0.0;
-}
-
-void StreamAbstractionAAMP_MPD::GetStreamCodecInfo(AampCodecInfo &videoCodec, AampCodecInfo &audioCodec, AampCodecInfo &textCodec)
-{
-	// Initialize with unknown format
-	videoCodec = AampCodecInfo(FORMAT_UNKNOWN);
-	audioCodec = AampCodecInfo(FORMAT_UNKNOWN);
-	textCodec = AampCodecInfo(FORMAT_UNKNOWN);
-
-	// Aux audio to be deprecated in future
-	for (const auto& mediaStreamContext : mMediaStreamContext)
-	{
-		// TODO: Optimize later
-		if (mediaStreamContext && mediaStreamContext->enabled && mediaStreamContext->playContext)
-		{
-			switch (mediaStreamContext->type)
-			{
-				case eTRACK_VIDEO:
-					videoCodec = mediaStreamContext->playContext->getCodecInfo();
-					break;
-				case eTRACK_AUDIO:
-					audioCodec = mediaStreamContext->playContext->getCodecInfo();
-					break;
-				case eTRACK_SUBTITLE:
-					textCodec = mediaStreamContext->playContext->getCodecInfo();
-					break;
-				default:
-					break;
-			}
-		}
-	}
 }
diff --git a/fragmentcollector_mpd.h b/fragmentcollector_mpd.h
@@ -528,8 +528,6 @@ class StreamAbstractionAAMP_MPD : public StreamAbstractionAAMP
 	 */
 	void clearFirstPTS(void) override;
 
-	void GetStreamCodecInfo (AampCodecInfo &videoCodec, AampCodecInfo &audioCodec, AampCodecInfo &textCodec) override;
-
 protected:
 	/**
 	 * @fn StartFromAampLocalTsb
diff --git a/isobmff/isobmffprocessor.h b/isobmff/isobmffprocessor.h
@@ -490,8 +490,6 @@ class IsoBmffProcessor : public MediaProcessor
 	 */
 	bool updatePTSAndTimeScaleFromBuffer(AampGrowableBuffer *pBuffer);
 
-	const AampCodecInfo& getCodecInfo() override { static AampCodecInfo info(FORMAT_ISO_BMFF); return info; };
-
 	PrivateInstanceAAMP *p_aamp;
 	timeScaleChangeStateType timeScaleChangeState;
 	MediaFormat mediaFormat;
diff --git a/mediaprocessor.h b/mediaprocessor.h
@@ -213,10 +213,5 @@ class MediaProcessor
 	 * @brief Function to abort wait for videoPTS arrival
 	 */
 	virtual void abortWaitForVideoPTS() {}
-
-	/**
-	 * @brief Function to get codec information
-	 */
-	virtual const AampCodecInfo& getCodecInfo() { static AampCodecInfo info(FORMAT_UNKNOWN); return info; }
 };
 #endif /* __MEDIA_PROCESSOR_H__ */
diff --git a/middleware/GstUtils.cpp b/middleware/GstUtils.cpp
@@ -52,6 +52,12 @@ GstCaps* GetCaps(GstStreamOutputFormat format)
 					"mpegversion", G_TYPE_INT, 2,
 					"stream-format", G_TYPE_STRING, "adts", NULL);
 			break;
+		case GST_FORMAT_AUDIO_ES_AAC_RAW:
+			caps = gst_caps_new_simple ("audio/mpeg",
+					"mpegversion", G_TYPE_INT, 4,
+					"framed", G_TYPE_BOOLEAN, TRUE,
+					"stream-format", G_TYPE_STRING, "raw", NULL);
+			break;
 		case GST_FORMAT_AUDIO_ES_AC3:
 			caps = gst_caps_new_simple ("audio/x-ac3", NULL, NULL);
 			break;
diff --git a/middleware/GstUtils.h b/middleware/GstUtils.h
@@ -66,6 +66,7 @@ enum GstStreamOutputFormat
         GST_FORMAT_ISO_BMFF,        /**< ISO Base Media File format */
         GST_FORMAT_AUDIO_ES_MP3,    /**< MP3 Audio Elementary Stream */
         GST_FORMAT_AUDIO_ES_AAC,    /**< AAC Audio Elementary Stream */
+        GST_FORMAT_AUDIO_ES_AAC_RAW,/**< AAC Raw Audio Elementary Stream */
         GST_FORMAT_AUDIO_ES_AC3,    /**< AC3 Audio Elementary Stream */
         GST_FORMAT_AUDIO_ES_EC3,    /**< Dolby Digital Plus Elementary Stream */
         GST_FORMAT_AUDIO_ES_ATMOS,  /**< ATMOS Audio stream */
diff --git a/mp4demux/AampMp4Demuxer.cpp b/mp4demux/AampMp4Demuxer.cpp
@@ -71,7 +71,7 @@ bool AampMp4Demuxer::sendSegment(AampGrowableBuffer* pBuffer, double position, d
     {
         AAMPLOG_WARN("Processing segment with type:%d position: %f, duration: %f, isInit: %d", mMediaType, position, duration, isInit);
         mMp4Demux->Parse(pBuffer->GetPtr(), pBuffer->GetLen());
-        auto &samples = mMp4Demux->getSamples();
+        auto samples = mMp4Demux->GetSamples();
         if (samples.size() > 0)
         {
             for (auto& sample : samples)
@@ -81,7 +81,7 @@ bool AampMp4Demuxer::sendSegment(AampGrowableBuffer* pBuffer, double position, d
         }
         else
         {
-            const AampCodecInfo& codecInfo = mMp4Demux->getCodecInfo();
+            auto codecInfo = mMp4Demux->GetCodecInfo();
             AAMPLOG_WARN("Updating codecInfo with format:%d", codecInfo.mCodecFormat);
             mAamp->SetStreamCaps(mMediaType, codecInfo);
         }
@@ -92,9 +92,4 @@ bool AampMp4Demuxer::sendSegment(AampGrowableBuffer* pBuffer, double position, d
     }
     ptsError = false;
     return ret;
-}
-
-const AampCodecInfo& AampMp4Demuxer::getCodecInfo()
-{
-    return mMp4Demux->getCodecInfo();
 }
diff --git a/mp4demux/AampMp4Demuxer.h b/mp4demux/AampMp4Demuxer.h
@@ -122,8 +122,6 @@ class AampMp4Demuxer : public MediaProcessor
 	 */
 	void setTrackOffset(double offset) override { }
 
-	virtual const AampCodecInfo& getCodecInfo() override;
-
 private:
     bool mEnable;
     Mp4Demux* mMp4Demux;
diff --git a/mp4demux/MP4Demux.cpp b/mp4demux/MP4Demux.cpp
diff --git a/mp4demux/MP4Demux.h b/mp4demux/MP4Demux.h
diff --git a/priv_aamp.cpp b/priv_aamp.cpp
diff --git a/test/aampcli/AampcliPlaybackCommand.cpp b/test/aampcli/AampcliPlaybackCommand.cpp

Original file line number	Diff line number	Diff line change
`@@ -10483,17 +10483,23 @@ StreamOutputFormat GetSubtitleFormat(std::string mimeType)`
`10483`	`10483`	`*/`
`10484`	`10484`	`void StreamAbstractionAAMP_MPD::GetStreamFormat(StreamOutputFormat &primaryOutputFormat, StreamOutputFormat &audioOutputFormat, StreamOutputFormat &auxOutputFormat, StreamOutputFormat &subtitleOutputFormat)`
`10485`	`10485`	`{`
	`10486`	`+ StreamOutputFormat format = FORMAT_ISO_BMFF; // Default format`
	`10487`	`+ if (ISCONFIGSET(eAAMPConfig_UseMp4Demux))`
	`10488`	`+ {`
	`10489`	`+ // Mp4Demuxer will set the format later once the init fragment is parsed`
	`10490`	`+ format = FORMAT_UNKNOWN;`
	`10491`	`+ }`
`10486`	`10492`	`if(mMediaStreamContext[eMEDIATYPE_VIDEO] && mMediaStreamContext[eMEDIATYPE_VIDEO]->enabled )`
`10487`	`10493`	`{`
`10488`		`- primaryOutputFormat = FORMAT_ISO_BMFF;`
	`10494`	`+ primaryOutputFormat = format;`
`10489`	`10495`	`}`
`10490`	`10496`	`else`
`10491`	`10497`	`{`
`10492`	`10498`	`primaryOutputFormat = FORMAT_INVALID;`
`10493`	`10499`	`}`
`10494`	`10500`	`if(mMediaStreamContext[eMEDIATYPE_AUDIO] && mMediaStreamContext[eMEDIATYPE_AUDIO]->enabled )`
`10495`	`10501`	`{`
`10496`		`- audioOutputFormat = FORMAT_ISO_BMFF;`
	`10502`	`+ audioOutputFormat = format;`
`10497`	`10503`	`}`
`10498`	`10504`	`else`
`10499`	`10505`	`{`
`@@ -10503,6 +10509,8 @@ void StreamAbstractionAAMP_MPD::GetStreamFormat(StreamOutputFormat &primaryOutpu`
`10503`	`10509`	`if ((mMediaStreamContext[eMEDIATYPE_AUX_AUDIO] && mMediaStreamContext[eMEDIATYPE_AUX_AUDIO]->enabled) \|\|`
`10504`	`10510`	`(mMediaStreamContext[eMEDIATYPE_SUBTITLE] && mMediaStreamContext[eMEDIATYPE_SUBTITLE]->enabled && mMediaStreamContext[eMEDIATYPE_SUBTITLE]->type == eTRACK_AUX_AUDIO))`
`10505`	`10511`	`{`
	`10512`	`+ // Mp4Demuxer is not used in aux audio track as of now, so setting FORMAT_ISO_BMFF directly`
	`10513`	`+ // Aux audio to be deprecated soon`
`10506`	`10514`	`auxOutputFormat = FORMAT_ISO_BMFF;`
`10507`	`10515`	`}`
`10508`	`10516`	`else`
`@@ -10533,6 +10541,7 @@ void StreamAbstractionAAMP_MPD::GetStreamFormat(StreamOutputFormat &primaryOutpu`
`10533`	`10541`	`else`
`10534`	`10542`	`{`
`10535`	`10543`	`AAMPLOG_INFO("mimeType empty");`
	`10544`	`+ // Mp4Demux is skipped for subtitles`
`10536`	`10545`	`subtitleOutputFormat = FORMAT_SUBTITLE_MP4;`
`10537`	`10546`	`}`
`10538`	`10547`	`}`
`@@ -14212,35 +14221,4 @@ bool StreamAbstractionAAMP_MPD::DoStreamSinkFlushOnDiscontinuity()`
`14212`	`14221`	`void StreamAbstractionAAMP_MPD::clearFirstPTS(void)`
`14213`	`14222`	`{`
`14214`	`14223`	`mFirstPTS = 0.0;`
`14215`		`-}`
`14216`		`-`
`14217`		`-void StreamAbstractionAAMP_MPD::GetStreamCodecInfo(AampCodecInfo &videoCodec, AampCodecInfo &audioCodec, AampCodecInfo &textCodec)`
`14218`		`-{`
`14219`		`- // Initialize with unknown format`
`14220`		`- videoCodec = AampCodecInfo(FORMAT_UNKNOWN);`
`14221`		`- audioCodec = AampCodecInfo(FORMAT_UNKNOWN);`
`14222`		`- textCodec = AampCodecInfo(FORMAT_UNKNOWN);`
`14223`		`-`
`14224`		`- // Aux audio to be deprecated in future`
`14225`		`- for (const auto& mediaStreamContext : mMediaStreamContext)`
`14226`		`- {`
`14227`		`- // TODO: Optimize later`
`14228`		`- if (mediaStreamContext && mediaStreamContext->enabled && mediaStreamContext->playContext)`
`14229`		`- {`
`14230`		`- switch (mediaStreamContext->type)`
`14231`		`- {`
`14232`		`- case eTRACK_VIDEO:`
`14233`		`- videoCodec = mediaStreamContext->playContext->getCodecInfo();`
`14234`		`- break;`
`14235`		`- case eTRACK_AUDIO:`
`14236`		`- audioCodec = mediaStreamContext->playContext->getCodecInfo();`
`14237`		`- break;`
`14238`		`- case eTRACK_SUBTITLE:`
`14239`		`- textCodec = mediaStreamContext->playContext->getCodecInfo();`
`14240`		`- break;`
`14241`		`- default:`
`14242`		`- break;`
`14243`		`- }`
`14244`		`- }`
`14245`		`- }`
`14246`	`14224`	`}`