Integrating Cta608Parser From SVTA's Comon-Media-Library (#4522)

* Delete cea608-parser.js Deleted this since we are now using Cta608Parser from common-media-library instead * Update MediaPlayer.js setting Cta608Parser from comon-media-library for adapter to use * Update TextSourceBuffer.js Switching to Cta608Parser from common-media-library. Also includes changes that fixes emulation prevention bytes in cea-608 parsing. See #3719 * Update package.json new dependency for common-media-library version 0.7.0 * Update package-lock.json * Update dash.DashAdapter.js correcting unit test for the parser * Update package.json * Update package-lock.json * Update package.json * Update package-lock.json * Update webpack.config.js Configured polyfill for timers to resolve build issues related to xml2js dependency * Update webpack.config.js * Update package.json * Update package-lock.json * Update package.json * Update package-lock.json * fix: missing karam dep --------- Co-authored-by: Casey Occhialini <[email protected]>
Dash-Industry-Forum · Jul 1, 2024 · 3f9ecab · 3f9ecab
1 parent f4840e8
commit 3f9ecab
Show file tree

Hide file tree

Showing 11 changed files with 150 additions and 1,288 deletions.
diff --git a/externals/cea608-parser.js b/externals/cea608-parser.js
diff --git a/index.d.ts b/index.d.ts
@@ -1,4 +1,4 @@
-import * as CommonMediaLibrary from '@svta/common-media-library';
+import { CommonMediaRequest, CommonMediaResponse, RequestInterceptor, ResponseInterceptor } from '@svta/common-media-library/request'
 
 export = dashjs;
 export as namespace dashjs;
@@ -1527,13 +1527,13 @@ declare namespace dashjs {
 
         setProtectionData(value: ProtectionDataSet): void;
 
-        addRequestInterceptor(interceptor: CommonMediaLibrary.RequestInterceptor): void;
+        addRequestInterceptor(interceptor: RequestInterceptor): void;
 
-        removeRequestInterceptor(interceptor: CommonMediaLibrary.RequestInterceptor): void;
+        removeRequestInterceptor(interceptor: RequestInterceptor): void;
 
-        addResponseInterceptor(interceptor: CommonMediaLibrary.ResponseInterceptor): void;
+        addResponseInterceptor(interceptor: ResponseInterceptor): void;
 
-        removeResponseInterceptor(interceptor: CommonMediaLibrary.ResponseInterceptor): void;
+        removeResponseInterceptor(interceptor: ResponseInterceptor): void;
 
         registerLicenseRequestFilter(filter: RequestFilter): void;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
     "sinon": "^17.0.1",
     "stream-browserify": "^3.0.0",
     "string-replace-loader": "^3.1.0",
+    "timers-browserify": "^2.0.12",
     "typescript": "^5.4.5",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4",
@@ -56,7 +57,7 @@
     "yargs": "^17.7.2"
   },
   "dependencies": {
-    "@svta/common-media-library": "^0.6.4",
+    "@svta/common-media-library": "^0.7.1",
     "bcp-47-match": "^2.0.3",
     "bcp-47-normalize": "^2.3.0",
     "codem-isoboxer": "0.3.9",

diff --git a/src/streaming/MediaPlayer.js b/src/streaming/MediaPlayer.js
@@ -28,7 +28,7 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-import cea608parser from '../../externals/cea608-parser.js';
+import {Cta608Parser} from '@svta/common-media-library/cta/608/Cta608Parser';
 import Constants from './constants/Constants.js';
 import DashConstants from '../dash/constants/DashConstants.js';
 import MetricsConstants from './constants/MetricsConstants.js';
@@ -371,7 +371,7 @@ function MediaPlayer() {
 
             adapter.setConfig({
                 constants: Constants,
-                cea608parser: cea608parser,
+                cea608parser: new Cta608Parser(),
                 errHandler: errHandler,
                 BASE64: BASE64
             });

diff --git a/src/streaming/net/FetchLoader.js b/src/streaming/net/FetchLoader.js
@@ -53,8 +53,8 @@ function FetchLoader() {
 
     /**
      * Load request
-     * @param {CommonMediaLibrary.request.CommonMediaRequest} httpRequest
-     * @param {CommonMediaLibrary.request.CommonMediaResponse} httpResponse
+     * @param {CommonMediaRequest} httpRequest
+     * @param {CommonMediaResponse} httpResponse
      */
     function load(httpRequest, httpResponse) {
         // Variables will be used in the callback functions

diff --git a/src/streaming/net/HTTPLoader.js b/src/streaming/net/HTTPLoader.js
@@ -361,8 +361,8 @@ function HTTPLoader(cfg) {
         const traces = [];
         let firstProgress, requestStartTime, lastTraceTime, lastTraceReceivedCount, progressTimeout;
 
-        let httpRequest; // CommonMediaLibrary.request.CommonMediaRequest
-        let httpResponse; // CommonMediaLibrary.request.CommonMediaResponse
+        let httpRequest; // CommonMediaRequest
+        let httpResponse; // CommonMediaResponse
 
         requestObject.bytesLoaded = NaN;
         requestObject.bytesTotal = NaN;
@@ -400,7 +400,7 @@ function HTTPLoader(cfg) {
             customData: { request: requestObject }
         };
 
-        // Init response (CommonMediaLibrary.request.CommoneMediaResponse)
+        // Init response (CommoneMediaResponse)
         httpResponse = {
             request: httpRequest,
             resourceTiming: {

diff --git a/src/streaming/net/XHRLoader.js b/src/streaming/net/XHRLoader.js
@@ -43,8 +43,8 @@ function XHRLoader() {
 
     /**
      * Load request
-     * @param {CommonMediaLibrary.request.CommonMediaRequest} httpRequest
-     * @param {CommonMediaLibrary.request.CommonMediaResponse} httpResponse
+     * @param {CommonMediaRequest} httpRequest
+     * @param {CommonMediaResponse} httpResponse
      */
     function load(httpRequest, httpResponse) {
         xhr = new XMLHttpRequest();