chore: merge 'main' into develop

.github/workflows/firebase-hosting-merge.yml

@@ -1,22 +1,22 @@
 # This file was auto-generated by the Firebase CLI
 # https://github.com/firebase/firebase-tools
 
-name: Deploy to Firebase Hosting on merge
-'on':
-  push:
-    branches:
-      - main
-jobs:
-  build_and_deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: npm ci && npm run build
-      - uses: FirebaseExtended/action-hosting-deploy@v0
-        with:
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_WEB_EYE_TRACKER_FRONT }}'
-          channelId: live
-          projectId: web-eye-tracker-front
-        env:
-          FIREBASE_CLI_PREVIEWS: hostingchannels
+# name: Deploy to Firebase Hosting on merge
+# 'on':
+#   push:
+#     branches:
+#       - main
+# jobs:
+#   build_and_deploy:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v2
+#       - run: npm ci && npm run build
+#       - uses: FirebaseExtended/action-hosting-deploy@v0
+#         with:
+#           repoToken: '${{ secrets.GITHUB_TOKEN }}'
+#           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_WEB_EYE_TRACKER_FRONT }}'
+#           channelId: live
+#           projectId: web-eye-tracker-front
+#         env:
+#           FIREBASE_CLI_PREVIEWS: hostingchannels

.github/workflows/firebase-hosting-pull-request.yml

@@ -1,18 +1,18 @@
 # This file was auto-generated by the Firebase CLI
 # https://github.com/firebase/firebase-tools
 
-name: Deploy to Firebase Hosting on PR
-'on': pull_request
-jobs:
-  build_and_preview:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: npm ci && npm run build
-      - uses: FirebaseExtended/action-hosting-deploy@v0
-        with:
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_WEB_EYE_TRACKER_FRONT }}'
-          projectId: web-eye-tracker-front
-        env:
-          FIREBASE_CLI_PREVIEWS: hostingchannels
+# name: Deploy to Firebase Hosting on PR
+# 'on': pull_request
+# jobs:
+#   build_and_preview:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v2
+#       - run: npm ci && npm run build
+#       - uses: FirebaseExtended/action-hosting-deploy@v0
+#         with:
+#           repoToken: '${{ secrets.GITHUB_TOKEN }}'
+#           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_WEB_EYE_TRACKER_FRONT }}'
+#           projectId: web-eye-tracker-front
+#         env:
+#           FIREBASE_CLI_PREVIEWS: hostingchannels

src/views/DoubleCalibrationRecord.vue

@@ -39,20 +39,22 @@
 </template>
 
 <script>
+
 export default {
+  
   data() {
     return {
       // camera
       webcamfile: null,
       recordWebCam: null,
       configWebCam: {
         audio: false,
-        video: {
-          width: 1536,
-          height: 864,
+        video: { 
+          width: document.getElementById("video-tag").videoWidth,
+          height: document.getElementById("video-tag").videoHeight,
         },
       },
-
+      
       // cablibration
       circleIrisPoints: [],
       calibPredictionPoints: [],
@@ -308,13 +310,15 @@ export default {
     // canvas related
     async startWebCamCapture() {
       // Request permission for screen capture
+
       return navigator.mediaDevices
         .getUserMedia(this.configWebCam)
         .then(async (mediaStreamObj) => {
           // Create media recorder object
           this.recordWebCam = new MediaRecorder(mediaStreamObj, {
             mimeType: "video/webm;",
           });
+          
           let recordingWebCam = [];
           let video = document.getElementById("video-tag");
           video.srcObject = mediaStreamObj;
@@ -325,6 +329,7 @@ export default {
           };
           // OnStop WebCam Record
           const th = this;
+          
           this.recordWebCam.onstop = () => {
             // Generate blob from the frames
             let blob = new Blob(recordingWebCam, { type: "video/webm" });
@@ -344,18 +349,20 @@ export default {
         })
         .catch((e) => {
           console.error("Error", e);
-          this.stopRecord();
         });
     },
+
     async detectFace() {
       const lastPrediction = await this.model.estimateFaces({
         input: document.getElementById("video-tag"),
       });
       return lastPrediction
     },
+
     stopRecord() {
       this.recordWebCam.state != "inactive" ? this.stopWebCamCapture() : null;
     },
+
     async stopWebCamCapture() {
       await this.recordWebCam.stop();
       this.calibFinished = true;