shaka-player
Advanced tools
Comparing version 4.7.9 to 4.7.10
@@ -727,44 +727,44 @@ | ||
shaka.ui.Locales.Ids = { | ||
REWIND: 'REWIND', | ||
STATISTICS: 'STATISTICS', | ||
SUBTITLE_FORCED: 'SUBTITLE_FORCED', | ||
EXIT_LOOP_MODE: 'EXIT_LOOP_MODE', | ||
MULTIPLE_LANGUAGES: 'MULTIPLE_LANGUAGES', | ||
OFF: 'OFF', | ||
UNMUTE: 'UNMUTE', | ||
EXIT_PICTURE_IN_PICTURE: 'EXIT_PICTURE_IN_PICTURE', | ||
EXIT_FULL_SCREEN: 'EXIT_FULL_SCREEN', | ||
UNRECOGNIZED_LANGUAGE: 'UNRECOGNIZED_LANGUAGE', | ||
LANGUAGE: 'LANGUAGE', | ||
CAPTIONS: 'CAPTIONS', | ||
MUTE: 'MUTE', | ||
PLAY: 'PLAY', | ||
PICTURE_IN_PICTURE: 'PICTURE_IN_PICTURE', | ||
RESOLUTION: 'RESOLUTION', | ||
CAST: 'CAST', | ||
SEEK: 'SEEK', | ||
MORE_SETTINGS: 'MORE_SETTINGS', | ||
FAST_FORWARD: 'FAST_FORWARD', | ||
SKIP_TO_LIVE: 'SKIP_TO_LIVE', | ||
BACK: 'BACK', | ||
AIRPLAY: 'AIRPLAY', | ||
LIVE: 'LIVE', | ||
AD_DURATION: 'AD_DURATION', | ||
QUALITY: 'QUALITY', | ||
REPLAY: 'REPLAY', | ||
SURROUND: 'SURROUND', | ||
UNMUTE: 'UNMUTE', | ||
PICTURE_IN_PICTURE: 'PICTURE_IN_PICTURE', | ||
AD_PROGRESS: 'AD_PROGRESS', | ||
LOOP: 'LOOP', | ||
ENTER_LOOP_MODE: 'ENTER_LOOP_MODE', | ||
QUALITY: 'QUALITY', | ||
ON: 'ON', | ||
MUTE: 'MUTE', | ||
CAPTIONS: 'CAPTIONS', | ||
MORE_SETTINGS: 'MORE_SETTINGS', | ||
UNRECOGNIZED_LANGUAGE: 'UNRECOGNIZED_LANGUAGE', | ||
SUBTITLE_FORCED: 'SUBTITLE_FORCED', | ||
PLAYBACK_RATE: 'PLAYBACK_RATE', | ||
REPLAY: 'REPLAY', | ||
EXIT_LOOP_MODE: 'EXIT_LOOP_MODE', | ||
SKIP_AD: 'SKIP_AD', | ||
AUTO_QUALITY: 'AUTO_QUALITY', | ||
SEEK: 'SEEK', | ||
EXIT_FULL_SCREEN: 'EXIT_FULL_SCREEN', | ||
REWIND: 'REWIND', | ||
AD_TIME: 'AD_TIME', | ||
FAST_FORWARD: 'FAST_FORWARD', | ||
MULTIPLE_LANGUAGES: 'MULTIPLE_LANGUAGES', | ||
CAST: 'CAST', | ||
NOT_APPLICABLE: 'NOT_APPLICABLE', | ||
UNDETERMINED_LANGUAGE: 'UNDETERMINED_LANGUAGE', | ||
VOLUME: 'VOLUME', | ||
ENTER_PICTURE_IN_PICTURE: 'ENTER_PICTURE_IN_PICTURE', | ||
AD_TIME: 'AD_TIME', | ||
FULL_SCREEN: 'FULL_SCREEN', | ||
SKIP_AD: 'SKIP_AD', | ||
ON: 'ON', | ||
AD_PROGRESS: 'AD_PROGRESS', | ||
PAUSE: 'PAUSE', | ||
AUTO_QUALITY: 'AUTO_QUALITY', | ||
LOOP: 'LOOP', | ||
ENTER_PICTURE_IN_PICTURE: 'ENTER_PICTURE_IN_PICTURE', | ||
AD_DURATION: 'AD_DURATION', | ||
LANGUAGE: 'LANGUAGE', | ||
VOLUME: 'VOLUME', | ||
BACK: 'BACK', | ||
LIVE: 'LIVE', | ||
SKIP_TO_LIVE: 'SKIP_TO_LIVE', | ||
STATISTICS: 'STATISTICS', | ||
UNDETERMINED_LANGUAGE: 'UNDETERMINED_LANGUAGE', | ||
}; |
@@ -758,12 +758,6 @@ /*! @license | ||
if (timeline.length === 0) { | ||
return; | ||
} | ||
if (this.periodEnd_ !== Infinity) { | ||
// Adjust the last timeline entry to match the period end | ||
const lastTimePeriod = timeline[timeline.length - 1]; | ||
// NOTE: end should be relative to period start | ||
lastTimePeriod.end = this.periodEnd_ - this.periodStart_; | ||
} | ||
// Do NOT adjust last range to match period end! With high precision | ||
// timestamps several recalculations may give wrong results on less precise | ||
// platforms. To mitigate that, we're using cached |periodEnd_| value in | ||
// find/get() methods whenever possible. | ||
} | ||
@@ -788,3 +782,3 @@ | ||
// Early exit if the time isn't within this period | ||
if (time < this.periodStart_ || time > this.periodEnd_) { | ||
if (time < this.periodStart_ || time >= this.periodEnd_) { | ||
return null; | ||
@@ -802,6 +796,10 @@ } | ||
// reference, in which case we use the period end as the /end/ | ||
let end = range.end + this.periodStart_; | ||
let end; | ||
if (i < lastIndex) { | ||
end = timeline[i + 1].start + this.periodStart_; | ||
} else if (this.periodEnd_ === Infinity) { | ||
end = range.end + this.periodStart_; | ||
} else { | ||
end = this.periodEnd_; | ||
} | ||
@@ -837,2 +835,8 @@ | ||
this.templateInfo_.scaledPresentationTimeOffset; | ||
const trueSegmentEnd = this.periodStart_ + range.end; | ||
let segmentEnd = trueSegmentEnd; | ||
if (correctedPosition === this.getNumReferences() - 1 && | ||
this.periodEnd_ !== Infinity) { | ||
segmentEnd = this.periodEnd_; | ||
} | ||
@@ -908,3 +912,3 @@ const partialSegmentRefs = []; | ||
this.periodStart_ + range.start, | ||
this.periodStart_ + range.end, | ||
segmentEnd, | ||
createUrisCb, | ||
@@ -924,2 +928,3 @@ /* startByte= */ 0, | ||
/* allPartialSegments= */ range.partialSegments > 0); | ||
ref.trueEndTime = trueSegmentEnd; | ||
this.references[correctedPosition] = ref; | ||
@@ -926,0 +931,0 @@ } |
@@ -132,3 +132,6 @@ /*! @license | ||
const BufferUtils = shaka.util.BufferUtils; | ||
if (!reference1 || !reference2) { | ||
if (reference1 === reference2) { | ||
return true; | ||
} else if (!reference1 || !reference2) { | ||
return reference1 == reference2; | ||
@@ -135,0 +138,0 @@ } else { |
@@ -1218,3 +1218,14 @@ /*! @license | ||
// If language-based differences haven't decided this, look at roles. If | ||
// If language-based differences haven't decided this, look at labels. | ||
// If available options differ, look does any matches with output stream. | ||
if (best.label !== candidate.label) { | ||
if (outputStream.label === best.label) { | ||
return false; | ||
} | ||
if (outputStream.label === candidate.label) { | ||
return true; | ||
} | ||
} | ||
// If label-based differences haven't decided this, look at roles. If | ||
// the candidate has more roles in common with the output, upgrade to the | ||
@@ -1414,2 +1425,13 @@ // candidate. | ||
// If language-based differences haven't decided this, look at labels. | ||
// If available options differ, look does any matches with output stream. | ||
if (best.label !== candidate.label) { | ||
if (outputStream.label === best.label) { | ||
return false; | ||
} | ||
if (outputStream.label === candidate.label) { | ||
return true; | ||
} | ||
} | ||
// If the candidate has more roles in common with the output, upgrade to the | ||
@@ -1416,0 +1438,0 @@ // candidate. |
@@ -911,3 +911,3 @@ /*! @license | ||
// See https://bugs.chromium.org/p/chromium/issues/detail?id=1422728 | ||
if (codecs === 'fLaC') { | ||
if (codecs === 'fLaC' && !shaka.util.Platform.isSafari()) { | ||
return 'flac'; | ||
@@ -914,0 +914,0 @@ } |
{ | ||
"name": "shaka-player", | ||
"description": "DASH/EME video player library", | ||
"version": "4.7.9", | ||
"version": "4.7.10", | ||
"homepage": "https://github.com/shaka-project/shaka-player", | ||
@@ -46,3 +46,3 @@ "author": "Google", | ||
"karma-jasmine-ajax": "^0.1.13", | ||
"karma-local-wd-launcher": "^1.6.6", | ||
"karma-local-wd-launcher": "^1.6.7", | ||
"karma-opera-launcher": "^1.0.0", | ||
@@ -49,0 +49,0 @@ "karma-sourcemap-loader": "^0.3.8", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
16869837
159067