Merge branch 'develop' into feature/RDK-59937_federated_2511

Author: psiva01

.gitignore

@@ -24,4 +24,3 @@ Linux/googletest/
 test/l2test/result/
 test/l2test/data/aamp/*
 **/*.swp
-qtdemuxAnalyzer

AampTsbReader.cpp

@@ -350,7 +350,7 @@ void AampTsbReader::CheckPeriodBoundary(TsbFragmentDataPtr currFragment)
 		TsbFragmentDataPtr adjFragment = currFragment->prev;
 		if (adjFragment)
 		{
-			// Calculate the expected PTS of the current fragment by adding the
+      // Calculate the expected PTS of the current fragment by adding the
 			// duration of the previous fragment to its PTS.
 			AampTime nextPTSCal = adjFragment->GetPTS() + adjFragment->GetDuration();
 
@@ -485,4 +485,4 @@ AampTime AampTsbReader::GetFirstPTSOffset()
 AampTime AampTsbReader::GetStartPosition()
 {
 	return mStartPosition;
-}
+}

drm/AampDRMLicManager.cpp

@@ -130,13 +130,12 @@ AampDRMLicenseManager::AampDRMLicenseManager(int maxDrmSessions, PrivateInstance
  */
 AampDRMLicenseManager::~AampDRMLicenseManager()
 {
-        SAFE_DELETE(mLicensePrefetcher);
+	SAFE_DELETE(mLicensePrefetcher);
 	SAFE_DELETE(mDrmSessionManager);
 	releaseLicenseRenewalThreads();
 	for(int i = 0 ; i < mMaxDRMSessions;i++)  
-        {
-
-             mLicenseDownloader[i].Release();
+	{
+		mLicenseDownloader[i].Release();
 	}
 	SAFE_DELETE_ARRAY( mLicenseDownloader );
 }
@@ -1442,8 +1441,8 @@ void AampDRMLicenseManager::UpdateMaxDRMSessions(int maxSessions)
 {
 	mDrmSessionManager->UpdateMaxDRMSessions(maxSessions);
 	SAFE_DELETE_ARRAY( mLicenseDownloader );
-        mLicenseDownloader = new AampCurlDownloader[maxSessions];
-        mLicenseRenewalThreads.resize(maxSessions);
+    mLicenseDownloader = new AampCurlDownloader[maxSessions];
+    mLicenseRenewalThreads.resize(maxSessions);
 }
 
 void AampDRMLicenseManager::clearDrmSession(bool forceClearSession)

middleware/InterfacePlayerRDK.cpp

@@ -3148,7 +3148,6 @@ bool InterfacePlayerRDK::SendHelper(int type, const void *ptr, size_t len, doubl
 						double pts = mp4Demux->getPts(i);
 						double dts = mp4Demux->getDts(i);
 						double dur = mp4Demux->getDuration(i);
-						GstStructure *drm = mp4Demux->getDrmMetadata(i);
 						gpointer data = g_malloc(sampleLen);
 						if( data )
 						{
@@ -3157,10 +3156,6 @@ bool InterfacePlayerRDK::SendHelper(int type, const void *ptr, size_t len, doubl
 							GST_BUFFER_PTS(gstBuffer) = (GstClockTime)(pts * GST_SECOND);
 							GST_BUFFER_DTS(gstBuffer) = (GstClockTime)(dts * GST_SECOND);
 							GST_BUFFER_DURATION(gstBuffer) = (GstClockTime)(dur * 1000000000LL);
-							if (drm)
-							{
-								gst_buffer_add_protection_meta(gstBuffer, drm);
-							}
 							GstFlowReturn ret = gst_app_src_push_buffer(GST_APP_SRC(stream->source),gstBuffer);
 							if( ret == GST_FLOW_OK )
 							{

middleware/externals/CMakeLists.txt

@@ -56,6 +56,12 @@ if(DISABLE_SECURITY_TOKEN)
 	add_definitions(-DDISABLE_SECURITY_TOKEN)
 endif()
 
+option(DISABLE_SECURITY_TOKEN "Disable security token" OFF)
+
+if(DISABLE_SECURITY_TOKEN)
+	add_definitions(-DDISABLE_SECURITY_TOKEN)
+endif()
+
 # uncomment below to build additional drm support in simulator
 # set(CMAKE_USE_OPENCDM_ADAPTER TRUE)
 # set(CMAKE_USE_OPENCDM_ADAPTER_MOCKS TRUE)

priv_aamp.cpp

@@ -7712,7 +7712,6 @@ void PrivateInstanceAAMP::Stop( bool isDestructing )
 	{
 		mMPDDownloaderInstance->Release();
 	}
-
 	if(mTSBSessionManager)
 	{
 		// Clear all the local TSB data

test/aampcli/AampcliPlaybackCommand.cpp

@@ -1072,7 +1072,6 @@ void PlaybackCommand::addCommand(std::string command,std::string description)
 }
 
 #include "mp4demux.hpp"
-Mp4Demux mp4Demux = Mp4Demux(true);
 void PlaybackCommand::parse( const char *path )
 {
 	while( *path == ' ' )
@@ -1096,21 +1095,10 @@ void PlaybackCommand::parse( const char *path )
 					size_t rc = fread(ptr,1,len,f);
 					if( rc == len )
 					{
+						auto mp4Demux = new Mp4Demux(true);
 						// coverity[TAINTED_SCALAR]:SUPPRESS
-						mp4Demux.Parse(ptr,len);
-						int count = mp4Demux.count();
-						for (int i=0; i<count; i++)
-						{
-							AAMPCLI_PRINTF("Sample No:%d, PTR:%p, SIZE:%zu, PTS:%lf, DTS:%lf, DUR:%lf DRM:%d\n",
-									i + 1,
-									mp4Demux.getPtr(i),
-									mp4Demux.getLen(i),
-									mp4Demux.getPts(i),
-									mp4Demux.getDts(i),
-									mp4Demux.getDuration(i),
-									mp4Demux.getDrmMetadata(i) ? 1 : 0
-									);
-						}
+						mp4Demux->Parse(ptr,len);
+						delete mp4Demux;
 					}
 					free( ptr );
 				}

test/gstTestHarness/mp4demux.hpp

@@ -250,8 +250,8 @@ class Mp4Demux
 		gst_buffer_unref(pssh);
 	}
 
-	void dump_auxiliary_information( void )
-	{
+	void process_auxiliary_information( void )
+	{ // redundant with parseSampleEncryptionBox?
 		size_t sample_count = cenc_aux_info_sizes.size();
 		if( sample_count && got_auxiliary_information_offset )
 		{
@@ -367,7 +367,7 @@ class Mp4Demux
 				PRINTF( "\n" );
 			}
 		}
-		dump_auxiliary_information();
+		process_auxiliary_information();
 	}
 
 	void parseAuxInfo( void )
@@ -404,7 +404,7 @@ class Mp4Demux
 		}
 		PRINTF( "%sauxiliary_information_offset = 0x%" PRIu64 "\n", INDENT(), auxiliary_information_offset );
 		got_auxiliary_information_offset = true;
-		dump_auxiliary_information();
+		process_auxiliary_information();
 	}
 
 	void parseSampleEncryptionBox( void )
@@ -448,7 +448,6 @@ class Mp4Demux
 				ptr += subsamples_size;
 			}
 		}
-		sencPresent = true;
 	}
 
 	void parseMovieFragmentHeaderBox( void )
@@ -537,6 +536,8 @@ class Mp4Demux
 			if (flags & 0x0100)
 			{
 				sample_duration = ReadU32();
+				PRINTF( " duration=%" PRIu32, sample_duration );
+				sample.duration = sample_duration / (double)timescale;
 			}
 			if (flags & 0x0200)
 			{
@@ -558,8 +559,7 @@ class Mp4Demux
 			}
 			sample.dts = dts/(double)timescale;
 			sample.pts = (dts+sample_composition_time_offset)/(double)timescale;
-			sample.duration = sample_duration / (double)timescale;
-			PRINTF( " duration:%f dts=%f pts=%f", sample.duration, sample.dts, sample.pts );
+			PRINTF( " dts=%f pts=%f", sample.dts, sample.pts );
 			dts += sample_duration;
 			samples.push_back( std::move(sample) );
 			PRINTF( "\n" );
@@ -888,21 +888,7 @@ class Mp4Demux
 
 				case MultiChar_Constant("moof"):  // Movie Fragment
 					moof_ptr = ptr-8;
-					// For LLD streams, we may have multiple moof boxes
-					// so we need to track sampleOffset to map samples to mdat
-					sampleOffset = samples.size();
-					// Reset encryption state for each moof
-					got_auxiliary_information_offset = false;
-					cenc_aux_info_sizes.clear();
-					sencPresent = false;
-
 					DemuxHelper(next );
-
-					if (!sencPresent && got_auxiliary_information_offset)
-					{
-						// If no 'senc' box, we need to get IVs and subsample data from auxiliary info
-						process_auxiliary_information();
-					}
 					break;
 
 				case MultiChar_Constant("schi"): // Scheme Information
@@ -943,24 +929,7 @@ class Mp4Demux
 		}
 	}
 
-	Mp4Demux( bool verbose=false ):
-		audio{}, video{}, stream_format(),
-		data_reference_index(), codec_type(),
-		codec_data(), is_encrypted(), iv_size(),
-		crypt_byte_block(), skip_byte_block(),
-		constant_iv_size(), constant_iv(), timescale(),
-		samples(), default_kid(), got_auxiliary_information_offset(),
-		auxiliary_information_offset(), scheme_type(), scheme_version(),
-		original_media_type(), cenc_aux_info_sizes(), protectionEvents(),
-		moof_ptr(), ptr(), indent(),
-		version(), flags(), baseMediaDecodeTime(),
-		fragment_duration(), track_id(), base_data_offset(),
-		default_sample_description_index(), default_sample_duration(), default_sample_size(),
-		default_sample_flags(), creation_time(), modification_time(),
-		duration(), rate(), volume(),
-		matrix{}, layer(), alternate_group(),
-		width_fixed(), height_fixed(), language(),
-		verbose(verbose), sampleOffset(), sencPresent(false)
+	Mp4Demux( bool verbose=false ) : audio{}, video{}, stream_format(), data_reference_index(), codec_type(), codec_data(), is_encrypted(), iv_size(), crypt_byte_block(), skip_byte_block(), constant_iv_size(), constant_iv(), timescale(), samples(), default_kid(), got_auxiliary_information_offset(), auxiliary_information_offset(), scheme_type(), scheme_version(), original_media_type(), cenc_aux_info_sizes(), protectionEvents(), moof_ptr(), ptr(), indent(), version(), flags(), baseMediaDecodeTime(), fragment_duration(), track_id(), base_data_offset(), default_sample_description_index(), default_sample_duration(), default_sample_size(), default_sample_flags(), creation_time(), modification_time(), duration(), rate(), volume(), matrix{}, layer(), alternate_group(), width_fixed(), height_fixed(), language(), verbose(verbose)
 	{
 	}
 
@@ -1072,15 +1041,6 @@ class Mp4Demux
 				g_print( "unk codec_type: %" PRIu32 "\n", codec_type );
 				return;
 		}
-		if (caps && is_encrypted)
-		{
-			GstStructure *s = gst_caps_get_structure (caps, 0);
-			gst_structure_set (s,
-				"original-media-type", G_TYPE_STRING, gst_structure_get_name (s),
-				GST_PROTECTION_SYSTEM_ID_CAPS_FIELD, G_TYPE_STRING, "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed",
-				NULL);
-			gst_structure_set_name (s, "application/x-cenc");
-		}
 		gst_app_src_set_caps(appsrc, caps);
 		gst_caps_unref(caps);
 		gst_buffer_unref (buf);
@@ -1150,19 +1110,13 @@ class Mp4Demux
 								  NULL);
 				gst_buffer_unref(subsamples_buf);
 			}
-			else
-			{
-				gst_structure_set(metadata,
-								  "subsample_count", G_TYPE_UINT, 0,
-								  NULL);
-			}
 
 			if( scheme_type == MultiChar_Constant("cbcs") )
 			{
 				GstBuffer *constant_iv_buf = _gst_buffer_new_memdup( (gpointer)constant_iv.c_str(), (gsize)constant_iv_size);
 				gst_structure_set(metadata,
 								  "iv", GST_TYPE_BUFFER, constant_iv_buf,
-								  "iv_size", G_TYPE_UINT, constant_iv_size,
+								  "constant_iv_size", G_TYPE_UINT, constant_iv_size,
 								  "crypt_byte_block", G_TYPE_UINT, crypt_byte_block,
 								  "skip_byte_block", G_TYPE_UINT, skip_byte_block,
 								  NULL );
@@ -1173,8 +1127,11 @@ class Mp4Demux
 		if( metadata )
 		{ // serialize and print the metadata
 			gchar *structure_string = gst_structure_to_string( metadata );
-			PRINTF("metadata: %s\n", structure_string);
+			g_print("metadata: %s\n", structure_string);
 			g_free(structure_string);
+
+			// gst_structure_free( metadata );
+			// metadata = NULL;
 		}
 
 		return metadata;