86
86
#define MEDIATYPE_IMAGE "image"
87
87
88
88
// weights used for autio/subtitle track-selection heuristic
89
- #define AAMP_LANGUAGE_SCORE 1000000000L /**< Top priority: matching language **/
89
+ #define AAMP_LANGUAGE_SCORE 1000000000UL /**< Top priority: matching language **/
90
90
#define AAMP_SCHEME_ID_SCORE 100000000L /**< 2nd priority to scheme id matching **/
91
91
#define AAMP_LABEL_SCORE 10000000L /**< 3rd priority to label matching **/
92
92
#define AAMP_ROLE_SCORE 1000000L /**< 4th priority to role/rendition matching **/
@@ -6614,7 +6614,7 @@ std::vector<AudioTrackInfo> &ac4Tracks, std::string &audioTrackIndex)
6614
6614
/**< No valid representation found in this Adaptation, discard this adaptation */
6615
6615
score = 0;
6616
6616
}
6617
- AAMPLOG_INFO( "track#%d::%d - score = %d ", iAdaptationSet, audioRepresentationIndex, score );
6617
+ AAMPLOG_INFO( "track#%d::%d - score = %llu ", iAdaptationSet, audioRepresentationIndex, score );
6618
6618
if( score > bestScore )
6619
6619
{
6620
6620
bestScore = score;
@@ -6627,7 +6627,7 @@ std::vector<AudioTrackInfo> &ac4Tracks, std::string &audioTrackIndex)
6627
6627
if (CodecType == eAUDIO_DOLBYAC4)
6628
6628
{
6629
6629
/* TODO: Cuurently current Audio track is updating only for AC4 need mechanism to update for other tracks also */
6630
- AAMPLOG_INFO( "Audio Track selected index - %s - language : %s rendition : %s - codec - %s score = %d ", selectedAudioTrack.index.c_str(),
6630
+ AAMPLOG_INFO( "Audio Track selected index - %s - language : %s rendition : %s - codec - %s score = %llu ", selectedAudioTrack.index.c_str(),
6631
6631
selectedAudioTrack.language.c_str(), selectedAudioTrack.rendition.c_str(), selectedAudioTrack.codec.c_str(), bestScore );
6632
6632
}
6633
6633
return bestTrack;
@@ -12287,9 +12287,9 @@ AAMPStatusType StreamAbstractionAAMP_MPD::EnableAndSetLiveOffsetForLLDashPlayba
12287
12287
stLLServiceData.targetLatency = TargetLatency*1000;
12288
12288
}
12289
12289
}
12290
- double latencyOffsetMin = stLLServiceData.minLatency/1000;
12291
- double latencyOffsetMax = stLLServiceData.maxLatency/1000;
12292
- double TargetLatencyWrtWallClockTime = stLLServiceData.targetLatency/1000;
12290
+ double latencyOffsetMin = stLLServiceData.minLatency/(double) 1000;
12291
+ double latencyOffsetMax = stLLServiceData.maxLatency/(double) 1000;
12292
+ double TargetLatencyWrtWallClockTime = stLLServiceData.targetLatency/(double) 1000;
12293
12293
AAMPLOG_WARN("StreamAbstractionAAMP_MPD:[LL-Dash] Min Latency: %ld Max Latency: %ld Target Latency: %ld",(long)latencyOffsetMin,(long)latencyOffsetMax,(long)TargetLatency);
12294
12294
12295
12295
//Ignore Low latency setting
@@ -12366,13 +12366,13 @@ bool StreamAbstractionAAMP_MPD::GetLowLatencyParams(const MPD* mpd,AampLLDashSer
12366
12366
for (unsigned iPeriod = 0; iPeriod < numPeriods; iPeriod++)
12367
12367
{
12368
12368
IPeriod *period = mpd->GetPeriods().at(iPeriod);
12369
- if(IsEmptyPeriod(period, mIsFogTSB))
12370
- {
12371
- // Empty Period . Ignore processing, continue to next.
12372
- continue;
12373
- }
12374
12369
if(NULL != period )
12375
12370
{
12371
+ if(IsEmptyPeriod(period, mIsFogTSB))
12372
+ {
12373
+ // Empty Period . Ignore processing, continue to next.
12374
+ continue;
12375
+ }
12376
12376
const std::vector<IAdaptationSet *> adaptationSets = period->GetAdaptationSets();
12377
12377
if (adaptationSets.size() > 0)
12378
12378
{
0 commit comments