gemercheung 3 years ago
parent
commit
9fcd58e4c1
2 changed files with 11 additions and 6 deletions
  1. 5 5
      src/meta.gateway.ts
  2. 6 1
      src/scene/scene.service.ts

+ 5 - 5
src/meta.gateway.ts

@@ -23,6 +23,7 @@ import * as path from 'path';
 import { createReadStream } from 'fs';
 import { SceneService } from './scene/scene.service';
 import { ConfigService } from '@nestjs/config';
+import { stringify } from 'querystring';
 
 // 'Verbose' | 'Debug' | 'Info' | 'Warning' | 'Error' | 'Fatal';
 initLogger('Debug');
@@ -34,12 +35,11 @@ initLogger('Debug');
   path: '/ws',
 })
 export class MetaGateway
-  implements OnGatewayInit, OnGatewayConnection, OnGatewayDisconnect
-{
+  implements OnGatewayInit, OnGatewayConnection, OnGatewayDisconnect {
   constructor(
     private readonly sceneService: SceneService,
     private readonly configService: ConfigService,
-  ) {}
+  ) { }
   private logger: Logger = new Logger('MetaGateway');
   private peer: PeerConnection = null;
   private timer: NodeJS.Timeout;
@@ -255,7 +255,7 @@ export class MetaGateway
       this.sceneService.init(requestPayLoad);
       this.logger.log(
         'start and send to gprc sceneService,method=>init',
-        requestPayLoad,
+        JSON.stringify(requestPayLoad),
       );
 
       const startReply = {
@@ -277,7 +277,7 @@ export class MetaGateway
         }
         // debugger
       });
-    } catch (error) {}
+    } catch (error) { }
   }
 
   handleConnection(client: WebSocket, ...args: any[]) {

+ 6 - 1
src/scene/scene.service.ts

@@ -129,9 +129,14 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
     const reply = this.sceneGrpcService.rotate(request);
     if (!this.onSteaming) {
       this.frameCnt += 1;
+
+      const demoPath =
+        this.frameCnt > 10
+          ? path.join(__dirname, '../ws/video/53.h264')
+          : path.join(__dirname, '../ws/video/2.h264');
       const stream: StreamFrameType = {
         frame: this.frameCnt,
-        clipPath: path.join(__dirname, '../ws/video/2.h264'),
+        clipPath: demoPath,
         metaData: JSON.stringify(frameMetaReply),
         serverTime: 754873824,
         DIR: 1,