@@ -1865,7 +1865,7 @@ bool StreamAbstractionAAMP_MPD::PushNextFragment( class MediaStreamContext *pMed
18651865 }
18661866 else
18671867 {
1868- AAMPLOG_WARN("segmentURL is null"); //CID:82493 ,86180 - Null Returns
1868+ AAMPLOG_WARN("segmentURL is null"); //CID:82493 ,86180 - Null Returns
18691869 }
18701870 }
18711871 else
@@ -2535,7 +2535,7 @@ double StreamAbstractionAAMP_MPD::SkipFragments( MediaStreamContext *pMediaStrea
25352535 }
25362536 else
25372537 {
2538- AAMPLOG_WARN("videoContext is null"); //CID:82361 - Null Returns
2538+ AAMPLOG_WARN("videoContext is null"); //CID:82361 - Null Returns
25392539 }
25402540 }
25412541
@@ -2905,7 +2905,7 @@ DrmHelperPtr StreamAbstractionAAMP_MPD::CreateDrmHelper(const IAdaptationSet * a
29052905 }
29062906 else if (tagName.find("mspr:pro") != std::string::npos)
29072907 {
2908- AAMPLOG_WARN("Unsupported PSSH data format - MSPR found in manifest");
2908+ AAMPLOG_WARN("Unsupported PSSH data format - MSPR found in manifest");
29092909 }
29102910 }
29112911 }
@@ -2977,7 +2977,7 @@ DrmHelperPtr StreamAbstractionAAMP_MPD::CreateDrmHelper(const IAdaptationSet * a
29772977 // Track the best DRM available to use
29782978 else if ((!drmHelper) || (GetDrmPrefs(drmInfo.systemUUID) > GetDrmPrefs(drmHelper->getUuid())))
29792979 {
2980- AAMPLOG_WARN ("(%s) Created DRM helper for UUID %s and best to use", GetMediaTypeName(mediaType), drmInfo.systemUUID.c_str());
2980+ AAMPLOG_MIL ("(%s) Created DRM helper for UUID %s and best to use", GetMediaTypeName(mediaType), drmInfo.systemUUID.c_str());
29812981 drmHelper = tmpDrmHelper;
29822982 }
29832983 }
@@ -3313,7 +3313,7 @@ AAMPStatusType StreamAbstractionAAMP_MPD::Init(TuneType tuneType)
33133313 mAvailabilityStartTime = mMPDParseHelper->GetAvailabilityStartTime();
33143314 mTSBDepth = mMPDParseHelper->GetTSBDepth();
33153315 mPresentationOffsetDelay = mMPDParseHelper->GetPresentationOffsetDelay();
3316- AAMPLOG_WARN ("StreamAbstractionAAMP_MPD: AvailabilityStartTime=%f", mAvailabilityStartTime);
3316+ AAMPLOG_MIL ("StreamAbstractionAAMP_MPD: AvailabilityStartTime=%f", mAvailabilityStartTime);
33173317
33183318 mFirstPeriodStartTime = mMPDParseHelper->GetPeriodStartTime(0,mLastPlaylistDownloadTimeMs);
33193319 if(aamp->mProgressReportOffset < 0)
@@ -3323,7 +3323,7 @@ AAMPStatusType StreamAbstractionAAMP_MPD::Init(TuneType tuneType)
33233323 aamp->mProgressReportAvailabilityOffset = mAvailabilityStartTime;
33243324 }
33253325
3326- AAMPLOG_WARN ("StreamAbstractionAAMP_MPD: MPD minupdateduration val %" PRIu64 " seconds mTSBDepth %f mPresentationOffsetDelay :%f StartTimeFirstPeriod: %lf offsetStartTime: %lf", mMinUpdateDurationMs/1000, mTSBDepth, mPresentationOffsetDelay, mFirstPeriodStartTime, aamp->mProgressReportOffset);
3326+ AAMPLOG_MIL ("StreamAbstractionAAMP_MPD: MPD minupdateduration val %" PRIu64 " seconds mTSBDepth %f mPresentationOffsetDelay :%f StartTimeFirstPeriod: %lf offsetStartTime: %lf", mMinUpdateDurationMs/1000, mTSBDepth, mPresentationOffsetDelay, mFirstPeriodStartTime, aamp->mProgressReportOffset);
33273327
33283328 aamp->mTsbDepthMs = CONVERT_SEC_TO_MS(mTSBDepth);
33293329
@@ -3900,7 +3900,7 @@ AAMPStatusType StreamAbstractionAAMP_MPD::Init(TuneType tuneType)
39003900 //CheckForInitalClearPeriod() check if the current period is clear or encrypted
39013901 if (pushEncInitFragment && CheckForInitalClearPeriod())
39023902 {
3903- AAMPLOG_WARN ("StreamAbstractionAAMP_MPD: Pushing EncryptedHeaders");
3903+ AAMPLOG_MIL ("StreamAbstractionAAMP_MPD: Pushing EncryptedHeaders");
39043904 std::map<int, std::string> headers;
39053905
39063906 // Getting the headers alone will not cache the protectionEvent in sink which fails to select drmSession in decryptor
@@ -3953,7 +3953,7 @@ AAMPStatusType StreamAbstractionAAMP_MPD::Init(TuneType tuneType)
39533953 ExtractAndAddSubtitleMediaHeader();
39543954 }
39553955
3956- AAMPLOG_WARN ("StreamAbstractionAAMP_MPD: fetch initialization fragments");
3956+ AAMPLOG_MIL ("StreamAbstractionAAMP_MPD: fetch initialization fragments");
39573957 // We have decided on the first period, calculate the PTSoffset to be applied to
39583958 // all segments including the init segments for the GST buffer that goes with the init
39593959 mPTSOffset = 0.0;
@@ -5897,7 +5897,7 @@ void StreamAbstractionAAMP_MPD::ParseTrackInformation(IAdaptationSet *adaptation
58975897 }
58985898 else
58995899 {
5900- AAMPLOG_WARN ("StreamAbstractionAAMP_MPD: Audio Track - lang:%s, group:%s, name:%s, codec:%s, bandwidth:%ld, AccessibilityType:%s label:%s type:%s availability:%d",
5900+ AAMPLOG_MIL ("StreamAbstractionAAMP_MPD: Audio Track - lang:%s, group:%s, name:%s, codec:%s, bandwidth:%ld, AccessibilityType:%s label:%s type:%s availability:%d",
59015901 lang.c_str(), group.c_str(), name.c_str(), codec.c_str(), bandwidth, accessibilityType.c_str(), label.c_str(), type.c_str(), isAvailable);
59025902 aTracks.push_back(AudioTrackInfo(std::move(index), lang, group, std::move(name), codec, bandwidth, accessibilityType, false, label, type, accessibilityNode, isAvailable));
59035903 }
@@ -6225,10 +6225,10 @@ void StreamAbstractionAAMP_MPD::SelectSubtitleTrack(bool newTune, std::vector<Te
62256225 pMediaStreamContext->representationIndex = selRepresentationIndex;
62266226 pMediaStreamContext->profileChanged = true;
62276227
6228- AAMPLOG_WARN ("StreamAbstractionAAMP_MPD: Media[%s] Adaptation set[%d] RepIdx[%d] TrackCnt[%d]",
6228+ AAMPLOG_MIL ("StreamAbstractionAAMP_MPD: Media[%s] Adaptation set[%d] RepIdx[%d] TrackCnt[%d]",
62296229 GetMediaTypeName(eMEDIATYPE_SUBTITLE),selAdaptationSetIndex,selRepresentationIndex,(mNumberOfTracks+1) );
62306230
6231- AAMPLOG_WARN ("Queueing content protection from StreamSelection for type:%d", eMEDIATYPE_SUBTITLE);
6231+ AAMPLOG_MIL ("Queueing content protection from StreamSelection for type:%d", eMEDIATYPE_SUBTITLE);
62326232 QueueContentProtection(period, selAdaptationSetIndex,eMEDIATYPE_SUBTITLE );
62336233 // Check if the track was enabled mid-playback, eg - subtitles. Then we might need to start injection loop
62346234 // For now, do this only for subtitles
@@ -6250,7 +6250,7 @@ void StreamAbstractionAAMP_MPD::SelectSubtitleTrack(bool newTune, std::vector<Te
62506250 AAMPLOG_WARN("StreamAbstractionAAMP_MPD: No valid adaptation set found for Media[%s]",GetMediaTypeName(eMEDIATYPE_SUBTITLE));
62516251 }
62526252
6253- AAMPLOG_WARN ("StreamAbstractionAAMP_MPD: Media[%s] %s",
6253+ AAMPLOG_MIL ("StreamAbstractionAAMP_MPD: Media[%s] %s",
62546254 GetMediaTypeName(eMEDIATYPE_SUBTITLE), pMediaStreamContext->enabled?"enabled":"disabled");
62556255
62566256 // Enable/ disable subtitle mediastream context based on stream selection status
@@ -6685,10 +6685,10 @@ void StreamAbstractionAAMP_MPD::SwitchAudioTrack()
66856685 // This might cause an unwanted content prot to be queued and delay playback start
66866686 if ( !mMultiVideoAdaptationPresent)
66876687 {
6688- AAMPLOG_WARN ("Queueing content protection from StreamSelection for type:%d", eMEDIATYPE_AUDIO);
6688+ AAMPLOG_MIL ("Queueing content protection from StreamSelection for type:%d", eMEDIATYPE_AUDIO);
66896689 QueueContentProtection(period, selAdaptationSetIndex, (AampMediaType)eMEDIATYPE_AUDIO);
66906690 }
6691- AAMPLOG_WARN ("StreamAbstractionAAMP_MPD: Media[%s] Adaptation set[%d] RepIdx[%d] TrackCnt[%d]",
6691+ AAMPLOG_MIL ("StreamAbstractionAAMP_MPD: Media[%s] Adaptation set[%d] RepIdx[%d] TrackCnt[%d]",
66926692 GetMediaTypeName(AampMediaType(eMEDIATYPE_AUDIO)),selAdaptationSetIndex,selRepresentationIndex,(mNumberOfTracks+1) );
66936693
66946694 AAMPLOG_INFO("StreamAbstractionAAMP_MPD: Media[%s] %s",
@@ -6925,14 +6925,14 @@ void StreamAbstractionAAMP_MPD::StreamSelection( bool newTune, bool forceSpeedsC
69256925 pMediaStreamContext->representationIndex = selRepresentationIndex;
69266926 pMediaStreamContext->profileChanged = true;
69276927
6928- AAMPLOG_WARN ("StreamAbstractionAAMP_MPD: Media[%s] Adaptation set[%d] RepIdx[%d] TrackCnt[%d]",
6928+ AAMPLOG_MIL ("StreamAbstractionAAMP_MPD: Media[%s] Adaptation set[%d] RepIdx[%d] TrackCnt[%d]",
69296929 GetMediaTypeName(AampMediaType(i)),selAdaptationSetIndex,selRepresentationIndex,(mNumberOfTracks+1) );
69306930
69316931 // Skip processing content protection for multi video, since the right adaptation will be selected only after ABR
69326932 // This might cause an unwanted content prot to be queued and delay playback start
69336933 if (eMEDIATYPE_VIDEO != i || !mMultiVideoAdaptationPresent)
69346934 {
6935- AAMPLOG_WARN ("Queueing content protection from StreamSelection for type:%d", i);
6935+ AAMPLOG_MIL ("Queueing content protection from StreamSelection for type:%d", i);
69366936 QueueContentProtection(period, selAdaptationSetIndex, (AampMediaType)i);
69376937 }
69386938
@@ -6949,7 +6949,7 @@ void StreamAbstractionAAMP_MPD::StreamSelection( bool newTune, bool forceSpeedsC
69496949 GetMediaTypeName(AampMediaType(i)));
69506950 }
69516951
6952- AAMPLOG_WARN ("StreamAbstractionAAMP_MPD: Media[%s] %s",
6952+ AAMPLOG_MIL ("StreamAbstractionAAMP_MPD: Media[%s] %s",
69536953 GetMediaTypeName(AampMediaType(i)), pMediaStreamContext->enabled?"enabled":"disabled");
69546954 //This is for cases where subtitle is not enabled, but auxiliary audio track is enabled
69556955 if (eMEDIATYPE_AUX_AUDIO == i && pMediaStreamContext->enabled && !mMediaStreamContext[eMEDIATYPE_SUBTITLE]->enabled)
@@ -7266,7 +7266,10 @@ AAMPStatusType StreamAbstractionAAMP_MPD::UpdateTrackInfo(bool modifyDefaultBW,
72667266 blAdaptationIdxs.insert(blProfile.mAdaptationSetIdx);
72677267 }
72687268 }
7269- AAMPLOG_WARN("Blacklisted adaptationSet in this period: %zu", blAdaptationIdxs.size());
7269+ if( blAdaptationIdxs.size() > 0 )
7270+ {
7271+ AAMPLOG_WARN("Blacklisted adaptationSet in this period: %zu", blAdaptationIdxs.size());
7272+ }
72707273 const auto &adaptationSets = period->GetAdaptationSets();
72717274 for (uint32_t idx = 0; idx < adaptationSets.size(); idx++ )
72727275 {
@@ -7547,7 +7550,7 @@ AAMPStatusType StreamAbstractionAAMP_MPD::UpdateTrackInfo(bool modifyDefaultBW,
75477550 // Set default init bitrate
75487551 else
75497552 {
7550- AAMPLOG_WARN ("Using defaultBitrate %" BITSPERSECOND_FORMAT " . PersistBandwidth : %ld TimeGap : %ld",aamp->GetDefaultBitrate(),persistbandwidth,TimeGap);
7553+ AAMPLOG_MIL ("Using defaultBitrate %" BITSPERSECOND_FORMAT " . PersistBandwidth : %ld TimeGap : %ld",aamp->GetDefaultBitrate(),persistbandwidth,TimeGap);
75517554 aamp->mhAbrManager.setDefaultInitBitrate(aamp->GetDefaultBitrate());
75527555
75537556 }
0 commit comments