@byteplus/react-native-live-push 1.2.0-rc.0 → 1.3.0-rc.1

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.6.2"
+    implementation "com.volcengine:VolcApiEngine:1.6.4"
     api 'com.bytedanceapi:ttsdk-ttlivepush_rtc:1.46.300.2'
 }

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

@@ -0,0 +1,222 @@
+package com.volcengine.velive.rn.push;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.pandora.common.env.Env;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class VeLiveEffectHelper {
+  static Context context;
+  /**
+   * 获取证书文件路径
+   */
+  public static String getLicensePath(String name) {
+    // Context context = Env.getApplicationContext();
+    if (context == null) {
+      throw new IllegalStateException("context not set");
+    }
+    return context.getExternalFilesDir("assets").getAbsolutePath()
+        + "/resource/LicenseBag.bundle/" + name;
+  }
+
+  /**
+   * 获取模型文件路径
+   */
+  public static String getModelPath() {
+    // Context context = Env.getApplicationContext();
+    if (context == null) {
+      throw new IllegalStateException("context not set");
+    }
+    return context.getExternalFilesDir("assets").getAbsolutePath()
+        + "/resource/ModelResource.bundle";
+  }
+
+  /**
+   * 获取美颜文件路径
+   */
+  public static String getBeautyPathByName(String subPath) {
+    // Context context = Env.getApplicationContext();
+    if (context == null) {
+      throw new IllegalStateException("context not set");
+    }
+    return context.getExternalFilesDir("assets").getAbsolutePath()
+        + "/resource/ComposeMakeup.bundle/ComposeMakeup/" + subPath;
+  }
+
+  /**
+   * 获取贴纸文件路径
+   * 
+   * @param name 贴纸文件名称
+   */
+  public static String getStickerPathByName(String name) {
+    // Context context = Env.getApplicationContext();
+    if (context == null) {
+      throw new IllegalStateException("context not set");
+     }
+    return context.getExternalFilesDir("assets").getAbsolutePath()
+        + "/resource/StickerResource.bundle/stickers/" + name;
+  }
+
+  /**
+   * 获取滤镜文件路径
+   * 
+   * @param name 滤镜文件名称
+   */
+  public static String getFilterPathByName(String name) {
+    // Context context = Env.getApplicationContext();
+    if (context == null) {
+      throw new IllegalStateException("context not set");
+    }
+    return context.getExternalFilesDir("assets").getAbsolutePath()
+        + "/resource/FilterResource.bundle/Filter/" + name;
+  }
+
+  /**
+   * 初始化美颜资源文件
+   * 将安装包内的资源文件拷贝到外部存储上
+   */
+  public static void initVideoEffectResource() {
+    // Context context = Env.getApplicationContext();
+    if (context == null) {
+      throw new IllegalStateException("context not set");
+    }
+    
+//    File versionFile = new File(getExternalResourcePath(), "version");
+//    if (versionFile.exists()) {
+//      String oldVer = readVersion(versionFile.getAbsolutePath());
+//      copyAssetFolder(context, "resource/version", versionFile.getAbsolutePath());
+//      String newVer = readVersion(versionFile.getAbsolutePath());
+//      if (TextUtils.equals(oldVer, newVer)) {
+//        return;
+//      }
+//    } else {
+//      copyAssetFile(context, "resource/version", versionFile.getAbsolutePath());
+//    }
+    updateEffectResource(context);
+  }
+
+  private static String readVersion(String fileName) {
+    String version = "";
+    try {
+      FileInputStream fin = new FileInputStream(fileName);
+      int length = fin.available();
+      byte[] buffer = new byte[length];
+      fin.read(buffer);
+      version = new String(buffer);
+      fin.close();
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return version;
+  }
+
+  private static void updateEffectResource(Context context) {
+    File licensePath = new File(getExternalResourcePath(), "LicenseBag.bundle");
+    removeFile(licensePath.getAbsolutePath());
+    copyAssetFolder(context, "resource/LicenseBag.bundle", licensePath.getAbsolutePath());
+    File modelPath = new File(getExternalResourcePath(), "ModelResource.bundle");
+    removeFile(modelPath.getAbsolutePath());
+    copyAssetFolder(context, "resource/ModelResource.bundle", modelPath.getAbsolutePath());
+    File stickerPath = new File(getExternalResourcePath(), "StickerResource.bundle");
+    removeFile(stickerPath.getAbsolutePath());
+    copyAssetFolder(context, "resource/StickerResource.bundle", stickerPath.getAbsolutePath());
+    File filterPath = new File(getExternalResourcePath(), "FilterResource.bundle");
+    removeFile(filterPath.getAbsolutePath());
+    copyAssetFolder(context, "resource/FilterResource.bundle", filterPath.getAbsolutePath());
+    File composerPath = new File(getExternalResourcePath(), "ComposeMakeup.bundle");
+    removeFile(composerPath.getAbsolutePath());
+    copyAssetFolder(context, "resource/ComposeMakeup.bundle", composerPath.getAbsolutePath());
+  }
+
+  private static void removeFile(String filePath) {
+    if (filePath == null || filePath.length() == 0) {
+      return;
+    }
+    try {
+      File file = new File(filePath);
+      if (file.exists()) {
+        removeFile(file);
+      }
+    } catch (Exception ex) {
+      ex.printStackTrace();
+    }
+  }
+
+  private static void removeFile(File file) {
+    // 如果是文件直接删除
+    if (file.isFile()) {
+      file.delete();
+      return;
+    }
+    // 如果是目录，递归判断，如果是空目录，直接删除，如果是文件，遍历删除
+    if (file.isDirectory()) {
+      File[] childFile = file.listFiles();
+      if (childFile == null || childFile.length == 0) {
+        file.delete();
+        return;
+      }
+      for (File f : childFile) {
+        removeFile(f);
+      }
+      file.delete();
+    }
+  }
+
+  public static String getExternalResourcePath() {
+    // Context context = Env.getApplicationContext();
+    if (context == null) {
+      throw new IllegalStateException("context not set");
+    }
+    return context.getExternalFilesDir("assets").getAbsolutePath() + "/resource/";
+  }
+
+  public static boolean copyAssetFolder(Context context, String srcName, String dstName) {
+    try {
+      boolean result = true;
+      String fileList[] = context.getAssets().list(srcName);
+      if (fileList == null)
+        return false;
+
+      if (fileList.length == 0) {
+        result = copyAssetFile(context, srcName, dstName);
+      } else {
+        File file = new File(dstName);
+        result = file.mkdirs();
+        for (String filename : fileList) {
+          result &= copyAssetFolder(context, srcName + File.separator + filename, dstName + File.separator + filename);
+        }
+      }
+      return result;
+    } catch (IOException e) {
+      e.printStackTrace();
+      return false;
+    }
+  }
+
+  public static boolean copyAssetFile(Context context, String srcName, String dstName) {
+    try {
+      InputStream in = context.getAssets().open(srcName);
+      File outFile = new File(dstName);
+      OutputStream out = new FileOutputStream(outFile);
+      byte[] buffer = new byte[1024];
+      int read;
+      while ((read = in.read(buffer)) != -1) {
+        out.write(buffer, 0, read);
+      }
+      in.close();
+      out.close();
+      return true;
+    } catch (IOException e) {
+      e.printStackTrace();
+      return false;
+    }
+  }
+
+}

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

@@ -23,6 +23,7 @@ import com.ss.avframework.live.VeLivePusherObserver;
 import com.ss.avframework.live.statistics.VeLivePusherStatisticsExt;
 import com.volcengine.VolcApiEngine.*;
 import com.volcengine.VolcApiEngine.view.*;
+import com.volcengine.velive.rn.push.VeLiveEffectHelper;
 
 import java.util.WeakHashMap;
 
@@ -37,6 +38,7 @@ public class VeLivePushModule extends VeLivePushModuleSpec implements IEventRece
 
   VeLivePushModule(ReactApplicationContext context) {
     super(context);
+    VeLiveEffectHelper.context = context;
   }
   
   @Override

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

@@ -84,7 +84,7 @@ public class MixerManager {
               Log.w(TAG, "Failed to perform manual capture after addView", e);
             }
           }
-        }, 300);
+        }, 1000);
       } else {
         pendingCallbacks.put(viewId, videoStreamId);
       }

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

@@ -20,24 +20,14 @@ public class MixerView extends FrameLayout {
   private ThemedReactContext context;
   private String viewId;
 
-  // Mix configuration
-  private float mixX = 0f;
-  private float mixY = 0f;
-  private float mixWidth = 0f;
-  private float mixHeight = 0f;
-  private int mixZOrder = 0;
-  private int mixRenderMode = 0;
-
   // Capture configuration
   private String captureMode = "onchange";
-  private float captureFramerate = 30f;
-  private float autoSensitivity = 5f;
+  private float captureFramerate = 5f; // realTime mode default 5 fps
 
   // Capture state
   private Handler captureHandler;
   private Runnable captureRunnable;
   private ViewTreeObserver.OnGlobalLayoutListener layoutListener;
-  private ViewTreeObserver.OnDrawListener drawListener;
   private AtomicBoolean isCapturing = new AtomicBoolean(false);
   private AtomicBoolean isDestroyed = new AtomicBoolean(false);
 
@@ -46,14 +36,6 @@ public class MixerView extends FrameLayout {
   private long lastCaptureTime = 0;
   private final Object captureLock = new Object();
 
-  // Auto mode state
-  private int changeCount = 0;
-  private long windowStartTime = 0;
-  private boolean isInRealtimeMode = false;
-  private static final long AUTO_WINDOW_MS = 2000; // 2 second window
-  private static final int HIGH_CHANGE_THRESHOLD = 10;
-  private static final int LOW_CHANGE_THRESHOLD = 2;
-
   // Add callback support for MixerManager integration
   private MixerManager.BitmapCaptureCallback bitmapCaptureCallback;
 
@@ -67,19 +49,6 @@ public class MixerView extends FrameLayout {
   private void initializeCapture() {
     // Initialize layout change listener
     layoutListener = this::onViewChanged;
-
-    // Initialize draw listener for auto mode
-    drawListener = this::onViewDraw;
-  }
-
-  // Setters for mix configuration
-  public void setMixX(float x) { this.mixX = x; }
-  public void setMixY(float y) { this.mixY = y; }
-  public void setMixWidth(float width) { this.mixWidth = width; }
-  public void setMixHeight(float height) { this.mixHeight = height; }
-  public void setMixZOrder(int zOrder) { this.mixZOrder = zOrder; }
-  public void setMixRenderMode(int renderMode) {
-    this.mixRenderMode = renderMode;
   }
 
   public void setCaptureMode(String mode) {
@@ -98,10 +67,6 @@ public class MixerView extends FrameLayout {
     }
   }
 
-  public void setAutoSensitivity(float sensitivity) {
-    this.autoSensitivity = Math.max(1f, Math.min(10f, sensitivity));
-  }
-
   private void startCapture() {
     if (isDestroyed.get())
       return;
@@ -113,9 +78,6 @@ public class MixerView extends FrameLayout {
     case "realtime":
       startRealtimeCapture();
       break;
-    case "auto":
-      startAutoCapture();
-      break;
     case "manual":
       // Manual mode doesn't auto-start
       break;
@@ -128,9 +90,6 @@ public class MixerView extends FrameLayout {
       if (layoutListener != null) {
         getViewTreeObserver().removeOnGlobalLayoutListener(layoutListener);
       }
-      if (drawListener != null) {
-        getViewTreeObserver().removeOnDrawListener(drawListener);
-      }
     }
 
     // Stop realtime capture
@@ -143,9 +102,19 @@ public class MixerView extends FrameLayout {
   }
 
   private void startOnChangeCapture() {
-    if (getViewTreeObserver().isAlive()) {
-      getViewTreeObserver().addOnGlobalLayoutListener(layoutListener);
-    }
+    // onChange mode triggers every 2 seconds
+    long interval = 2000; // 2 seconds
+
+    captureRunnable = new Runnable() {
+      @Override
+      public void run() {
+        if (!isDestroyed.get() && "onchange".equals(captureMode)) {
+          performCapture("onchange");
+          captureHandler.postDelayed(this, interval);
+        }
+      }
+    };
+    captureHandler.postDelayed(captureRunnable, interval);
   }
 
   private void startRealtimeCapture() {
@@ -170,82 +139,13 @@ public class MixerView extends FrameLayout {
     }
   }
 
-  private void startAutoCapture() {
-    // Start with onchange mode
-    isInRealtimeMode = false;
-    windowStartTime = System.currentTimeMillis();
-    changeCount = 0;
-
-    if (getViewTreeObserver().isAlive()) {
-      getViewTreeObserver().addOnGlobalLayoutListener(layoutListener);
-      getViewTreeObserver().addOnDrawListener(drawListener);
-    }
-  }
-
   private void onViewChanged() {
     if (isDestroyed.get()) {
       return;
     }
 
-    switch (captureMode) {
-    case "onchange":
+    if ("onchange".equals(captureMode)) {
       performCapture("onchange");
-      break;
-    case "auto":
-      handleAutoModeChange();
-      break;
-    }
-  }
-
-  private void onViewDraw() {
-    if (isDestroyed.get() || !"auto".equals(captureMode))
-      return;
-
-    // Count draws for auto mode sensitivity
-    changeCount++;
-
-    long currentTime = System.currentTimeMillis();
-    if (currentTime - windowStartTime >= AUTO_WINDOW_MS) {
-      evaluateAutoMode();
-      // Reset window
-      windowStartTime = currentTime;
-      changeCount = 0;
-    }
-  }
-
-  private void handleAutoModeChange() {
-    if (!isInRealtimeMode) {
-      performCapture("auto_onchange");
-    }
-  }
-
-  private void evaluateAutoMode() {
-    float changesPerSecond = changeCount * 1000f / AUTO_WINDOW_MS;
-    float threshold = autoSensitivity;
-
-    boolean shouldBeRealtime =
-        changesPerSecond > (HIGH_CHANGE_THRESHOLD / threshold);
-    boolean shouldBeOnChange =
-        changesPerSecond < (LOW_CHANGE_THRESHOLD / threshold);
-
-    if (shouldBeRealtime && !isInRealtimeMode) {
-      switchToRealtimeMode();
-    } else if (shouldBeOnChange && isInRealtimeMode) {
-      switchToOnChangeMode();
-    }
-  }
-
-  private void switchToRealtimeMode() {
-    isInRealtimeMode = true;
-    startRealtimeCapture();
-  }
-
-  private void switchToOnChangeMode() {
-    isInRealtimeMode = false;
-    // Stop realtime capture but keep layout listener
-    if (captureRunnable != null) {
-      captureHandler.removeCallbacks(captureRunnable);
-      captureRunnable = null;
     }
   }
 
@@ -338,12 +238,6 @@ public class MixerView extends FrameLayout {
         WritableMap event = Arguments.createMap();
         event.putString("trigger", trigger);
         event.putBoolean("success", true);
-        event.putDouble("x", mixX);
-        event.putDouble("y", mixY);
-        event.putDouble("width", mixWidth);
-        event.putDouble("height", mixHeight);
-        event.putInt("zOrder", mixZOrder);
-        event.putInt("renderMode", mixRenderMode);
         event.putInt("bitmapWidth", bitmap.getWidth());
         event.putInt("bitmapHeight", bitmap.getHeight());
       } catch (IllegalStateException e) {
@@ -356,8 +250,8 @@ public class MixerView extends FrameLayout {
       lastBitmap.recycle();
     }
 
-    // 如果没有设置回调，立即释放当前 bitmap 以避免内存累积
-    // 如果设置了回调，bitmap 将由回调的接收方负责管理
+    // If no callback is set, immediately release current bitmap to avoid memory accumulation
+    // If callback is set, bitmap will be managed by the callback receiver
     if (bitmapCaptureCallback == null) {
       if (bitmap != null && !bitmap.isRecycled()) {
         bitmap.recycle();
@@ -392,7 +286,7 @@ public class MixerView extends FrameLayout {
     super.onAttachedToWindow();
     if (viewId != null) {
       MixerManager.cachedMixedViews.put(viewId, this);
-      // 通知MixerManager视图已准备好，检查是否有待处理的回调
+      // Notify MixerManager that view is ready, check for pending callbacks
       MixerManager.onViewReady(viewId, this);
     }
   }
@@ -409,7 +303,7 @@ public class MixerView extends FrameLayout {
   public void setViewId(String viewId) {
     this.viewId = viewId;
     MixerManager.cachedMixedViews.put(viewId, this);
-    // 通知MixerManager视图已准备好，检查是否有待处理的回调
+    // Notify MixerManager that view is ready, check for pending callbacks
     MixerManager.onViewReady(viewId, this);
   }
 

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

@@ -22,52 +22,16 @@ public class MixerViewManager extends ViewGroupManager<MixerView> {
     return new MixerView(reactContext);
   }
 
-  // Props for mixing configuration
-  @ReactProp(name = "x", defaultFloat = 0f)
-  public void setX(MixerView view, float x) {
-    view.setMixX(x);
-  }
-
-  @ReactProp(name = "y", defaultFloat = 0f)
-  public void setY(MixerView view, float y) {
-    view.setMixY(y);
-  }
-
-  @ReactProp(name = "width", defaultFloat = 0f)
-  public void setWidth(MixerView view, float width) {
-    view.setMixWidth(width);
-  }
-
-  @ReactProp(name = "height", defaultFloat = 0f)
-  public void setHeight(MixerView view, float height) {
-    view.setMixHeight(height);
-  }
-
-  @ReactProp(name = "zOrder", defaultInt = 0)
-  public void setZOrder(MixerView view, int zOrder) {
-    view.setMixZOrder(zOrder);
-  }
-
-  @ReactProp(name = "renderMode", defaultInt = 0)
-  public void setRenderMode(MixerView view, int renderMode) {
-    view.setMixRenderMode(renderMode);
-  }
-
   @ReactProp(name = "captureMode")
   public void setCaptureMode(MixerView view, @Nullable String captureMode) {
     view.setCaptureMode(captureMode != null ? captureMode : "onchange");
   }
 
-  @ReactProp(name = "captureFramerate", defaultFloat = 30f)
+  @ReactProp(name = "captureFramerate", defaultFloat = 5f)
   public void setCaptureFramerate(MixerView view, float framerate) {
     view.setCaptureFramerate(framerate);
   }
 
-  @ReactProp(name = "autoSensitivity", defaultFloat = 5f)
-  public void setAutoSensitivity(MixerView view, float sensitivity) {
-    view.setAutoSensitivity(sensitivity);
-  }
-
   @ReactProp(name = "viewId")
   public void setViewId(MixerView view, @Nullable String viewId) {
     if (viewId != null) {

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

@@ -52,7 +52,12 @@ public class TextureMgr {
                     Bitmap bmp = null;
                     Bitmap rotatedBmp = null;
                     try {
-                        bm = new YuvHelper.NV21ToBitmap(Env.getApplicationContext());
+                        android.content.Context context = Env.getApplicationContext();
+                        if (context == null) {
+                            // If context is null, skip processing and return
+                            return;
+                        }
+                        bm = new YuvHelper.NV21ToBitmap(context);
                         bmp = bm.nv21ToBitmap(byteBuffer.array(), width, height);
                         
                         if (bmp == null || bmp.isRecycled()) {

package/ios/VeLiveMixerHelper.h

@@ -6,17 +6,18 @@
 //
 
 #import "VeLiveMixerView.h"
+#import <CoreVideo/CoreVideo.h>
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-// 前向声明
+// Forward declaration
 @class VeLivePusher;
 
-// 混流管理器助手类 - 完全对齐Android MixerManager.java
+// Mixer helper class - fully aligned with Android MixerManager.java
 @interface VeLiveMixerHelper : NSObject <VeLiveBitmapCaptureCallback>
 
-// 对齐Android的static cachedMixedViews
+// Aligned with Android's static cachedMixedViews
 @property(class, nonatomic, strong)
     NSMutableDictionary<NSString *, VeLiveMixerUIView *> *cachedMixedViews;
 
@@ -24,21 +25,23 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithPusher:(VeLivePusher *)pusher;
 
-// Public方法 - 完全对齐Android MixerManager的public接口
+// Public methods - fully aligned with Android MixerManager's public interface
 - (void)setPusher:(VeLivePusher *)pusher;
 - (int)addView:(NSString *)viewId config:(NSDictionary *)viewInfo;
 - (BOOL)updateView:(NSString *)viewId config:(NSDictionary *)viewInfo;
 - (BOOL)removeView:(NSString *)viewId;
 - (void)captureView:(NSString *)viewId;
 
-// Static方法 - 只保留Android中实际存在的
+// Static methods - for sending captured content to mixer
 + (void)setupCallbackForMixerView:(VeLiveMixerUIView *)mixerView
                          streamId:(int)streamId;
 + (void)sendBitmapToMixerStatic:(int)streamId bitmap:(UIImage *)bitmap;
++ (void)sendPixelBufferToMixerStatic:(int)streamId
+                         pixelBuffer:(CVPixelBufferRef)pixelBuffer;
 + (VeLiveMixerHelper *)findActiveMixerManager;
 + (void)onViewReady:(NSString *)viewId mixerView:(VeLiveMixerUIView *)mixerView;
 
-// 清理资源
+// Resource cleanup
 - (void)cleanup;
 
 @end