RDKEMW-13073: L1 test case fail for playerisobmff module

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();
 

InterfacePlayerRDK.cpp

@@ -79,9 +79,6 @@ mSourceSetupCV(), mScheduler(), callbackMap(), setupStreamCallbackMap(), mDrmSys
 	pthread_mutex_init(&interfacePlayerPriv->gstPrivateContext->stream[i].sourceLock, NULL);
 	// start Scheduler Worker for task handling
 	mScheduler.StartScheduler();
-
-	printf("InterfacePlayerRDK created in seperated repo\n");
-	fflush(stdout);
 }
 
 /* InterfacePlayerRDK destructor*/
@@ -1745,24 +1742,27 @@ static void gst_need_data(void *source, guint size, void *_this)
 static void gst_enough_data(GstElement *source, void *_this)
 {
 	InterfacePlayerRDK* pInterfacePlayerRDK = (InterfacePlayerRDK*)_this;
-	InterfacePlayerPriv* privatePlayer = pInterfacePlayerRDK->GetPrivatePlayer();
-	HANDLER_CONTROL_HELPER_CALLBACK_VOID();
 	if(pInterfacePlayerRDK)
 	{
-		if (!pInterfacePlayerRDK->mPauseInjector) // avoid processing enough data if the downloads are already disabled.
-		{
-			GstMediaType mediaType = gstGetMediaTypeForSource(source, pInterfacePlayerRDK);
-			if (mediaType != eGST_MEDIATYPE_DEFAULT)
+		InterfacePlayerPriv* privatePlayer = pInterfacePlayerRDK->GetPrivatePlayer();
+		if(privatePlayer)
+		{	
+			HANDLER_CONTROL_HELPER_CALLBACK_VOID();	
+			if (!pInterfacePlayerRDK->mPauseInjector) // avoid processing enough data if the downloads are already disabled.
 			{
-				struct gst_media_stream *stream = &privatePlayer->gstPrivateContext->stream[mediaType];
-				if(stream)
+				GstMediaType mediaType = gstGetMediaTypeForSource(source, pInterfacePlayerRDK);
+				if (mediaType != eGST_MEDIATYPE_DEFAULT)
 				{
-					int media = static_cast<int>(mediaType);
-					pInterfacePlayerRDK->EnoughDataCb(media);
-				}
-				else
-				{
-					MW_LOG_ERR( "%s Null check failed.", gstGetMediaTypeName(mediaType));
+					struct gst_media_stream *stream = &privatePlayer->gstPrivateContext->stream[mediaType];
+					if(stream)
+					{
+						int media = static_cast<int>(mediaType);
+						pInterfacePlayerRDK->EnoughDataCb(media);
+					}
+					else
+					{
+						MW_LOG_ERR( "%s Null check failed.", gstGetMediaTypeName(mediaType));
+					}
 				}
 			}
 		}
@@ -2906,7 +2906,7 @@ bool InterfacePlayerRDK::HandleVideoBufferSent()
 
 void InterfacePlayerRDK::SetPlayerName(std::string name)
 {
-	interfacePlayerPriv->mPlayerName = name;
+	interfacePlayerPriv->mPlayerName = std::move(name);
 }
 
 /**
@@ -4063,6 +4063,7 @@ static void GstPlayer_OnGstPtsErrorCb(GstElement *object, guint arg0, gpointer a
 {
 	InterfacePlayerPriv* privatePlayer = pInterfacePlayerRDK->GetPrivatePlayer();
 	HANDLER_CONTROL_HELPER_CALLBACK_VOID();
+	MW_LOG_ERR("Got PTS error message from %s", GST_ELEMENT_NAME(object));
 	bool isVideo = false;
 	bool isAudioSink = false;
 	if (privatePlayer->socInterface->IsVideoSinkHandleErrors())

PlayerUtils.cpp

@@ -150,6 +150,10 @@ long long GetCurrentTimeMS(void)
         return (long long)(t.tv_sec*1e3 + t.tv_usec*1e-3);
 }
 
+// Expose for testing
+const char* Test_ParseUriProtocol(const char* uri) {
+    return ParseUriProtocol(uri);
+} 
 /**
  * @brief parse leading protocol from uri if present
  * @param[in] uri manifest/ fragment uri
@@ -184,6 +188,7 @@ static const char * ParseUriProtocol(const char *uri)
 	}
 	return NULL;
 }
+
 /**
  * @brief Resolve file URL from the base and file path
  */
@@ -262,7 +267,7 @@ void trim(std::string& src)
 	{
 		size_t last = src.find_last_not_of(" \n\r\t\f\v");
 		std::string dst = src.substr(first, (last - first + 1));
-		src = dst;
+		src = std::move(dst);
 	}
 }
 

PlayerUtils.h

@@ -94,6 +94,14 @@ void ResolveURL(std::string& dst, std::string base, const char *uri , bool bProp
  */
 long long GetCurrentTimeMS(void);
 
+const char* Test_ParseUriProtocol(const char* uri);
+/**
+ * @brief parse leading protocol from uri if present
+ * @param[in] uri manifest/ fragment uri
+ * @retval return pointer just past protocol (i.e. http://) if present (or) return NULL uri doesn't start with protcol
+ */
+static const char * ParseUriProtocol(const char *uri);
+
 /**
  * @fn trim
  * @param[in][out] src Buffer containing string

baseConversion/_base64.cpp

@@ -35,26 +35,37 @@
  */
 char *base64_Encode(const unsigned char *src, size_t len)
 {
+	if( src == NULL) {
+		//invalid parameters
+		return NULL;
+	}
+	/* handle empty input */
+	if (len == 0)
+	{
+		char *rc = (char*)malloc(1);
+		if (rc) rc[0] = '\0';
+		return rc;
+	}
 	const unsigned char *fin = &src[len];
 	const static char *encode = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; // base64
 	char *rc = (char *)malloc(((len+2)/3)*4+1);
-	if( rc )
+	if(rc == NULL) {
+		return NULL;
+	}
+	char *dst = rc;
+	unsigned int temp;
+	int pad = 0;
+	for( int i=0; i<len; i+=3 )
 	{
-		char *dst = rc;
-		unsigned int temp;
-		int pad = 0;
-		for( int i=0; i<len; i+=3 )
-		{
-			temp = (*src++) << 16;
-			if( src<fin ) temp |= (*src++) << 8; else pad++;
-			if( src<fin ) temp |= (*src++); else pad++;
-			*dst++ = encode[(temp & 0x00FC0000) >> 18];
-			*dst++ = encode[(temp & 0x0003F000) >> 12];
-			*dst++ = (pad>=2)?'=':encode[(temp & 0x00000FC0) >> 6 ];
-			*dst++ = (pad>=1)?'=':encode[(temp & 0x0000003F)];
-		}
-		*dst++ = 0x00;
+		temp = (*src++) << 16;
+		if( src<fin ) temp |= (*src++) << 8; else pad++;
+		if( src<fin ) temp |= (*src++); else pad++;
+		*dst++ = encode[(temp & 0x00FC0000) >> 18];
+		*dst++ = encode[(temp & 0x0003F000) >> 12];
+		*dst++ = (pad>=2)?'=':encode[(temp & 0x00000FC0) >> 6 ];
+		*dst++ = (pad>=1)?'=':encode[(temp & 0x0000003F)];
 	}
+	*dst++ = 0x00;
 	return rc;
 }
 
@@ -64,6 +75,32 @@ char *base64_Encode(const unsigned char *src, size_t len)
  */
 unsigned char *base64_Decode(const char *src, size_t *outLen, size_t srcLen)
 {
+	if (outLen == NULL) 
+	{
+        // invalid parameter
+        return NULL;
+    }
+	*outLen = 0; // default
+
+	if (src == NULL)
+	{
+        // invalid parameter or nothing to decode
+        return NULL;
+    }
+
+	if (srcLen == 0) 
+	{
+		// Empty input: return valid empty buffer
+		unsigned char *emptyBuf = (unsigned char *)malloc(1);
+		if (!emptyBuf) 
+		{
+			return NULL; // malloc failure
+		}
+		*outLen = 0;
+		emptyBuf[0] = '\0';  // optional, for safety
+		return emptyBuf;
+	}
+
 	static const signed char decode[256] =
 	{
 		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -84,45 +121,49 @@ unsigned char *base64_Decode(const char *src, size_t *outLen, size_t srcLen)
 		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	};
 	unsigned char *rc = (unsigned char *)malloc(srcLen*3/4);
+	if (rc == NULL) {
+		// malloc failed
+        return NULL;
+    }
 	*outLen = 0; // default
-	if( rc )
+	unsigned char *dst = rc;
+	while( srcLen>0 && src[srcLen-1] == '=' )
+	{ // strip padding
+		srcLen--;
+	}
+	const char *fin = &src[srcLen];
+	while( src<fin )
 	{
-		unsigned char *dst = rc;
-		while( srcLen>0 && src[srcLen-1] == '=' )
-		{ // strip padding
-			srcLen--;
-		}
-		const char *fin = &src[srcLen];
-		while( src<fin )
+		unsigned int buf = 0;
+		int count = 0;
+		for( int i=0; i<4; i++ )
 		{
-			unsigned int buf = 0;
-			int count = 0;
-			for( int i=0; i<4; i++ )
+			buf<<=6;
+			if( src<fin )
 			{
-				buf<<=6;
-				if( src<fin )
-				{
-					unsigned char c = (unsigned char)*src++;
-					int digit64 = decode[c];
-					if( digit64<0 )
-					{ // invalid character
-						free( rc );
-						return NULL;
-					}
-					buf |= digit64;
-					count++;
+				unsigned char c = (unsigned char)*src++;
+				int digit64 = decode[c];
+				if( digit64<0 )
+				{ // invalid character
+					free( rc );
+					return NULL;
 				}
+				buf |= digit64;
+				count++;
 			}
-			if( count>=2 ) *dst++ = (buf>>(8*2))&0xff;
-			if( count>=3 ) *dst++ = (buf>>(8*1))&0xff;
-			if( count>=4 ) *dst++ = (buf>>(8*0))&0xff;
 		}
-		*outLen = dst-rc;
+		if( count>=2 ) *dst++ = (buf>>(8*2))&0xff;
+		if( count>=3 ) *dst++ = (buf>>(8*1))&0xff;
+		if( count>=4 ) *dst++ = (buf>>(8*0))&0xff;
 	}
+	*outLen = dst-rc;
 	return rc;
 }
 
 unsigned char *base64_Decode(const char *src, size_t *len)
 {
+	if (src == NULL || len == NULL) {
+        return NULL;
+    }
 	return base64_Decode(src, len, strlen(src));
 }

drm/DrmUtils.cpp

@@ -146,6 +146,11 @@ void DrmUtils::convertEndianness(unsigned char *original, unsigned char *guidByt
  */
 std::string DrmUtils::extractWVContentMetadataFromPssh(const char* psshData, int dataLength)
 {
+	if(!psshData)
+	{
+		MW_LOG_WARN("psshData pointer is NULL");
+		return std::string();
+	}
 	//WV PSSH format 4+4+4+16(system id)+4(data size)
 	uint32_t header = 28;
 	std::string metadata;

drm/HlsDrmSessionManager.cpp

@@ -52,11 +52,16 @@ bool HlsDrmSessionManager::isDrmSupported(const struct DrmInfo& drmInfo) const
  */
 std::shared_ptr<HlsDrmBase> HlsDrmSessionManager::createSession(const struct DrmInfo& drmInfo, int  streamTypeIn)
 {
+
 	DrmMediaType streamType = (DrmMediaType)streamTypeIn;
 	std::shared_ptr<HlsDrmBase> bridge = nullptr;
 	DrmHelperPtr drmHelper = DrmHelperEngine::getInstance().createHelper(drmInfo);
 
-	this->GetHlsDrmSessionCb(bridge, drmHelper ,mDrmSession, streamType);
-
+	// copy callback and session to local variables to avoid race conditions
+    auto cb = this->GetHlsDrmSessionCb;
+    auto session = mDrmSession;
+	if (cb) {
+        cb(bridge, drmHelper, session, streamType);
+    }
 	return bridge;
 }

drm/helper/VerimatrixHelper.cpp

@@ -23,6 +23,7 @@
 #include "VerimatrixHelper.h"
 #include "DrmUtils.h"
 #include "DrmConstants.h"
+#include "PlayerLogManager.h"
 
 #define KEYURL_TAG_START "<KeyUrl><![CDATA["
 #define KEYURL_TAG_END "]]></KeyUrl>"
@@ -121,12 +122,14 @@ void VerimatrixHelper::generateLicenseRequest(const ChallengeInfo& challengeInfo
 
 void VerimatrixHelper::transformLicenseResponse(std::shared_ptr<DrmData> licenseResponse) const
 {
+#ifndef UBUNTU
 	if(mDrmInfo.mediaFormat == eMEDIAFORMAT_HLS)
 		licenseResponse->setData((unsigned char*)mDrmInfo.keyURI.c_str(), mDrmInfo.keyURI.length());
 	else if(mDrmInfo.mediaFormat == eMEDIAFORMAT_DASH)
 		licenseResponse->setData((unsigned char*)mKeyID.data(), mKeyID.size());
 	else
 		MW_LOG_WARN("unknown mediaFormat %d", mDrmInfo.mediaFormat);
+#endif
 }
 
 bool VerimatrixHelperFactory::isDRM(const struct DrmInfo& drmInfo) const

drm/ocdm/opencdmsessionadapter.cpp

@@ -424,11 +424,12 @@ void OCDMSessionAdapter:: clearDecryptContext()
 
 	m_eKeyState = KEY_INIT;
 }
-
+#if defined(USE_OPENCDM_ADAPTER)
 void OCDMSessionAdapter::setKeyId(const std::vector<uint8_t>& keyId)
 {
 	m_keyId = keyId;
 }
+#endif
 
 bool OCDMSessionAdapter::verifyOutputProtection()
 {