@byteplus/react-native-rtc 1.0.0 → 1.0.2

package/android/src/main/java/com/volcengine/reactnative/vertc/vod/VodVideoProxy.java

@@ -0,0 +1,97 @@
+// Copyright © 2022 BytePlusRTC All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package com.volcengine.reactnative.vertc.vod;
+
+import android.graphics.SurfaceTexture;
+import android.opengl.EGLContext;
+import android.util.Log;
+import android.view.Surface;
+
+import com.ss.bytertc.engine.RTCVideo;
+import com.ss.bytertc.engine.data.ColorSpace;
+import com.ss.bytertc.engine.data.ReturnStatus;
+import com.ss.bytertc.engine.data.StreamIndex;
+import com.ss.bytertc.engine.data.VideoPixelFormat;
+import com.ss.bytertc.engine.data.VideoRotation;
+import com.ss.bytertc.engine.data.VideoSourceType;
+import com.ss.bytertc.engine.video.VideoFrame;
+import com.ss.bytertc.engine.video.builder.GLTextureVideoFrameBuilder;
+import com.ss.ttvideoengine.TTVideoEngine;
+import com.ss.ttvideoengine.VideoEngineCallback;
+
+public class VodVideoProxy {
+  private String TAG = "VodVideoProxy";
+
+  private TTVideoEngine mVideoEngine;
+  private RTCVideo mRTCVideo;
+
+  private OESTextureProcessor mOESTextureProcessor;
+
+  private final OESTextureProcessor.IProcessorCallback mProcessorCallback = new OESTextureProcessor.IProcessorCallback() {
+    @Override
+    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+      TTVideoEngine videoEngine = mVideoEngine;
+      if (videoEngine != null) {
+        videoEngine.setSurface(new Surface(surface));
+      }
+    }
+
+    @Override
+    public void onSurfaceTextureDestroyed(SurfaceTexture surface) {
+      TTVideoEngine videoEngine = mVideoEngine;
+      if (videoEngine != null) {
+        videoEngine.setSurface(null);
+      }
+    }
+
+    @Override
+    public void onFrameAvailable(EGLContext eglContext, int oesTextureId, float[] transformMatrix, int width, int height, long timestamp) {
+      GLTextureVideoFrameBuilder builder = new GLTextureVideoFrameBuilder(VideoPixelFormat.TEXTURE_OES)
+        .setTextureID(oesTextureId)
+        .setWidth(width)
+        .setHeight(height)
+        .setRotation(VideoRotation.VIDEO_ROTATION_0)
+        .setTextureMatrix(transformMatrix)
+//        .setTimeStampUs(timestamp)
+        .setTimeStampUs(System.nanoTime())
+        .setColorSpace(ColorSpace.UNKNOWN)
+        .setEGLContext(eglContext);
+      VideoFrame frame = builder.build();
+//      frame.retain();
+//      Log.d(TAG, "pushScreenVideoFrame: " + frame));
+      int ret_status = mRTCVideo.pushScreenVideoFrame(frame);
+      boolean result = ret_status == ReturnStatus.RETURN_STATUS_SUCCESS.value()
+        || ret_status == ReturnStatus.RETURN_STATUS_VIDEO_TIMESTAMP_WARNING.value();
+      if (!result) {
+        Log.d(TAG, "pushScreenVideoFrame fail: " + ret_status);
+      }
+    }
+  };
+
+  public void initEngine(TTVideoEngine videoEngine, RTCVideo rtcEngine) {
+    OESTextureProcessor textureProcessor = mOESTextureProcessor;
+    if (textureProcessor != null) {
+      textureProcessor.destroy();
+    }
+    
+    mVideoEngine = videoEngine;
+    mRTCVideo = rtcEngine;
+    mOESTextureProcessor = new OESTextureProcessor();
+    
+//    var width = mVideoEngine.getVideoWidth();
+//    var height = mVideoEngine.getVideoWidth();
+    var width = 1920;
+    var height = 1080;
+    mRTCVideo.setVideoSourceType(StreamIndex.STREAM_INDEX_SCREEN, VideoSourceType.VIDEO_SOURCE_TYPE_EXTERNAL);
+    mOESTextureProcessor.initSurfaceTexture(width, height, mProcessorCallback);
+  }
+  
+  public void release() {
+    if (mOESTextureProcessor != null) {
+      mOESTextureProcessor.destroy();
+      mOESTextureProcessor = null;
+    }
+    mVideoEngine = null;
+  }
+}

package/ios/vod/VertcVod.m

@@ -12,7 +12,6 @@
 
 @interface VertcVod ()
 
-@property (nonatomic, strong) NSDictionary *options;
 @property (nonatomic, strong) ByteRTCVideo *rtcEngine;
 @property (nonatomic, strong) TTVideoEngine *videoEngine;
 @property (nonatomic, strong) VodAudioProcessor *audioProcesser;
@@ -50,10 +49,9 @@
     }
     
     self.rtcEngine = rtc;
-    self.options = options;
     self.videoEngine = videoEngine;
-    self.audioProcesser = [[VodAudioProcessor alloc] initWithRTCKit:rtc options:options];
-    self.videoProcesser = [[VodVideoProcessor alloc] initWithRTCKit:rtc options:options];
+    self.audioProcesser = [[VodAudioProcessor alloc] initWithRTCKit:rtc];
+    self.videoProcesser = [[VodVideoProcessor alloc] initWithRTCKit:rtc];
     
     ttAudioWrapper.open = openAudio;
     ttAudioWrapper.process = processAudio;
@@ -75,10 +73,6 @@
     ttAudioWrapper.context = NULL;
     ttVideoWrapper.context = NULL;
     [rtc setVideoSourceType:ByteRTCVideoSourceTypeInternal WithStreamIndex:ByteRTCStreamIndexScreen];
-    [rtc setScreenAudioSourceType:ByteRTCAudioSourceTypeInternal];
-    self.options = nil;
-    self.rtcEngine = nil;
-    self.videoEngine = nil;
     return 0;
 }
 
@@ -120,8 +114,7 @@ static void videoProcessFunc(void *context, CVPixelBufferRef frame, int64_t time
 }
 
 static void videoReleaseFunc(void *context) {
-    VodVideoProcessor *process = (__bridge VodVideoProcessor *)(context);
-    [process releaseVideo];
+    
 }
 
 @end

package/ios/vod/VodAudioProcessor.h

@@ -19,7 +19,7 @@ extern int VoidAudioMixingID;
 
 /// Initialize
 /// @param rtcKit ByteRTCEngineKit
-- (instancetype)initWithRTCKit:(ByteRTCVideo *)rtcKit options:(NSDictionary *)options;
+- (instancetype)initWithRTCKit:(ByteRTCVideo *)rtcKit;
 
 /// Open audio
 /// @param samplerate Samplerate

package/ios/vod/VodAudioProcessor.mm

@@ -13,7 +13,6 @@ int VoidAudioMixingID = 3001;
 @interface VodAudioProcessor ()
 
 @property (nonatomic, weak) ByteRTCVideo *rtcKit;
-@property (nonatomic, weak) NSDictionary *options;
 @property (nonatomic, assign) int length;
 
 @end
@@ -26,10 +25,9 @@ int VoidAudioMixingID = 3001;
     int64_t _lastTimestamp;
 }
 
-- (instancetype)initWithRTCKit:(ByteRTCVideo *)rtcKit options:(NSDictionary *)options {
+- (instancetype)initWithRTCKit:(ByteRTCVideo *)rtcKit {
     if (self = [super init]) {
         self.rtcKit = rtcKit;
-        self.options = options;
         _lastDiffTimestamp = 0;
         _lastTimestamp = 0;
         [rtcKit setScreenAudioSourceType:ByteRTCAudioSourceTypeExternal];

package/ios/vod/VodVideoProcessor.h

@@ -16,13 +16,11 @@
 
 /// Initialize
 /// @param rtcKit ByteRTCEngineKit
-- (instancetype)initWithRTCKit:(ByteRTCVideo *)rtcKit options:(NSDictionary *)options;
+- (instancetype)initWithRTCKit:(ByteRTCVideo *)rtcKit;
 
 /// Process video
 /// @param frame Video pixel buffer
 /// @param timestamp Timestamp
 - (void)processVideo:(CVPixelBufferRef)frame timestamp:(int64_t)timestamp;
 
-- (void)releaseVideo;
-
 @end

package/ios/vod/VodVideoProcessor.m

@@ -14,41 +14,21 @@
 @interface VodVideoProcessor ()
 
 @property (nonatomic, weak) ByteRTCVideo *rtcKit;
-@property (nonatomic, weak) NSDictionary *options;
-@property (nonatomic, assign) NSInteger time;
-@property (nonatomic, assign) int fps;
 
 @end
 
 @implementation VodVideoProcessor
 
-- (instancetype)initWithRTCKit:(ByteRTCVideo *)rtcKit options:(NSDictionary *)options {
+- (instancetype)initWithRTCKit:(ByteRTCVideo *)rtcKit {
     if (self = [super init]) {
         self.rtcKit = rtcKit;
-        self.options = options;
-        self.fps = [[options valueForKey:@"fps"] intValue];
-        self.time = 0;
         [rtcKit setVideoSourceType:ByteRTCVideoSourceTypeExternal WithStreamIndex:ByteRTCStreamIndexScreen];
     }
     return self;
 }
 
 - (void)processVideo:(CVPixelBufferRef)frame timestamp:(int64_t)timestamp {
-    if (_fps < 1) {
-        if (timestamp > 0) {
-            _fps = 1000 / (timestamp - 0);
-            NSLog(@"detect video fps=%d", _fps);
-        }
-    }
-    int res = [self.rtcKit pushScreenVideoFrame:frame time:CMTimeMake(self.time, self.fps) rotation:0];
-    if (res != 0) {
-        NSLog(@"bytertc pushScreenVideoFrame fail return '%d'", res);
-    }
-    self.time += 1;
-}
-
-- (void)releaseVideo {
-    NSLog(@"video release");
+    [self.rtcKit pushScreenVideoFrame:frame time:CMTimeMake(timestamp, 1) rotation:0];
 }
 
 @end