VPLAY-10806 AV playback stuck observed during profile reordering in multi-period streams. (#669)

VPLAY-10806 AV playback stuck observed during profile reordering in multi-period streams.

Reason for change: If the Profile order changes across the periods, facing video stuck up issue as it retains the previous Representation index value during each period switch, so properly reset the Representation index during each period switch
Risks: Low
Test Procedure: Refer jira ticket
Priority: P1

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

Author: lashmintha

fragmentcollector_mpd.cpp

@@ -3722,7 +3722,7 @@ AAMPStatusType StreamAbstractionAAMP_MPD::Init(TuneType tuneType)
 			}
 			// Update track with update in stream info
 			mUpdateStreamInfo = true;
-			ret = UpdateTrackInfo(!newTune, true);
+			ret = UpdateTrackInfo(!newTune, true, true);
 
 			if(eAAMPSTATUS_OK != ret)
 			{
@@ -4091,7 +4091,6 @@ AAMPStatusType StreamAbstractionAAMP_MPD::IndexNewMPDDocument(bool updateTrackIn
 				if(((AdState::IN_ADBREAK_AD_PLAYING != mCdaiObject->mAdState) && (AdState::IN_ADBREAK_WAIT2CATCHUP != mCdaiObject->mAdState))
 				   || (AdState::IN_ADBREAK_AD_PLAYING == mCdaiObject->mAdState && mUpdateStreamInfo))
 				{
-					AAMPLOG_TRACE("Indexing new mpd doc");
 					ret = UpdateTrackInfo(true, true);
 					if(ret != eAAMPSTATUS_OK)
 					{
@@ -7102,7 +7101,7 @@ static bool IsWebmVideoCodec(const std::string &codec )
 /**
  * @brief Updates track information based on current state
  */
-AAMPStatusType StreamAbstractionAAMP_MPD::UpdateTrackInfo(bool modifyDefaultBW, bool resetTimeLineIndex)
+AAMPStatusType StreamAbstractionAAMP_MPD::UpdateTrackInfo(bool modifyDefaultBW, bool resetTimeLineIndex, bool isInit)
 {
 	AAMPStatusType ret = eAAMPSTATUS_OK;
 	long defaultBitrate = aamp->GetDefaultBitrate();
@@ -7288,10 +7287,9 @@ AAMPStatusType StreamAbstractionAAMP_MPD::UpdateTrackInfo(bool modifyDefaultBW,
 							// chosenAdaptationIdxs.insert(0);
 						}
 					}
-					if ((representationCount != GetProfileCount()) && mStreamInfo)
+					if ( periodChanged && mStreamInfo != nullptr )
 					{
 						SAFE_DELETE_ARRAY(mStreamInfo);
-
 						// reset representationIndex to -1 to allow updating the currentProfileIndex for period change.
 						pMediaStreamContext->representationIndex = -1;
 						AAMPLOG_WARN("representationIndex set to (-1) to find currentProfileIndex");
@@ -7576,7 +7574,20 @@ AAMPStatusType StreamAbstractionAAMP_MPD::UpdateTrackInfo(bool modifyDefaultBW,
 							}
 							UpdateIframeTracks();
 						}
-						currentProfileIndex = GetDesiredProfile(false);
+						/* During initialization its better to call the GetDesiredProfile(), which picks up the
+						* desired profile index corresponding to default bitrate.
+						* During subsequent 'period' change its better to call the getClosestProfileIndexByBandwidth()
+						* which picks up the profile index based on last bandwidth.
+						*/
+						if(isInit == true)
+						{
+							currentProfileIndex = GetDesiredProfile(false);
+						}
+						else
+						{
+							currentProfileIndex = GetABRManager().getClosestProfileIndexByBandwidth(pMediaStreamContext->fragmentDescriptor.Bandwidth);
+						}
+						AAMPLOG_INFO("Desired profile index updated [%d]",currentProfileIndex);
 						// Adaptation Set Index corresponding to a particular profile
 						pMediaStreamContext->adaptationSetIdx = mProfileMaps[currentProfileIndex].adaptationSetIndex;
 						// Representation Index within a particular Adaptation Set

fragmentcollector_mpd.h

@@ -842,7 +842,7 @@ class StreamAbstractionAAMP_MPD : public StreamAbstractionAAMP
 	/**
 	 * @fn UpdateTrackInfo
 	 */
-	AAMPStatusType UpdateTrackInfo(bool modifyDefaultBW, bool resetTimeLineIndex = false);
+	AAMPStatusType UpdateTrackInfo(bool modifyDefaultBW, bool resetTimeLineIndex = false, bool isInit = false);
 	/**
 	 * @fn SkipToEnd
 	 * @param pMediaStreamContext Track object pointer
@@ -1132,7 +1132,6 @@ class StreamAbstractionAAMP_MPD : public StreamAbstractionAAMP
 	bool playlistDownloaderThreadStarted; // Playlist downloader thread start status
 	double mLivePeriodCulledSeconds;
 	bool mIsSegmentTimelineEnabled;   /**< Flag to indicate if segment timeline is enabled, to determine if PTS is available from manifest */
-
 	// In case of streams with multiple video Adaptation Sets, A profile
 	// is a combination of an Adaptation Set and Representation within
 	// that Adaptation Set. Hence we need a mapping from a profile to

streamabstraction.cpp

@@ -2625,7 +2625,6 @@ int StreamAbstractionAAMP::GetDesiredProfileBasedOnCache(void)
 	return desiredProfileIndex;
 }
 
-
 /**
  *  @brief Rampdown profile
  */
@@ -2988,7 +2987,6 @@ bool StreamAbstractionAAMP::UpdateProfileBasedOnFragmentCache()
 
 	return retVal;
 }
-
 /**
  *  @brief Check if playback has stalled and update related flags.
  */

support/aampabr/ABRManager.cpp

@@ -730,3 +730,41 @@ int  ABRManager::getProfileIndexForLowestBandwidth()
 	}
 	return index;
 }
+/**
+ *  @brief Get the best matched profile index by bandwidth using sorted list
+ */
+int ABRManager::getClosestProfileIndexByBandwidth( long inputBandwidth )
+{
+    std::lock_guard<std::mutex> lock(mProfileLock);
+    // Use the first period's map
+    if (!mSortedBWProfileList.empty())
+    { 
+        int bestIdx = INVALID_PROFILE;
+        auto& profileMap = mSortedBWProfileList.begin()->second;
+        for (std::map<long, int>::const_iterator it = profileMap.begin(); it != profileMap.end(); ++it) 
+        {
+            if (it->first > inputBandwidth)
+            {
+                break;
+            }
+
+            bestIdx = it->second;
+            #if defined(DEBUG_ENABLED)
+            logprintf("%s:%d Matched bw:%ld idx:%d\n",__FUNCTION__, __LINE__,it->first, it->second);
+            #endif
+        }
+        if( bestIdx == INVALID_PROFILE)
+        {
+          /* If the bandwidth of the current period is greater than the previous period, just return the initial profile index, having
+           *  lowest bandwidth
+           */
+          bestIdx = profileMap.begin()->second;
+        }
+        return bestIdx;
+    }
+    else
+    {
+       //return 0th index for safer side
+        return 0;
+    }
+}

support/aampabr/ABRManager.h

@@ -191,6 +191,13 @@ class ABRManager {
    * @return int index for lowest bitrate
    */
   int getProfileIndexForLowestBandwidth();
+  /**
+   * @fn getClosestProfileIndexByBandwidth
+   *
+   * @return int index for best matched bitrate
+   */
+  int getClosestProfileIndexByBandwidth( long inputBandwidth );
+
 public:
   // Getters/Setters
   /**

test/utests/fakes/FakeABRManager.cpp

@@ -116,3 +116,8 @@ int  ABRManager::getProfileIndexForLowestBandwidth()
 {
     return 0;
 }
+
+int ABRManager::getClosestProfileIndexByBandwidth( long inputBandwidth )
+{
+    return 0;
+}

test/utests/fakes/FakeStreamAbstractionAamp.cpp

@@ -534,4 +534,4 @@ std::unique_ptr<SubtitleParser> StreamAbstractionAAMP::RegisterSubtitleParser_CB
 std::unique_ptr<SubtitleParser> StreamAbstractionAAMP::RegisterSubtitleParser_CB(SubtitleMimeType mimeType, bool isExpectedMimeType)
 {
 	return nullptr;
-}
+}