Skip to content

Commit 4e9e467

Browse files
committed
no message
1 parent 8784b44 commit 4e9e467

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

src/dash/DashHandler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {HTTPRequest} from '../streaming/vo/metrics/HTTPRequest.js';
3333
import FactoryMaker from '../core/FactoryMaker.js';
3434
import MediaPlayerEvents from '../streaming/MediaPlayerEvents.js';
3535
import DashConstants from './constants/DashConstants.js';
36-
import {processUriTemplate} from '@svta/common-media-library/dash/processUriTemplate.js';
36+
import {processUriTemplate} from './utils/SegmentsUtils.js';
3737

3838

3939
const DEFAULT_ADJUST_SEEK_TIME_THRESHOLD = 0.5;

src/dash/utils/SegmentsUtils.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* POSSIBILITY OF SUCH DAMAGE.
3030
*/
3131

32-
import {processUriTemplate} from '@svta/common-media-library/dash/processUriTemplate.js';
32+
import {processUriTemplate as cmlProcessUriTemplate} from '@svta/common-media-library/dash/processUriTemplate.js';
3333
import Segment from './../vo/Segment.js';
3434

3535
function getNumberForSegment(segment, segmentIndex) {
@@ -78,6 +78,14 @@ function isSegmentAvailable(timelineConverter, representation, segment, isDynami
7878
return true;
7979
}
8080

81+
export function processUriTemplate(url, representationId, number, subNumber, bandwidth, time) {
82+
if (!url) {
83+
return url;
84+
}
85+
86+
return cmlProcessUriTemplate(url, representationId, number, subNumber, bandwidth, time);
87+
}
88+
8189
export function getIndexBasedSegment(timelineConverter, isDynamic, representation, index) {
8290
let duration,
8391
presentationStartTime,

src/dash/utils/TemplateSegmentsGetter.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@
2828
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
* POSSIBILITY OF SUCH DAMAGE.
3030
*/
31-
32-
import {processUriTemplate} from '@svta/common-media-library/dash/processUriTemplate.js';
3331
import FactoryMaker from '../../core/FactoryMaker.js';
3432
import Constants from '../../streaming/constants/Constants.js';
35-
import {getIndexBasedSegment} from './SegmentsUtils.js';
33+
import {getIndexBasedSegment, processUriTemplate} from './SegmentsUtils.js';
3634

3735
function TemplateSegmentsGetter(config, isDynamic) {
3836
config = config || {};

src/streaming/thumbnail/ThumbnailController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import FactoryMaker from '../../core/FactoryMaker.js';
3333
import Thumbnail from '../vo/Thumbnail.js';
3434
import ThumbnailTracks from './ThumbnailTracks.js';
35-
import {processUriTemplate} from '@svta/common-media-library/dash/processUriTemplate.js';
35+
import {processUriTemplate} from '../utils/SegmentsUtils.js';
3636

3737
function ThumbnailController(config) {
3838

src/streaming/thumbnail/ThumbnailTracks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import BoxParser from '../../streaming/utils/BoxParser.js';
3838
import XHRLoader from '../../streaming/net/XHRLoader.js';
3939
import DashHandler from '../../dash/DashHandler.js';
4040
import SegmentsController from '../../dash/controllers/SegmentsController.js';
41-
import {processUriTemplate} from '@svta/common-media-library/dash/processUriTemplate.js';
41+
import {processUriTemplate} from '../../dash/utils/SegmentsUtils.js';
4242

4343
function ThumbnailTracks(config) {
4444
const context = this.context;

0 commit comments

Comments
 (0)