@amazon/vinyl 3.2.3-next.20261001224604 → 3.2.3-next.20261009230135
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +130 -22
- package/dist/index.cjs.map +4 -4
- package/dist/index.js +153 -43
- package/dist/index.js.map +4 -4
- package/dist/test/integ.es5.js +164 -161
- package/dist/test/integ.js +702 -91
- package/dist/test/integ.js.map +4 -4
- package/dist/types/current/drm/DrmControllerImpl.d.ts.map +1 -1
- package/dist/types/current/drm/DrmControllerImpl.js +71 -16
- package/dist/types/current/drm/DrmKeySystem.d.ts +22 -2
- package/dist/types/current/drm/DrmKeySystem.d.ts.map +1 -1
- package/dist/types/current/drm/DrmKeySystem.js +22 -1
- package/dist/types/current/drm/DrmOptions.d.ts +24 -1
- package/dist/types/current/drm/DrmOptions.d.ts.map +1 -1
- package/dist/types/current/drm/DrmOptions.js +2 -1
- package/dist/types/current/drm/commonEme/CommonEmeFactory.d.ts +18 -4
- package/dist/types/current/drm/commonEme/CommonEmeFactory.d.ts.map +1 -1
- package/dist/types/current/drm/commonEme/CommonEmeFactory.js +13 -6
- package/dist/types/current/index.d.ts +1 -0
- package/dist/types/current/index.d.ts.map +1 -1
- package/dist/types/current/index.js +1 -0
- package/dist/types/current/streaming/MediaQualityMetadata.d.ts +6 -0
- package/dist/types/current/streaming/MediaQualityMetadata.d.ts.map +1 -1
- package/dist/types/current/streaming/MediaQualityMetadata.js +1 -0
- package/dist/types/current/track/hls/buildHlsMediaTimeline.d.ts +2 -1
- package/dist/types/current/track/hls/buildHlsMediaTimeline.d.ts.map +1 -1
- package/dist/types/current/track/hls/buildHlsMediaTimeline.js +5 -1
- package/dist/types/current/track/hls/util/hlsKeyDrmInfo.d.ts +33 -0
- package/dist/types/current/track/hls/util/hlsKeyDrmInfo.d.ts.map +1 -0
- package/dist/types/current/track/hls/util/hlsKeyDrmInfo.js +78 -0
- package/dist/types/current/tsconfig.tsbuildinfo +1 -1
- package/dist/types/current/vinyl/createVinylFactories.d.ts +1 -2
- package/dist/types/current/vinyl/createVinylFactories.d.ts.map +1 -1
- package/dist/types/current/vinyl/createVinylFactories.js +3 -1
- package/dist/types/ts3.7/drm/DrmKeySystem.d.ts +22 -2
- package/dist/types/ts3.7/drm/DrmOptions.d.ts +24 -1
- package/dist/types/ts3.7/drm/commonEme/CommonEmeFactory.d.ts +18 -4
- package/dist/types/ts3.7/index.d.ts +1 -0
- package/dist/types/ts3.7/streaming/MediaQualityMetadata.d.ts +6 -0
- package/dist/types/ts3.7/track/hls/buildHlsMediaTimeline.d.ts +2 -1
- package/dist/types/ts3.7/track/hls/util/hlsKeyDrmInfo.d.ts +33 -0
- package/dist/types/ts3.7/vinyl/createVinylFactories.d.ts +1 -2
- package/dist/types/ts4.1/drm/DrmKeySystem.d.ts +22 -2
- package/dist/types/ts4.1/drm/DrmOptions.d.ts +24 -1
- package/dist/types/ts4.1/drm/commonEme/CommonEmeFactory.d.ts +18 -4
- package/dist/types/ts4.1/index.d.ts +1 -0
- package/dist/types/ts4.1/streaming/MediaQualityMetadata.d.ts +6 -0
- package/dist/types/ts4.1/track/hls/buildHlsMediaTimeline.d.ts +2 -1
- package/dist/types/ts4.1/track/hls/util/hlsKeyDrmInfo.d.ts +33 -0
- package/dist/types/ts4.1/vinyl/createVinylFactories.d.ts +1 -2
- package/dist/types/ts4.7/drm/DrmKeySystem.d.ts +22 -2
- package/dist/types/ts4.7/drm/DrmOptions.d.ts +24 -1
- package/dist/types/ts4.7/drm/commonEme/CommonEmeFactory.d.ts +18 -4
- package/dist/types/ts4.7/index.d.ts +1 -0
- package/dist/types/ts4.7/streaming/MediaQualityMetadata.d.ts +6 -0
- package/dist/types/ts4.7/track/hls/buildHlsMediaTimeline.d.ts +2 -1
- package/dist/types/ts4.7/track/hls/util/hlsKeyDrmInfo.d.ts +33 -0
- package/dist/types/ts4.7/vinyl/createVinylFactories.d.ts +1 -2
- package/dist/unit/types/current/drm/CommonEmeFactory.test.js +92 -56
- package/dist/unit/types/current/drm/DrmControllerImpl.test.js +153 -1
- package/dist/unit/types/current/drm/DrmKeySystem.test.js +1 -0
- package/dist/unit/types/current/drm/DrmKeySystemResolver.test.js +5 -1
- package/dist/unit/types/current/drm/DrmOptions.test.d.ts +2 -0
- package/dist/unit/types/current/drm/DrmOptions.test.d.ts.map +1 -0
- package/dist/unit/types/current/drm/DrmOptions.test.js +23 -0
- package/dist/unit/types/current/drm/commonEme/MsCommonEme.test.js +4 -0
- package/dist/unit/types/current/drm/commonEme/WebKitCommonEme.test.js +4 -0
- package/dist/unit/types/current/index.d.ts +2 -0
- package/dist/unit/types/current/index.d.ts.map +1 -1
- package/dist/unit/types/current/index.js +2 -0
- package/dist/unit/types/current/track/hls/buildHlsMediaTimeline.test.js +48 -1
- package/dist/unit/types/current/track/hls/util/hlsKeyDrmInfo.test.d.ts +2 -0
- package/dist/unit/types/current/track/hls/util/hlsKeyDrmInfo.test.d.ts.map +1 -0
- package/dist/unit/types/current/track/hls/util/hlsKeyDrmInfo.test.js +89 -0
- package/dist/unit/types/current/tsconfig.tsbuildinfo +1 -1
- package/dist/unit/types/current/vinyl/createVinylFactories.test.js +29 -1
- package/dist/vinylTestUtil/types/current/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -10
package/dist/index.cjs
CHANGED
|
@@ -245,6 +245,7 @@ __export(index_exports, {
|
|
|
245
245
|
getSegmentTemplate: () => getSegmentTemplate,
|
|
246
246
|
getSourceBufferQuota: () => getSourceBufferQuota,
|
|
247
247
|
hlsByteRangeToMediaRange: () => hlsByteRangeToMediaRange,
|
|
248
|
+
hlsKeyDrmInfo: () => hlsKeyDrmInfo,
|
|
248
249
|
immediatePrefetchPriority: () => immediatePrefetchPriority,
|
|
249
250
|
inferTrackTypeFromUrl: () => inferTrackTypeFromUrl,
|
|
250
251
|
inferTrackTypeFromUrlPath: () => inferTrackTypeFromUrlPath,
|
|
@@ -1877,9 +1878,18 @@ function webkitErrorCodeToStr(code) {
|
|
|
1877
1878
|
|
|
1878
1879
|
// src/drm/commonEme/CommonEmeFactory.ts
|
|
1879
1880
|
var import_vinyl_util17 = require("@amazon/vinyl-util");
|
|
1880
|
-
function commonEmeFactory() {
|
|
1881
|
+
function commonEmeFactory(options) {
|
|
1882
|
+
var _a, _b;
|
|
1883
|
+
if ((options == null ? void 0 : options.preferPrefixedMediaKeys) === true) {
|
|
1884
|
+
return (_a = createPrefixedCommonEme()) != null ? _a : createStandardCommonEme();
|
|
1885
|
+
}
|
|
1886
|
+
return (_b = createStandardCommonEme()) != null ? _b : createPrefixedCommonEme();
|
|
1887
|
+
}
|
|
1888
|
+
function createStandardCommonEme() {
|
|
1889
|
+
return supportsStandardEme() ? new StandardCommonEme() : null;
|
|
1890
|
+
}
|
|
1891
|
+
function createPrefixedCommonEme() {
|
|
1881
1892
|
if (supportsWebKitEme()) return new WebKitCommonEme();
|
|
1882
|
-
if (supportsStandardEme()) return new StandardCommonEme();
|
|
1883
1893
|
if (supportsMsEme()) return new MsCommonEme();
|
|
1884
1894
|
return null;
|
|
1885
1895
|
}
|
|
@@ -1918,6 +1928,7 @@ var DrmKeySystem = /* @__PURE__ */ ((DrmKeySystem2) => {
|
|
|
1918
1928
|
DrmKeySystem2["PLAY_READY_3000"] = "com.microsoft.playready.recommendation.3000";
|
|
1919
1929
|
DrmKeySystem2["FAIR_PLAY"] = "com.apple.fps";
|
|
1920
1930
|
DrmKeySystem2["FAIR_PLAY_1_0"] = "com.apple.fps.1_0";
|
|
1931
|
+
DrmKeySystem2["FAIR_PLAY_2_0"] = "com.apple.fps.2_0";
|
|
1921
1932
|
return DrmKeySystem2;
|
|
1922
1933
|
})(DrmKeySystem || {});
|
|
1923
1934
|
var drmKeySystemValidator = /* @__PURE__ */ (0, import_vinyl_validation.string)().notEmpty();
|
|
@@ -1932,7 +1943,8 @@ function isPlayReady(keySystem) {
|
|
|
1932
1943
|
}
|
|
1933
1944
|
var FAIR_PLAY_KEY_SYSTEMS = [
|
|
1934
1945
|
"com.apple.fps" /* FAIR_PLAY */,
|
|
1935
|
-
"com.apple.fps.1_0" /* FAIR_PLAY_1_0
|
|
1946
|
+
"com.apple.fps.1_0" /* FAIR_PLAY_1_0 */,
|
|
1947
|
+
"com.apple.fps.2_0" /* FAIR_PLAY_2_0 */
|
|
1936
1948
|
];
|
|
1937
1949
|
function isFairPlay(keySystem) {
|
|
1938
1950
|
return FAIR_PLAY_KEY_SYSTEMS.includes(keySystem);
|
|
@@ -1978,7 +1990,8 @@ var drmOptionsValidator = /* @__PURE__ */ (0, import_vinyl_validation3.object)({
|
|
|
1978
1990
|
["org.w3.clearkey" /* CLEAR_KEY */]: /* @__PURE__ */ drmClearKeySystemOptionsValidator.optional()
|
|
1979
1991
|
})
|
|
1980
1992
|
),
|
|
1981
|
-
licenseProvider: /* @__PURE__ */ (0, import_vinyl_validation3.func)().optional()
|
|
1993
|
+
licenseProvider: /* @__PURE__ */ (0, import_vinyl_validation3.func)().optional(),
|
|
1994
|
+
preferPrefixedMediaKeys: /* @__PURE__ */ (0, import_vinyl_validation3.boolean)().maybe().optional()
|
|
1982
1995
|
});
|
|
1983
1996
|
|
|
1984
1997
|
// src/drm/util/unpackPlayReadyChallenge.ts
|
|
@@ -2472,10 +2485,10 @@ var DrmControllerImpl = class extends import_vinyl_util24.EventHostImpl {
|
|
|
2472
2485
|
keySystem,
|
|
2473
2486
|
drmInfo.contentType
|
|
2474
2487
|
);
|
|
2475
|
-
const
|
|
2476
|
-
|
|
2488
|
+
const robustness = (_a = mediaOptions == null ? void 0 : mediaOptions.robustness) != null ? _a : defaultRobustness(keySystem);
|
|
2489
|
+
const capability = __spreadProps(__spreadValues({}, robustness != null && { robustness }), {
|
|
2477
2490
|
encryptionScheme: drmInfo.encryptionScheme
|
|
2478
|
-
};
|
|
2491
|
+
});
|
|
2479
2492
|
if (drmInfo.mimeType) {
|
|
2480
2493
|
capability.contentType = drmInfo.mimeType;
|
|
2481
2494
|
}
|
|
@@ -2570,28 +2583,47 @@ var DrmControllerImpl = class extends import_vinyl_util24.EventHostImpl {
|
|
|
2570
2583
|
this.pendingMessageProps = messageProps;
|
|
2571
2584
|
const keySystem = mediaKeys.keySystem;
|
|
2572
2585
|
(0, import_vinyl_util24.logDebug)(this, "message", keySystem, event.message.byteLength);
|
|
2586
|
+
const messageTime = Date.now();
|
|
2587
|
+
const keySystemOptions = (_a = this.options.keySystems[keySystem]) != null ? _a : this.options.keySystems["*"];
|
|
2588
|
+
const licenseServerOptionsProvider = keySystemOptions == null ? void 0 : keySystemOptions.licenseServer;
|
|
2589
|
+
const resolvedLicenseServerOptions = await (0, import_vinyl_util24.resolveValueProvider)(
|
|
2590
|
+
licenseServerOptionsProvider
|
|
2591
|
+
);
|
|
2592
|
+
let licenseServerOptions = __spreadValues({}, resolvedLicenseServerOptions);
|
|
2593
|
+
this.abortIfDisposed();
|
|
2594
|
+
if (isFairPlayCertificateRequest(keySystem, event.message)) {
|
|
2595
|
+
const certBytes = toCertBytes(
|
|
2596
|
+
licenseServerOptions.serverCertificate
|
|
2597
|
+
);
|
|
2598
|
+
if (!certBytes) {
|
|
2599
|
+
throw new DrmError("FairPlay requires certificate data");
|
|
2600
|
+
}
|
|
2601
|
+
this.pendingMessageProps = null;
|
|
2602
|
+
if (session.disposed) return;
|
|
2603
|
+
(0, import_vinyl_util24.logDebug)(this, "update certificate");
|
|
2604
|
+
await session.update(certBytes.buffer);
|
|
2605
|
+
return;
|
|
2606
|
+
}
|
|
2573
2607
|
if (this.keySetupSpanStart != null) {
|
|
2574
2608
|
this.dispatchLoadSpan(
|
|
2575
2609
|
"keySetup",
|
|
2576
2610
|
this.keySetupSpanStart,
|
|
2577
|
-
|
|
2611
|
+
messageTime,
|
|
2578
2612
|
messageProps
|
|
2579
2613
|
);
|
|
2580
2614
|
this.keySetupSpanStart = null;
|
|
2581
2615
|
}
|
|
2582
|
-
const keySystemOptions = (_a = this.options.keySystems[keySystem]) != null ? _a : this.options.keySystems["*"];
|
|
2583
|
-
const licenseServerOptionsProvider = keySystemOptions == null ? void 0 : keySystemOptions.licenseServer;
|
|
2584
|
-
const licenseServerOptions = (_b = (0, import_vinyl_util24.clone)(await (0, import_vinyl_util24.resolveValueProvider)(licenseServerOptionsProvider))) != null ? _b : {};
|
|
2585
|
-
this.abortIfDisposed();
|
|
2586
2616
|
let challenge = event.message;
|
|
2587
2617
|
if (isPlayReady(keySystem)) {
|
|
2588
2618
|
const unpacked = unpackPlayReadyChallenge(challenge);
|
|
2589
2619
|
challenge = unpacked.challenge;
|
|
2590
|
-
|
|
2591
|
-
licenseServerOptions.init
|
|
2592
|
-
|
|
2593
|
-
|
|
2594
|
-
|
|
2620
|
+
licenseServerOptions = __spreadProps(__spreadValues({}, licenseServerOptions), {
|
|
2621
|
+
init: __spreadProps(__spreadValues({}, licenseServerOptions.init), {
|
|
2622
|
+
headers: __spreadValues(__spreadValues({}, (0, import_vinyl_util24.normalizeHeadersInit)(
|
|
2623
|
+
(_c = (_b = licenseServerOptions.init) == null ? void 0 : _b.headers) != null ? _c : {}
|
|
2624
|
+
)), unpacked.headers)
|
|
2625
|
+
})
|
|
2626
|
+
});
|
|
2595
2627
|
}
|
|
2596
2628
|
const licenseSpanStart = Date.now();
|
|
2597
2629
|
const key = await this.licenseProvider(
|
|
@@ -2703,8 +2735,12 @@ function toCertBytes(serverCertificate) {
|
|
|
2703
2735
|
if (!serverCertificate) return null;
|
|
2704
2736
|
return typeof serverCertificate === "string" ? (0, import_vinyl_util24.base64ToByteArray)(serverCertificate) : (0, import_vinyl_util24.bufferToByteArray)(serverCertificate);
|
|
2705
2737
|
}
|
|
2738
|
+
function defaultRobustness(keySystem) {
|
|
2739
|
+
return keySystem === "com.widevine.alpha" /* WIDEVINE */ ? "SW_SECURE_CRYPTO" /* SW_SECURE_CRYPTO */ : void 0;
|
|
2740
|
+
}
|
|
2706
2741
|
function defaultInitDataTransformer(keySystem, certBytes) {
|
|
2707
|
-
return (initData) => {
|
|
2742
|
+
return (initData, _initDataType, drmInfo) => {
|
|
2743
|
+
var _a;
|
|
2708
2744
|
if (keySystem === "com.apple.fps.1_0" /* FAIR_PLAY_1_0 */) {
|
|
2709
2745
|
if (!certBytes) {
|
|
2710
2746
|
throw new DrmError("FairPlay requires certificate data");
|
|
@@ -2712,9 +2748,23 @@ function defaultInitDataTransformer(keySystem, certBytes) {
|
|
|
2712
2748
|
const contentId = extractContentId(initData);
|
|
2713
2749
|
return createFairPlaySessionInitData(initData, contentId, certBytes);
|
|
2714
2750
|
}
|
|
2751
|
+
if (keySystem === "com.apple.fps.2_0" /* FAIR_PLAY_2_0 */) {
|
|
2752
|
+
const contentId = (_a = drmInfo.contentProtections.find(
|
|
2753
|
+
(cP) => cP.keySystem === keySystem
|
|
2754
|
+
)) == null ? void 0 : _a.contentId;
|
|
2755
|
+
if (!contentId) {
|
|
2756
|
+
throw new DrmError("FairPlay 2.0 requires a content id", {
|
|
2757
|
+
drmInfo
|
|
2758
|
+
});
|
|
2759
|
+
}
|
|
2760
|
+
return (0, import_vinyl_util24.byteStrToByteArray)(contentId);
|
|
2761
|
+
}
|
|
2715
2762
|
return initData;
|
|
2716
2763
|
};
|
|
2717
2764
|
}
|
|
2765
|
+
function isFairPlayCertificateRequest(keySystem, message) {
|
|
2766
|
+
return keySystem === "com.apple.fps.2_0" /* FAIR_PLAY_2_0 */ && (0, import_vinyl_util24.bufferToByteStr)(message) === "certificate";
|
|
2767
|
+
}
|
|
2718
2768
|
|
|
2719
2769
|
// src/drm/DrmKeySystemResolver.ts
|
|
2720
2770
|
var import_vinyl_mpd_parser = require("@amazon/vinyl-mpd-parser");
|
|
@@ -5223,7 +5273,8 @@ var RESTRICTABLE_CONTENT_TYPES = [
|
|
|
5223
5273
|
var drmProtectionValidator = /* @__PURE__ */ descriptorValidator.extend({
|
|
5224
5274
|
keySystem: /* @__PURE__ */ (0, import_vinyl_validation10.enumOf)(DrmKeySystem),
|
|
5225
5275
|
pro: /* @__PURE__ */ (0, import_vinyl_validation10.string)().maybe().optional(),
|
|
5226
|
-
pssh: /* @__PURE__ */ (0, import_vinyl_validation10.string)().maybe().optional()
|
|
5276
|
+
pssh: /* @__PURE__ */ (0, import_vinyl_validation10.string)().maybe().optional(),
|
|
5277
|
+
contentId: /* @__PURE__ */ (0, import_vinyl_validation10.string)().maybe().optional()
|
|
5227
5278
|
});
|
|
5228
5279
|
var mediaFormatMetadataValidator = /* @__PURE__ */ (0, import_vinyl_validation10.object)({
|
|
5229
5280
|
contentProtections: /* @__PURE__ */ (0, import_vinyl_validation10.array)(drmProtectionValidator).readonly(),
|
|
@@ -9520,6 +9571,54 @@ function buildSegmentTimeline(deps, baseUrl, segments) {
|
|
|
9520
9571
|
// src/track/hls/buildHlsMediaTimeline.ts
|
|
9521
9572
|
var import_vinyl_util94 = require("@amazon/vinyl-util");
|
|
9522
9573
|
var import_vinyl_transmux = require("@amazon/vinyl-transmux");
|
|
9574
|
+
|
|
9575
|
+
// src/track/hls/util/hlsKeyDrmInfo.ts
|
|
9576
|
+
var import_vinyl_mpd_parser5 = require("@amazon/vinyl-mpd-parser");
|
|
9577
|
+
var FAIR_PLAY_KEY_FORMAT = "com.apple.streamingkeydelivery";
|
|
9578
|
+
var PLAY_READY_KEY_FORMAT = "com.microsoft.playready";
|
|
9579
|
+
function hlsKeyDrmInfo(deps, key) {
|
|
9580
|
+
var _a, _b;
|
|
9581
|
+
const encryptionScheme = methodToEncryptionScheme(key == null ? void 0 : key.method);
|
|
9582
|
+
if (key == null || encryptionScheme == null) return null;
|
|
9583
|
+
const keyFormat = (_a = key.keyFormat) == null ? void 0 : _a.toLowerCase();
|
|
9584
|
+
let schemeIdUri;
|
|
9585
|
+
let initDataType;
|
|
9586
|
+
let contentId = null;
|
|
9587
|
+
if (keyFormat === FAIR_PLAY_KEY_FORMAT) {
|
|
9588
|
+
schemeIdUri = import_vinyl_mpd_parser5.ContentProtectionScheme.FAIR_PLAY;
|
|
9589
|
+
initDataType = "sinf";
|
|
9590
|
+
contentId = ((_b = key.uri) == null ? void 0 : _b.replace(/^skd:\/\//i, "")) || null;
|
|
9591
|
+
} else if (keyFormat === PLAY_READY_KEY_FORMAT) {
|
|
9592
|
+
schemeIdUri = import_vinyl_mpd_parser5.ContentProtectionScheme.PLAY_READY;
|
|
9593
|
+
initDataType = "cenc";
|
|
9594
|
+
} else if (keyFormat == null ? void 0 : keyFormat.startsWith("urn:uuid:")) {
|
|
9595
|
+
schemeIdUri = keyFormat;
|
|
9596
|
+
initDataType = "cenc";
|
|
9597
|
+
} else {
|
|
9598
|
+
return null;
|
|
9599
|
+
}
|
|
9600
|
+
const keySystems = deps.drmKeySystemResolver(schemeIdUri).filter((keySystem) => keySystem !== "com.apple.fps.1_0" /* FAIR_PLAY_1_0 */);
|
|
9601
|
+
if (keySystems.length === 0) return null;
|
|
9602
|
+
return {
|
|
9603
|
+
contentProtections: keySystems.map((keySystem) => __spreadValues({
|
|
9604
|
+
keySystem
|
|
9605
|
+
}, contentId != null && { contentId })),
|
|
9606
|
+
encryptionScheme,
|
|
9607
|
+
initDataType
|
|
9608
|
+
};
|
|
9609
|
+
}
|
|
9610
|
+
function methodToEncryptionScheme(method) {
|
|
9611
|
+
switch (method) {
|
|
9612
|
+
case "SAMPLE-AES":
|
|
9613
|
+
return "cbcs";
|
|
9614
|
+
case "SAMPLE-AES-CTR":
|
|
9615
|
+
return "cenc";
|
|
9616
|
+
default:
|
|
9617
|
+
return null;
|
|
9618
|
+
}
|
|
9619
|
+
}
|
|
9620
|
+
|
|
9621
|
+
// src/track/hls/buildHlsMediaTimeline.ts
|
|
9523
9622
|
function buildHlsMediaTimeline(deps, data3) {
|
|
9524
9623
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
9525
9624
|
const { mainPlaylist, baseUrl } = data3;
|
|
@@ -9618,7 +9717,7 @@ function createHlsQualityData(deps, data3, baseUrl, playlistUri, metadata) {
|
|
|
9618
9717
|
return {
|
|
9619
9718
|
metadata,
|
|
9620
9719
|
async getSegment(time, affordance = 0) {
|
|
9621
|
-
var _a;
|
|
9720
|
+
var _a, _b;
|
|
9622
9721
|
const playlist = await data3.getMediaPlaylist(playlistUri);
|
|
9623
9722
|
const playlistBaseUrl = getPlaylistBaseUrl(
|
|
9624
9723
|
playlist,
|
|
@@ -9634,8 +9733,12 @@ function createHlsQualityData(deps, data3, baseUrl, playlistUri, metadata) {
|
|
|
9634
9733
|
if (!segment) return null;
|
|
9635
9734
|
const hlsMap = (_a = playlist.segments[0]) == null ? void 0 : _a.map;
|
|
9636
9735
|
if (hlsMap) {
|
|
9736
|
+
const drmInfo = hlsKeyDrmInfo(
|
|
9737
|
+
deps,
|
|
9738
|
+
(_b = playlist.segments[segments.indexOf(segment)]) == null ? void 0 : _b.key
|
|
9739
|
+
);
|
|
9637
9740
|
return __spreadProps(__spreadValues({
|
|
9638
|
-
quality: metadata
|
|
9741
|
+
quality: drmInfo ? __spreadValues(__spreadValues({}, metadata), drmInfo) : metadata
|
|
9639
9742
|
}, segment), {
|
|
9640
9743
|
initData: createSegmentDataProvider(deps, {
|
|
9641
9744
|
url: (0, import_vinyl_util94.resolveUrl)(hlsMap.uri, playlistBaseUrl),
|
|
@@ -10528,7 +10631,12 @@ function createVinylFactories(options) {
|
|
|
10528
10631
|
trackController: (deps) => new TrackControllerImpl(deps, options.trackController),
|
|
10529
10632
|
drmKeySystemResolver: () => defaultDrmKeySystemResolver,
|
|
10530
10633
|
drmController: (deps) => new DrmControllerImpl(deps, options.drm),
|
|
10531
|
-
commonEme:
|
|
10634
|
+
commonEme: () => {
|
|
10635
|
+
var _a;
|
|
10636
|
+
return commonEmeFactory({
|
|
10637
|
+
preferPrefixedMediaKeys: (_a = options.drm) == null ? void 0 : _a.preferPrefixedMediaKeys
|
|
10638
|
+
});
|
|
10639
|
+
},
|
|
10532
10640
|
autoResetController: (deps) => new AutoResetControllerImpl(deps, options.autoReset),
|
|
10533
10641
|
adController: (deps) => new AdControllerImpl(deps, options.adController),
|
|
10534
10642
|
createDashFactories: createDashFactories(options),
|