RDK-37712: [RDK-37711] -[AAMP]Common-Media-Client-Data (CMCD) extensions

Reason for change: Read Network metrics like startTransferTime,
totalTime, dnsLookuptime and send it along with CMCD
Headers. Also adding enableCMCD player config to fog.

Test Procedure: Tested steps on ticket

Risks: Medium

Signed-off-by: Reshma Raphael <[email protected]>
Change-Id: I0e03941b0b2cdb7aa5df5df469630e2ac44f39a4

Author: Reshma-001

AampConfig.cpp

@@ -480,7 +480,7 @@ void AampConfig::Initialize()
 	bAampCfgValue[eAAMPConfig_EnableCurlStore].value		= true;
 	bAampCfgValue[eAAMPConfig_RuntimeDRMConfig].value			=	false;
 	bAampCfgValue[eAAMPConfig_EnablePublishingMuxedAudio].value		=	false;
-	bAampCfgValue[eAAMPConfig_EnableCMCD].value				=	false;
+	bAampCfgValue[eAAMPConfig_EnableCMCD].value				=	true;
 	bAampCfgValue[eAAMPConfig_EnableSlowMotion].value			=	true;
 	bAampCfgValue[eAAMPConfig_EnableSCTE35PresentationTime].value			=	false;
 

MediaStreamContext.cpp

@@ -90,10 +90,10 @@ bool MediaStreamContext::CacheFragment(std::string fragmentUrl, unsigned int cur
 
         if(!bReadfromcache)
         {
-            ret = aamp->LoadFragment(bucketType, fragmentUrl,effectiveUrl, &cachedFragment->fragment, curlInstance,
+            ret = aamp->LoadFragment(pCMCDMetrics,bucketType, fragmentUrl,effectiveUrl, &cachedFragment->fragment, curlInstance,
                     range, actualType, &httpErrorCode, &downloadTime, &bitrate, &iFogError, fragmentDurationSeconds );
 			if ( initSegment && ret )
-            aamp->getAampCacheHandler()->InsertToInitFragCache ( fragmentUrl, &cachedFragment->fragment, effectiveUrl, actualType);
+            			aamp->getAampCacheHandler()->InsertToInitFragCache ( fragmentUrl, &cachedFragment->fragment, effectiveUrl, actualType);
         }
 
         if (iCurrentRate != AAMP_NORMAL_PLAY_RATE)

MediaStreamContext.h

@@ -50,12 +50,21 @@ class MediaStreamContext : public MediaTrack
             lastSegmentTime(0), lastSegmentNumber(0), lastSegmentDuration(0), adaptationSetIdx(0), representationIndex(0), profileChanged(true),
             adaptationSetId(0), fragmentDescriptor(), context(ctx), initialization(""),
             mDownloadedFragment(), discontinuity(false), mSkipSegmentOnError(true),
-            downloadedDuration(0)
-	   , scaledPTO(0)
+            downloadedDuration(0)//,mCMCDNetworkMetrics{-1,-1,-1}
+	   , scaledPTO(0),pCMCDMetrics(NULL)
 	   , failAdjacentSegment(false),httpErrorCode(0)
     {
         memset(&mDownloadedFragment, 0, sizeof(GrowableBuffer));
         fragmentDescriptor.bUseMatchingBaseUrl = ISCONFIGSET(eAAMPConfig_MatchBaseUrl);
+	if(ISCONFIGSET(eAAMPConfig_EnableCMCD))
+	{
+		if(mediaType == eMEDIATYPE_VIDEO)
+			pCMCDMetrics = new VideoCMCDHeaders();
+		else if(mediaType == eMEDIATYPE_AUDIO)
+			pCMCDMetrics = new AudioCMCDHeaders();
+		else if(mediaType == eMEDIATYPE_SUBTITLE)
+			pCMCDMetrics = new SubtitleCMCDHeaders();
+	}
     }
 
     /**
@@ -64,6 +73,7 @@ class MediaStreamContext : public MediaTrack
     ~MediaStreamContext()
     {
         aamp_Free(&mDownloadedFragment);
+	delete pCMCDMetrics;
     }
 
     /**
@@ -143,6 +153,7 @@ class MediaStreamContext : public MediaTrack
     bool IsAtEndOfTrack();
 
     MediaType mediaType;
+    CMCDHeaders *pCMCDMetrics;/**<pointer object to class CMCDHeaders*/
     struct FragmentDescriptor fragmentDescriptor;
     const IAdaptationSet *adaptationSet;
     const IRepresentation *representation;

StreamAbstractionAAMP.h

@@ -34,6 +34,13 @@
 
 #include <glib.h>
 #include "subtitleParser.h"
+#include <CMCDHeaders.h>
+#include <AudioCMCDHeaders.h>
+#include <VideoCMCDHeaders.h>
+#include <ManifestCMCDHeaders.h>
+#include <SubtitleCMCDHeaders.h>
+
+
 
 /**
  * @brief Media Track Types

fragmentcollector_hls.cpp

@@ -1775,7 +1775,7 @@ bool TrackState::FetchFragmentHelper(long &http_error, bool &decryption_error, b
 			std::string tempEffectiveUrl;
 			AAMPLOG_TRACE(" Calling Getfile . buffer %p avail %d", &cachedFragment->fragment, (int)cachedFragment->fragment.avail);
 			bool fetched = aamp->GetFile(fragmentUrl, &cachedFragment->fragment,
-			 tempEffectiveUrl, &http_error, &downloadTime, range, type, false, (MediaType)(type), NULL, NULL, fragmentDurationSeconds);
+			 tempEffectiveUrl, &http_error, &downloadTime, range, type, false, (MediaType)(type), NULL, NULL, fragmentDurationSeconds,pCMCDMetrics);
 			//Workaround for 404 of subtitle fragments
 			//TODO: This needs to be handled at server side and this workaround has to be removed
 			if (!fetched && http_error == 404 && type == eTRACK_SUBTITLE)
@@ -4001,7 +4001,7 @@ AAMPStatusType StreamAbstractionAAMP_HLS::Init(TuneType tuneType)
 		std::string mainManifestOrigUrl = aamp->GetManifestUrl();
 		double downloadTime;
 		aamp->SetCurlTimeout(aamp->mManifestTimeoutMs, eCURLINSTANCE_MANIFEST_PLAYLIST);
-		(void) aamp->GetFile(aamp->GetManifestUrl(), &this->mainManifest, aamp->GetManifestUrl(), &http_error, &mainManifestdownloadTime, NULL, eCURLINSTANCE_MANIFEST_PLAYLIST, true, eMEDIATYPE_MANIFEST);//CID:82578 - checked return
+		(void) aamp->GetFile(aamp->GetManifestUrl(), &this->mainManifest, aamp->GetManifestUrl(), &http_error, &mainManifestdownloadTime, NULL, eCURLINSTANCE_MANIFEST_PLAYLIST, true, eMEDIATYPE_MANIFEST,NULL,NULL,0,pCMCDMetrics);//CID:82578 - checked return
 		updateVideoEndMetrics = true;
 		aamp->SetCurlTimeout(aamp->mPlaylistTimeoutMs, eCURLINSTANCE_MANIFEST_PLAYLIST);
 		if (this->mainManifest.len)
@@ -5637,7 +5637,7 @@ StreamAbstractionAAMP_HLS::StreamAbstractionAAMP_HLS(AampLogManager *logObj, cla
 	rate(rate), maxIntervalBtwPlaylistUpdateMs(DEFAULT_INTERVAL_BETWEEN_PLAYLIST_UPDATES_MS), mainManifest(), allowsCache(false), seekPosition(seekpos), mTrickPlayFPS(),
 	enableThrottle(false), firstFragmentDecrypted(false), mStartTimestampZero(false), mNumberOfTracks(0), midSeekPtsOffset(0),
 	lastSelectedProfileIndex(0), segDLFailCount(0), segDrmDecryptFailCount(0), mMediaCount(0),mProfileCount(0),
-	mLangList(),mIframeAvailable(false), thumbnailManifest(), indexedTileInfo(),
+	mLangList(),mIframeAvailable(false), thumbnailManifest(), indexedTileInfo(),pCMCDMetrics(NULL),
 	mFirstPTS(0)
 {
 #ifndef AVE_DRM
@@ -5659,6 +5659,10 @@ StreamAbstractionAAMP_HLS::StreamAbstractionAAMP_HLS(AampLogManager *logObj, cla
 	memset(&trackState[0], 0x00, sizeof(trackState));
 	aamp->CurlInit(eCURLINSTANCE_VIDEO, DEFAULT_CURL_INSTANCE_COUNT,aamp->GetNetworkProxy());
 	memset(streamInfo, 0, sizeof(*streamInfo));
+	if(ISCONFIGSET(eAAMPConfig_EnableCMCD))
+	{
+		pCMCDMetrics = new ManifestCMCDHeaders();
+	}
 
 }
 
@@ -5687,8 +5691,8 @@ TrackState::TrackState(AampLogManager *logObj, TrackType type, StreamAbstraction
 		mPlaylistIndexed(), mDiscoCheckMutex(), mDiscoCheckComplete(), mTrackDrmMutex(), mPlaylistType(ePLAYLISTTYPE_UNDEFINED), mReachedEndListTag(false),
 		mByteOffsetCalculation(false),mSkipAbr(false),
 		mCheckForInitialFragEnc(false), mFirstEncInitFragmentInfo(NULL), mDrmMethod(eDRM_KEY_METHOD_NONE)
-		,mXStartTimeOFfset(0), mCulledSecondsAtStart(0.0)
-		,mProgramDateTime(0.0)
+		,mXStartTimeOFfset(0), mCulledSecondsAtStart(0.0)//, mCMCDNetworkMetrics{-1,-1,-1}
+		,mProgramDateTime(0.0),pCMCDMetrics(NULL)
 		,mDiscontinuityCheckingOn(false)
 		,mSkipSegmentOnError(true)
 {
@@ -5705,6 +5709,15 @@ TrackState::TrackState(AampLogManager *logObj, TrackType type, StreamAbstraction
 	mCulledSecondsAtStart = aamp->culledSeconds;
 	mProgramDateTime = aamp->mProgramDateTime;
 	AAMPLOG_INFO("Restore PDT (%f) ",mProgramDateTime);
+	if(ISCONFIGSET(eAAMPConfig_EnableCMCD))
+	{
+		if(type == eTRACK_VIDEO)
+			pCMCDMetrics = new VideoCMCDHeaders();
+		else if(type == eTRACK_AUDIO)
+			pCMCDMetrics = new AudioCMCDHeaders();
+		else if(type == eTRACK_SUBTITLE)
+			pCMCDMetrics = new SubtitleCMCDHeaders();
+	}
 }
 
 
@@ -5738,6 +5751,7 @@ TrackState::~TrackState()
 	pthread_cond_destroy(&mPlaylistIndexed);
 	pthread_mutex_destroy(&mPlaylistMutex);
 	pthread_mutex_destroy(&mTrackDrmMutex);
+	delete pCMCDMetrics;
 
 }
 
@@ -5806,6 +5820,7 @@ StreamAbstractionAAMP_HLS::~StreamAbstractionAAMP_HLS()
 	aamp_Free(&this->mainManifest);
 	aamp->CurlTerm(eCURLINSTANCE_VIDEO, DEFAULT_CURL_INSTANCE_COUNT);
 	aamp->SyncEnd();
+	delete pCMCDMetrics;
 }
 
 /**

fragmentcollector_hls.h

@@ -523,6 +523,7 @@ class TrackState : public MediaTrack
 	KeyHashTable mKeyHashTable;
 	bool mCheckForInitialFragEnc;           /**< Flag that denotes if we should check for encrypted init header and push it to GStreamer*/
 	DrmKeyMethod mDrmMethod;                /**< denotes the X-KEY method for the fragment of interest */
+	CMCDHeaders *pCMCDMetrics;		/**<pointer object to class CMCDHeaders*/
 
 private:
 	bool refreshPlaylist;	                /**< bool flag to indicate if playlist refresh required or not */
@@ -793,6 +794,7 @@ class StreamAbstractionAAMP_HLS : public StreamAbstractionAAMP
 	bool firstFragmentDecrypted;				/**< Flag indicating if first fragment is decrypted for stream */
 	bool mStartTimestampZero;				/**< Flag indicating if timestamp to start is zero or not (No audio stream) */
 	int mNumberOfTracks;					/**< Number of media tracks.*/
+	CMCDHeaders *pCMCDMetrics;				/**<pointer object to class CMCDHeaders*/
 	/***************************************************************************
          * @fn ParseMainManifest
          *

fragmentcollector_mpd.cpp

@@ -314,7 +314,7 @@ StreamAbstractionAAMP_MPD::StreamAbstractionAAMP_MPD(AampLogManager *logObj, cla
 	,mHasServerUtcTime(0)
 	,latencyMonitorThreadStarted(false),prevLatencyStatus(LATENCY_STATUS_UNKNOWN),latencyStatus(LATENCY_STATUS_UNKNOWN),latencyMonitorThreadID(0)
 	,mStreamLock()
-	,mProfileCount(0)
+	,mProfileCount(0),pCMCDMetrics(NULL)
 	,mLiveTimeFragmentSync(false)
 	,mSubtitleParser()
 {
@@ -387,6 +387,10 @@ StreamAbstractionAAMP_MPD::StreamAbstractionAAMP_MPD(AampLogManager *logObj, cla
 	}
 
 	trickplayMode = (rate != AAMP_NORMAL_PLAY_RATE);
+	if(ISCONFIGSET(eAAMPConfig_EnableCMCD))
+	{
+		pCMCDMetrics = new ManifestCMCDHeaders();
+	}
 }
 
 static void GetBitrateInfoFromCustomMpd( const IAdaptationSet *adaptationSet, std::vector<Representation *>& representations );
@@ -5123,7 +5127,7 @@ AAMPStatusType StreamAbstractionAAMP_MPD::UpdateMPD(bool init)
 		memset(&manifest, 0, sizeof(manifest));
 		aamp->profiler.ProfileBegin(PROFILE_BUCKET_MANIFEST);
 		aamp->SetCurlTimeout(aamp->mManifestTimeoutMs,eCURLINSTANCE_VIDEO);
-		gotManifest = aamp->GetFile(manifestUrl, &manifest, manifestUrl, &http_error, &downloadTime, NULL, eCURLINSTANCE_VIDEO, true, eMEDIATYPE_MANIFEST);
+		gotManifest = aamp->GetFile(manifestUrl, &manifest, manifestUrl, &http_error, &downloadTime, NULL, eCURLINSTANCE_VIDEO, true, eMEDIATYPE_MANIFEST,NULL,NULL,0,pCMCDMetrics);
 		aamp->SetCurlTimeout(aamp->mNetworkTimeoutMs,eCURLINSTANCE_VIDEO);
 		//update videoend info
 		updateVideoEndMetrics = true;
@@ -9894,6 +9898,7 @@ StreamAbstractionAAMP_MPD::~StreamAbstractionAAMP_MPD()
 	memset(aamp->GetLLDashServiceData(),0x00,sizeof(AampLLDashServiceData));
 	aamp->SetLowLatencyServiceConfigured(false);
 	aamp->SyncEnd();
+	delete pCMCDMetrics;
 }
 
 /**

fragmentcollector_mpd.h

@@ -792,6 +792,7 @@ class StreamAbstractionAAMP_MPD : public StreamAbstractionAAMP
 	bool IsPeriodEncrypted(IPeriod *period);
 
 	std::mutex mStreamLock;
+	CMCDHeaders *pCMCDMetrics;/**<pointer object to class CMCDHeaders*/
 	bool fragmentCollectorThreadStarted;
 	std::set<std::string> mLangList;
 	double seekPosition;