tirtc-react-native 2.4.2 → 2.5.0

package/src/video_input.ts

@@ -43,7 +43,7 @@ export class TiRtcVideoInput {
   private currentOutputSize: TiRtcSize | null = null;
   private currentOutputFps: number | null = null;
   private options: Required<TiRtcVideoInputOptions> = {
-    codec: 'h264',
+    media: 66,
     width: 640,
     height: 480,
     frameRate: 'fps15',
@@ -92,7 +92,7 @@ export class TiRtcVideoInput {
       return Promise.resolve(TIRTC_ERROR_INVALID_ARGUMENT);
     }
     const normalized = {
-      codec: options.codec ?? 'h264',
+      media: options.media === undefined ? 66 : options.media,
       width: options.width ?? 640,
       height: options.height ?? 480,
       frameRate: options.frameRate ?? 'fps15',
@@ -100,12 +100,16 @@ export class TiRtcVideoInput {
       cameraFacing: options.cameraFacing ?? 'front',
     };
     if (
+      !Number.isInteger(normalized.media) ||
+      ![65, 66].includes(normalized.media) ||
       !isPositiveInt32Size(normalized.width) ||
       !isPositiveInt32Size(normalized.height) ||
       !Number.isSafeInteger(normalized.bitrateKbps) ||
       normalized.bitrateKbps < 0 ||
       normalized.bitrateKbps > 4294967295
     ) {
+      logRtcOutcome('video_input_set_options', TIRTC_ERROR_INVALID_ARGUMENT,
+        ` nano_media=${typeof normalized.media === 'number' ? normalized.media : typeof normalized.media}`);
       return Promise.resolve(TIRTC_ERROR_INVALID_ARGUMENT);
     }
     return this.enqueue(async () => {
@@ -114,6 +118,8 @@ export class TiRtcVideoInput {
         return identity;
       }
       const code = await NativeTiRtc.videoInputSetOptions(identity.objectId, normalized);
+      logRtcOutcome('video_input_set_options', code,
+        ` nano_media=${normalized.media} width=${normalized.width} height=${normalized.height} fps=${['fps10', 'fps15', 'fps30'].includes(normalized.frameRate) ? normalized.frameRate : 'invalid'}`);
       if (code === TIRTC_ERROR_OK) {
         this.options = normalized;
       }
@@ -122,16 +128,20 @@ export class TiRtcVideoInput {
   }
 
   start(): Promise<number> {
-    return this.logged(
-      'video_input_start',
-      this.enqueue(async () => {
-        const identity = this.ensureIdentity();
-        if (typeof identity === 'number') {
-          return identity;
-        }
-        return NativeTiRtc.videoInputStart(identity.objectId);
-      }),
-    );
+    return this.enqueue(async () => {
+      const identity = this.ensureIdentity();
+      if (typeof identity === 'number') {
+        logRtcOutcome('video_input_start', identity);
+        return identity;
+      }
+      const wasRunning = this.state === 'running';
+      const code = await NativeTiRtc.videoInputStart(identity.objectId);
+      if (code !== TIRTC_ERROR_OK || !wasRunning) {
+        logRtcOutcome('video_input_start', code,
+          ` object_id=${identity.objectId} nano_media=${this.options.media} width=${this.options.width} height=${this.options.height} fps=${this.options.frameRate}`);
+      }
+      return code;
+    });
   }
 
   attach(connection: TiRtcConn, streamId: number): Promise<number> {