@byteplus/react-native-live-push 1.1.3-rc.4 → 1.2.0-rc.0

package/android/build.gradle

@@ -87,6 +87,6 @@ dependencies {
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"
-    implementation "com.volcengine:VolcApiEngine:1.2.3"
-    api 'com.bytedanceapi:ttsdk-ttlivepush_rtc:1.41.300.103'
+    implementation "com.volcengine:VolcApiEngine:1.6.2"
+    api 'com.bytedanceapi:ttsdk-ttlivepush_rtc:1.46.300.2'
 }

package/android/src/main/java/com/volcengine/velive/rn/push/ClassHelper.java

@@ -0,0 +1,9 @@
+package com.volcengine.velive.rn.push;
+import com.ss.avframework.live.statistics.VeLivePusherStatisticsExt;
+import com.volcengine.VolcApiEngine.runtime.Util;
+
+public class ClassHelper {
+  public static void init() {
+    Util.JsonAbleClass.add(VeLivePusherStatisticsExt.class);
+  }
+}

package/android/src/main/java/com/volcengine/velive/rn/push/NativeVariableManager.java

@@ -1,19 +1,16 @@
 package com.volcengine.velive.rn.push;
 
 import androidx.annotation.NonNull;
-
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.volcengine.VolcApiEngine.*;
 
 public class NativeVariableManager {
-  static void init(@NonNull VolcApiEngine apiEngine, ReactApplicationContext reactContext) {
+  static void init(@NonNull VolcApiEngine apiEngine,
+                   ReactApplicationContext reactContext) {
     var m = apiEngine.msgClient.proto.variableManager;
-    
-    m.registerVar("ApplicationContext", (Object[] args) -> reactContext.getApplicationContext());
-    m.registerVar("ReactApplicationContext", (Object[] args) -> reactContext);
 
-    var helper = new ScreenCaptureHelper(reactContext);
-    m.registerVar("screenIntent", helper::getScreenIntent);
-    helper.setup();
+    m.registerVar("ApplicationContext",
+                  (Object[] args) -> reactContext.getApplicationContext());
+    m.registerVar("ReactApplicationContext", (Object[] args) -> reactContext);
   }
 }

package/android/src/main/java/com/volcengine/velive/rn/push/VeLivePushModule.java

@@ -50,6 +50,7 @@ public class VeLivePushModule extends VeLivePushModuleSpec implements IEventRece
       apiEngine = new VolcApiEngine(getReactApplicationContext(), this);
 
       NativeVariableManager.init(apiEngine, super.context);
+      ClassHelper.init();
       return true;
     }
 

package/android/src/main/java/com/volcengine/velive/rn/push/mixer/MixerManager.java

@@ -167,6 +167,7 @@ public class MixerManager {
         MixerView mixerView = (MixerView)view;
         mixerView.setBitmapCaptureCallback(null);
       }
+      cachedMixedViews.remove(viewId);
 
       pusher.getMixerManager().removeVideoStream(layout.streamId);
       return true;
@@ -267,9 +268,6 @@ public class MixerManager {
           } catch (Exception e) {
             // Ignore
           } finally {
-            if (bitmap != null && !bitmap.isRecycled()) {
-              bitmap.recycle();
-            }
             textureMgr.cleanup();
           }
         }

package/android/src/main/java/com/volcengine/velive/rn/push/mixer/MixerView.java

@@ -150,7 +150,7 @@ public class MixerView extends FrameLayout {
 
   private void startRealtimeCapture() {
     long interval = (long)(1000f / captureFramerate);
-    
+
     captureRunnable = new Runnable() {
       @Override
       public void run() {
@@ -260,7 +260,7 @@ public class MixerView extends FrameLayout {
       return;
     }
     lastCaptureTime = currentTime;
-    
+
     synchronized (captureLock) {
       if (isCapturing.compareAndSet(false, true)) {
         Bitmap bitmap = null;
@@ -271,9 +271,16 @@ public class MixerView extends FrameLayout {
           }
         } catch (OutOfMemoryError e) {
           System.gc();
+          // If an OOM occurs and the bitmap has not been passed to
+          // processBitmap, recycle it
+          if (bitmap != null && !bitmap.isRecycled()) {
+            bitmap.recycle();
+          }
+        } catch (Exception e) {
+          // If any other exception occurs and the bitmap has not been passed to
+          // processBitmap, recycle it
           if (bitmap != null && !bitmap.isRecycled()) {
             bitmap.recycle();
-            bitmap = null;
           }
         } finally {
           isCapturing.set(false);
@@ -313,7 +320,7 @@ public class MixerView extends FrameLayout {
       }
       return;
     }
-    
+
     // Call callback first if set (for MixerManager)
     if (bitmapCaptureCallback != null) {
       try {
@@ -321,7 +328,8 @@ public class MixerView extends FrameLayout {
         bitmapCaptureCallback.onBitmapCaptured(bitmap);
       } catch (Exception e) {
         if (bitmapCaptureCallback != null) {
-          bitmapCaptureCallback.onCaptureError("Callback error: " + e.getMessage());
+          bitmapCaptureCallback.onCaptureError("Callback error: " +
+                                               e.getMessage());
         }
       }
     } else {
@@ -341,19 +349,23 @@ public class MixerView extends FrameLayout {
       } catch (IllegalStateException e) {
         // Ignore
       }
-      
-      // if no callback, recycle immediately to avoid accumulation
-      if (bitmap != null && !bitmap.isRecycled()) {
-        bitmap.recycle();
-        return;
-      }
     }
 
     // Clean up old bitmap
     if (lastBitmap != null && !lastBitmap.isRecycled()) {
       lastBitmap.recycle();
     }
-    lastBitmap = bitmap;
+
+    // 如果没有设置回调，立即释放当前 bitmap 以避免内存累积
+    // 如果设置了回调，bitmap 将由回调的接收方负责管理
+    if (bitmapCaptureCallback == null) {
+      if (bitmap != null && !bitmap.isRecycled()) {
+        bitmap.recycle();
+      }
+      lastBitmap = null;
+    } else {
+      lastBitmap = bitmap;
+    }
   }
 
   public void handleCommand(String command, @Nullable ReadableArray args) {
@@ -384,7 +396,7 @@ public class MixerView extends FrameLayout {
       MixerManager.onViewReady(viewId, this);
     }
   }
-  
+
   @Override
   protected void onDetachedFromWindow() {
     super.onDetachedFromWindow();
@@ -393,24 +405,23 @@ public class MixerView extends FrameLayout {
     }
     cleanup();
   }
-  
-  public void setViewId(String viewId) { 
-    this.viewId = viewId; 
+
+  public void setViewId(String viewId) {
+    this.viewId = viewId;
     MixerManager.cachedMixedViews.put(viewId, this);
     // 通知MixerManager视图已准备好，检查是否有待处理的回调
     MixerManager.onViewReady(viewId, this);
   }
 
   // Add callback support for MixerManager integration
-  public void setBitmapCaptureCallback(MixerManager.BitmapCaptureCallback callback) {
+  public void
+  setBitmapCaptureCallback(MixerManager.BitmapCaptureCallback callback) {
     this.bitmapCaptureCallback = callback;
   }
 
   // Public method for manual capture (called by MixerManager)
-  public void performManualCapture() {
-    performCapture("manual");
-  }
-  
+  public void performManualCapture() { performCapture("manual"); }
+
   private void cleanup() {
     isDestroyed.set(true);
     stopCapture();
@@ -420,4 +431,4 @@ public class MixerView extends FrameLayout {
       lastBitmap = null;
     }
   }
-} 
+}

package/ios/VeLiveMixerHelper.h

@@ -5,8 +5,8 @@
 //  Created by ByteDance on 2024/12/09.
 //
 
-#import <Foundation/Foundation.h>
 #import "VeLiveMixerView.h"
+#import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -17,9 +17,10 @@ NS_ASSUME_NONNULL_BEGIN
 @interface VeLiveMixerHelper : NSObject <VeLiveBitmapCaptureCallback>
 
 // 对齐Android的static cachedMixedViews
-@property (class, nonatomic, strong) NSMutableDictionary<NSString *, VeLiveMixerUIView *> *cachedMixedViews;
+@property(class, nonatomic, strong)
+    NSMutableDictionary<NSString *, VeLiveMixerUIView *> *cachedMixedViews;
 
-@property (nonatomic, weak) VeLivePusher *pusher;
+@property(nonatomic, weak) VeLivePusher *pusher;
 
 - (instancetype)initWithPusher:(VeLivePusher *)pusher;
 
@@ -31,7 +32,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)captureView:(NSString *)viewId;
 
 // Static方法 - 只保留Android中实际存在的
-+ (void)setupCallbackForMixerView:(VeLiveMixerUIView *)mixerView streamId:(int)streamId;
++ (void)setupCallbackForMixerView:(VeLiveMixerUIView *)mixerView
+                         streamId:(int)streamId;
 + (void)sendBitmapToMixerStatic:(int)streamId bitmap:(UIImage *)bitmap;
 + (VeLiveMixerHelper *)findActiveMixerManager;
 + (void)onViewReady:(NSString *)viewId mixerView:(VeLiveMixerUIView *)mixerView;
@@ -41,4 +43,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END 
+NS_ASSUME_NONNULL_END

package/ios/VeLiveMixerHelper.m

@@ -6,7 +6,7 @@
 //
 
 #import "VeLiveMixerHelper.h"
-#import <TTSDKLivePushRTS/TTSDKLivePushRTS.h>
+#import <TTSDKFramework/VeLivePusher.h>
 #import <UIKit/UIKit.h>
 #import <mach/mach.h>
 #import <mach/task_info.h>

package/ios/VeLiveMixerViewManager.m

@@ -33,7 +33,7 @@ RCT_CUSTOM_VIEW_PROPERTY(viewId, NSString, VeLiveMixerUIView) {
   if (json == nil) {
     return;
   }
-  
+
   NSString *viewId = [RCTConvert NSString:json];
   [view setViewId:viewId];
 }
@@ -89,4 +89,4 @@ RCT_CUSTOM_VIEW_PROPERTY(autoSensitivity, NSNumber, VeLiveMixerUIView) {
   [view setAutoSensitivity:sensitivity];
 }
 
-@end 
+@end