Consistency between native/plugin implementation, better handling of null manifest

Author: spetrangeli

samples/c2pa/c2pa-player.js

@@ -54,7 +54,12 @@ var C2PAMenu = function() {
         c2paItem: function (itemName, c2paStatus, compromisedRegions = []) {
 
             const verificationStatus = c2paStatus.verified;
-            const manifest = c2paStatus.details.video.manifest;
+            let manifest = null;
+            try {
+                manifest = c2paStatus.details.video.manifest;
+            } catch (error) {
+                console.error('[C2PA] Manifest does not exist');
+            }
 
             if (manifest != null && manifest['manifestStore'] != null) {
                 if (itemName == "SIG_ISSUER") {
@@ -292,7 +297,7 @@ var C2PAPlayer = function (videoJsPlayer, videoHtml, isMonolithic = false) {
 
         //Convert verification status to string since this value is saved in the segment dataset
         //If variable is not a boolean, we set the status to unknown
-        let verificationStatus = 'unkown';
+        let verificationStatus = 'unknown';
         if (typeof verificationStatusBool === 'boolean')
             verificationStatus = verificationStatusBool.toString();
 

samples/c2pa/plugin-dash/c2pa-dash-plugin.js

@@ -24,8 +24,9 @@ async function c2pa_init(player, onPlaybackTimeUpdated) {
                 let tag = chunk.streamId + '-' + chunk.mediaInfo.type + '-' + chunk.representationId;
 
                 if (chunk.segmentType == 'InitializationSegment') {
+                    //TODO: mimetype should change based on actual type from chunk
                     initFragment[tag] = new Blob([chunk.bytes], {type: 'video/mp4'});
-                    console.log('Got init seg for '+ tag)
+                    console.log('[C2PA] Got init seg for ' + tag)
                 } else if (!(tag in initFragment)) {
                     console.error('initFragment is null for ' + tag);
                 } else {
@@ -39,7 +40,7 @@ async function c2pa_init(player, onPlaybackTimeUpdated) {
                         'manifest': manifest
                     });
 
-                    console.log('C2pa manifest extracted for ' + tag);
+                    console.log('[C2PA] Manifest extracted for ' + tag + ': ', manifest);
                 }
 
                 return Promise.resolve(chunk);
@@ -76,8 +77,11 @@ async function c2pa_init(player, onPlaybackTimeUpdated) {
 
             let segs = tree[tag].search([e.time, e.time + 0.01]);
 
-            if (segs.length > 1)
+            if (segs.length > 1) {
                 detail['error'] = 'Retrieved unexpected number of segments: ' + segs.length + ' for media type ' + type;
+                isUndefined = true;
+                continue;
+            }
 
             if (segs.length == 0) {
                 detail['error'] = 'No segment found for media type ' + type;

src/streaming/C2pa.js

@@ -49,10 +49,13 @@ function C2paController(_eventBus) {
 
         // TODO(hawang) change the mimetype the actual one from the response
         // TODO(hawang) use InitCache created for each media type in BufferController instead of saving here
-        if (e.request.type == 'InitializationSegment') 
+        if (e.request.type == 'InitializationSegment') {
+            //TODO: mimetype should change based on actual type from chunk
             initFragment[tag] = new Blob([e.response], {type: 'video/mp4'});
+            console.log('[C2PA] Got init seg for ' + tag)
+        }
         else if (!(tag in initFragment)) {
-            console.error('initFragment is null');
+            console.error('initFragment is null ' + tag);
         } else {
             c2pa.then(result => {
                 result.readFragment(initFragment[tag], e.response)
@@ -64,7 +67,7 @@ function C2paController(_eventBus) {
                             'type': e.request.segmentType, 
                             'manifest': manifest
                         });
-                        console.log('C2pa manifest extracted for ' + tag + ': ' + manifest);
+                        console.log('[C2PA] Manifest extracted for ' + tag + ': ', manifest);
                     }).catch(error => console.error('Failed to extract C2pa manifest: ' + error));
             });
         }
@@ -97,8 +100,11 @@ function C2paController(_eventBus) {
 
             let segs = tree[tag].search([time, time + 0.01]);
 
-            if (segs.length > 1)
+            if (segs.length > 1) {
                 detail['error'] = 'Retrieved unexpected number of segments: ' + segs.length + ' for media type ' + type;
+                isUndefined = true;
+                continue;
+            }
 
             if (segs.length == 0) {
                 detail['error'] = 'No segment found for media type ' + type;