[pose-detection]Allow MoveNet demo to swap model with customModel url… (#771)

* [pose-detection]Allow MoveNet demo to swap model with customModel url in demo.

* Address comments.

Author: lina128

pose-detection/demos/live_video/src/index.js

@@ -63,6 +63,10 @@ async function createDetector() {
       const modelType = STATE.modelConfig.type == 'lightning' ?
           posedetection.movenet.modelType.SINGLEPOSE_LIGHTNING :
           posedetection.movenet.modelType.SINGLEPOSE_THUNDER;
+      if (STATE.modelConfig.customModel !== '') {
+        return posedetection.createDetector(STATE.model, {modelType,
+          modelUrl: STATE.modelConfig.customModel});
+      }
       return posedetection.createDetector(STATE.model, {modelType});
   }
 }

pose-detection/demos/live_video/src/option_panel.js

@@ -165,6 +165,11 @@ function addMoveNetControllers(modelConfigFolder, type) {
     params.STATE.isModelChanged = true;
   });
 
+  const customModelController = modelConfigFolder.add(params.STATE.modelConfig, 'customModel');
+  customModelController.onFinishChange(_ => {
+    params.STATE.isModelChanged = true;
+  })
+
   modelConfigFolder.add(params.STATE.modelConfig, 'scoreThreshold', 0, 1);
 }
 

pose-detection/demos/live_video/src/params.js

@@ -42,7 +42,8 @@ export const POSENET_CONFIG = {
 export const MOVENET_CONFIG = {
   maxPoses: 1,
   type: 'lightning',
-  scoreThreshold: 0.3
+  scoreThreshold: 0.3,
+  customModel: ''
 };
 /**
  * This map descripes tunable flags and theior corresponding types.

pose-detection/src/movenet/detector.ts

@@ -483,16 +483,20 @@ export async function load(modelConfig: MoveNetModelConfig = MOVENET_CONFIG):
     Promise<PoseDetector> {
   const config = validateModelConfig(modelConfig);
   let model: tfc.GraphModel;
-  if (config.modelUrl) {
-    model = await tfc.loadGraphModel(config.modelUrl);
+
+  let fromTFHub = true;
+
+  if (!!config.modelUrl) {
+    fromTFHub = config.modelUrl.indexOf('https://tfhub.dev') > -1;
+    model = await tfc.loadGraphModel(config.modelUrl, {fromTFHub});
   } else {
     let modelUrl;
     if (config.modelType === SINGLEPOSE_LIGHTNING) {
       modelUrl = MOVENET_SINGLEPOSE_LIGHTNING_URL;
     } else if (config.modelType === SINGLEPOSE_THUNDER) {
       modelUrl = MOVENET_SINGLEPOSE_THUNDER_URL;
     }
-    model = await tfc.loadGraphModel(modelUrl, {fromTFHub: true});
+    model = await tfc.loadGraphModel(modelUrl, {fromTFHub});
   }
   return new MoveNetDetector(model, config);
 }