From e909cf1aedeba1b5aaa1dd67bfef1034109b30e3 Mon Sep 17 00:00:00 2001 From: juanmanuel-qualabs Date: Wed, 25 Jun 2025 15:35:00 -0300 Subject: [PATCH] Re added convertToCmcdV1 function from CML --- src/streaming/controllers/CmcdController.js | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/streaming/controllers/CmcdController.js b/src/streaming/controllers/CmcdController.js index ee4cc6d4cb..cbcaf55619 100644 --- a/src/streaming/controllers/CmcdController.js +++ b/src/streaming/controllers/CmcdController.js @@ -39,7 +39,7 @@ import Debug from '../../core/Debug.js'; import {encodeCmcd} from '@svta/common-media-library/cmcd/encodeCmcd'; import {toCmcdHeaders} from '@svta/common-media-library/cmcd/toCmcdHeaders'; import {CmcdHeaderField} from '@svta/common-media-library/cmcd/CmcdHeaderField'; - +import {convertToCmcdV1} from '@svta/common-media-library/cmcd/CmcdV2ToCmcdV1'; import CmcdReportRequest from '../../streaming/vo/CmcdReportRequest.js'; import Utils from '../../core/Utils.js'; @@ -579,10 +579,7 @@ function CmcdController() { const cmcdVersion = settings.get().streaming.cmcd.version ?? Constants.CMCD_DEFAULT_VERSION; if (cmcdVersion === 1) { - // TODO: Re-Add this import once common-media-library pr is merged: https://github.com/qualabs/common-media-library/pull/48 - // Also remove the temporaryConvertToCmcdV1 line - // cmcdRequestData = convertToCmcdV1(cmcdRequestData); - cmcdRequestData = temporaryConvertToCmcdV1(cmcdRequestData); + cmcdRequestData = convertToCmcdV1(cmcdRequestData); } request.cmcd = cmcdRequestData; @@ -600,19 +597,6 @@ function CmcdController() { return commonMediaRequest; } - // TODO: delete this once common-media-library pr is merged: https://github.com/qualabs/common-media-library/pull/48 - function temporaryConvertToCmcdV1(cmcdData) { - const result = {}; - - for (const key in cmcdData) { - if (Constants.CMCD_AVAILABLE_KEYS.includes(key)) { - result[key] = cmcdData[key]; - } - } - - return result; - } - function getCmcdResponseInterceptors(){ return [_cmcdResponseModeInterceptor]; }