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

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

@@ -4,34 +4,31 @@ import android.graphics.Bitmap;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewTreeObserver;
-
 import com.ss.avframework.live.VeLivePusher;
 import com.ss.avframework.live.VeLivePusherDef.VeLiveMixVideoLayout;
-import com.ss.avframework.live.VeLivePusherDef.VeLiveStreamMixDescription;
 import com.ss.avframework.live.VeLivePusherDef.VeLivePusherRenderMode;
+import com.ss.avframework.live.VeLivePusherDef.VeLiveStreamMixDescription;
 import com.ss.avframework.live.VeLiveVideoFrame;
-
-import org.json.JSONObject;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
 import javax.annotation.Nullable;
+import org.json.JSONObject;
 
 public class MixerManager {
-  public  static Map<String, View> cachedMixedViews = new HashMap<>();
+  public static Map<String, View> cachedMixedViews = new HashMap<>();
 
   private static final String TAG = "MixerManager";
 
   private VeLivePusher pusher;
-  private final Map<String, VeLiveMixVideoLayout> mixedViewLayout = new ConcurrentHashMap<>();
-  private final Map<String, Integer> viewIdToStreamId = new ConcurrentHashMap<>();
-  private final Map<String, Integer> pendingCallbacks = new ConcurrentHashMap<>();
-  
-  public void setPusher(VeLivePusher pusher) {
-    this.pusher = pusher;
-  }
+  private final Map<String, VeLiveMixVideoLayout> mixedViewLayout =
+      new ConcurrentHashMap<>();
+  private final Map<String, Integer> viewIdToStreamId =
+      new ConcurrentHashMap<>();
+  private final Map<String, Integer> pendingCallbacks =
+      new ConcurrentHashMap<>();
+
+  public void setPusher(VeLivePusher pusher) { this.pusher = pusher; }
 
   /**
    * Add a view to the mixer
@@ -40,85 +37,81 @@ public class MixerManager {
    * @return streamId for this view
    */
   public int addView(String viewId, JSONObject viewInfo) {
-   try {
-     if (pusher == null || pusher.getMixerManager() == null) {
-       return -1;
-     }
-
-     if (viewIdToStreamId.containsKey(viewId)) {
-       return viewIdToStreamId.get(viewId);
-     }
-     
-     int videoStreamId = pusher.getMixerManager().addVideoStream();
-     VeLiveStreamMixDescription description = new VeLiveStreamMixDescription();
-     VeLiveMixVideoLayout layout = new VeLiveMixVideoLayout();
-    layout.x = (float) viewInfo.getDouble("x");
-    layout.y = (float) viewInfo.getDouble("y");
-    layout.width = (float) viewInfo.getDouble("width");
-    layout.height = (float) viewInfo.getDouble("height");
-     layout.zOrder = viewInfo.optInt("zOrder", 0);
-     int renderModeValue = viewInfo.optInt("renderMode", 0);
-     VeLivePusherRenderMode[] renderModes = VeLivePusherRenderMode.values();
-     if (renderModeValue >= 0 && renderModeValue < renderModes.length) {
-       layout.renderMode = renderModes[renderModeValue];
-     } else {
-       layout.renderMode = VeLivePusherRenderMode.values()[0];
-     }
-     layout.streamId = videoStreamId;
-     description.mixVideoStreams.add(layout);
-     mixedViewLayout.put(viewId, layout);
-     viewIdToStreamId.put(viewId, videoStreamId);
-     pusher.getMixerManager().updateStreamMixDescription(description);
-     
-     View view = cachedMixedViews.get(viewId);
-     if (view instanceof MixerView) {
-       MixerView mixerView = (MixerView) view;
-       setupCallbackForMixerView(mixerView, videoStreamId);
-       
-       android.os.Handler mainHandler = new android.os.Handler(android.os.Looper.getMainLooper());
-       mainHandler.postDelayed(new Runnable() {
-         @Override
-         public void run() {
-           try {
-             VeLiveMixVideoLayout layout = mixedViewLayout.get(viewId);
-             if (layout != null && pusher != null && pusher.getMixerManager() != null) {
-               VeLiveStreamMixDescription description = new VeLiveStreamMixDescription();
-               description.mixVideoStreams.add(layout);
-               pusher.getMixerManager().updateStreamMixDescription(description);
-             }
-             mixerView.performManualCapture();
-           } catch (Exception e) {
-             // Ignore
-           }
-         }
-       }, 300);
-       
-     } else {
-       pendingCallbacks.put(viewId, videoStreamId);
-     }
-     
-     return videoStreamId;
-   } catch (Exception e) {
-     return -1;
-   }
+    try {
+      if (pusher == null || pusher.getMixerManager() == null) {
+        return -1;
+      }
+
+      if (viewIdToStreamId.containsKey(viewId)) {
+        return viewIdToStreamId.get(viewId);
+      }
+
+      int videoStreamId = pusher.getMixerManager().addVideoStream();
+      VeLiveStreamMixDescription description = new VeLiveStreamMixDescription();
+      VeLiveMixVideoLayout layout = new VeLiveMixVideoLayout();
+      layout.x = (float)viewInfo.getDouble("x");
+      layout.y = (float)viewInfo.getDouble("y");
+      layout.width = (float)viewInfo.getDouble("width");
+      layout.height = (float)viewInfo.getDouble("height");
+      layout.alpha = (float)viewInfo.optDouble("alpha", 1.0);
+      layout.zOrder = viewInfo.optInt("zOrder", 0);
+      int renderModeValue = viewInfo.optInt("renderMode", 0);
+      VeLivePusherRenderMode[] renderModes = VeLivePusherRenderMode.values();
+      if (renderModeValue >= 0 && renderModeValue < renderModes.length) {
+        layout.renderMode = renderModes[renderModeValue];
+      } else {
+        layout.renderMode = VeLivePusherRenderMode.values()[0];
+      }
+      layout.streamId = videoStreamId;
+      description.mixVideoStreams.add(layout);
+      mixedViewLayout.put(viewId, layout);
+      viewIdToStreamId.put(viewId, videoStreamId);
+      pusher.getMixerManager().updateStreamMixDescription(description);
+
+      View view = cachedMixedViews.get(viewId);
+      if (view instanceof MixerView) {
+        MixerView mixerView = (MixerView)view;
+        setupCallbackForMixerView(mixerView, videoStreamId);
+
+        android.os.Handler mainHandler =
+            new android.os.Handler(android.os.Looper.getMainLooper());
+        mainHandler.postDelayed(new Runnable() {
+          @Override
+          public void run() {
+            try {
+              mixerView.performManualCapture();
+            } catch (Exception e) {
+              Log.w(TAG, "Failed to perform manual capture after addView", e);
+            }
+          }
+        }, 300);
+      } else {
+        pendingCallbacks.put(viewId, videoStreamId);
+      }
+
+      return videoStreamId;
+    } catch (Exception e) {
+      return -1;
+    }
   }
-  
+
   /**
    * Update view configuration
    */
   public boolean updateView(String viewId, JSONObject viewInfo) {
     try {
       VeLiveMixVideoLayout layout = mixedViewLayout.get(viewId);
-      if(layout == null) {
+      if (layout == null) {
         return false;
       }
       VeLiveStreamMixDescription description = new VeLiveStreamMixDescription();
-      layout.x = (float) viewInfo.getDouble("x");
-      layout.y = (float) viewInfo.getDouble("y");
-      layout.width = (float) viewInfo.getDouble("width");
-      layout.height = (float) viewInfo.getDouble("height");
+      layout.x = (float)viewInfo.getDouble("x");
+      layout.y = (float)viewInfo.getDouble("y");
+      layout.width = (float)viewInfo.getDouble("width");
+      layout.height = (float)viewInfo.getDouble("height");
+      layout.alpha = (float)viewInfo.optDouble("alpha", 1.0);
       Integer streamId = viewIdToStreamId.get(viewId);
-      if(streamId != null) {
+      if (streamId != null) {
         layout.streamId = streamId;
       }
       if (viewInfo.has("zOrder")) {
@@ -134,10 +127,22 @@ public class MixerManager {
       mixedViewLayout.put(viewId, layout);
       description.mixVideoStreams.add(layout);
       pusher.getMixerManager().updateStreamMixDescription(description);
+
       View view = cachedMixedViews.get(viewId);
       if (view instanceof MixerView) {
-        MixerView mixerView = (MixerView) view;
-        mixerView.performManualCapture();
+        MixerView mixerView = (MixerView)view;
+        android.os.Handler mainHandler =
+            new android.os.Handler(android.os.Looper.getMainLooper());
+        mainHandler.postDelayed(new Runnable() {
+          @Override
+          public void run() {
+            try {
+              mixerView.performManualCapture();
+            } catch (Exception e) {
+              Log.w(TAG, "Failed to perform manual capture after update", e);
+            }
+          }
+        }, 300);
       }
       return true;
     } catch (Exception e) {
@@ -154,15 +159,15 @@ public class MixerManager {
       if (layout == null) {
         return false;
       }
-      
+
       viewIdToStreamId.remove(viewId);
-      
+
       View view = cachedMixedViews.get(viewId);
       if (view instanceof MixerView) {
-        MixerView mixerView = (MixerView) view;
+        MixerView mixerView = (MixerView)view;
         mixerView.setBitmapCaptureCallback(null);
       }
-      
+
       pusher.getMixerManager().removeVideoStream(layout.streamId);
       return true;
 
@@ -177,7 +182,7 @@ public class MixerManager {
   public void captureView(String viewId) {
     View view = cachedMixedViews.get(viewId);
     if (view instanceof MixerView) {
-      MixerView mixerView = (MixerView) view;
+      MixerView mixerView = (MixerView)view;
       mixerView.performManualCapture();
     }
   }
@@ -192,28 +197,33 @@ public class MixerManager {
         Integer streamId = instance.pendingCallbacks.remove(viewId);
         if (streamId != null) {
           setupCallbackForMixerView(mixerView, streamId);
-          
-          android.os.Handler mainHandler = new android.os.Handler(android.os.Looper.getMainLooper());
+
+          android.os.Handler mainHandler =
+              new android.os.Handler(android.os.Looper.getMainLooper());
           mainHandler.postDelayed(new Runnable() {
             @Override
             public void run() {
               try {
-                VeLiveMixVideoLayout layout = instance.mixedViewLayout.get(viewId);
-                if (layout != null && instance.pusher != null && instance.pusher.getMixerManager() != null) {
-                  VeLiveStreamMixDescription description = new VeLiveStreamMixDescription();
+                VeLiveMixVideoLayout layout =
+                    instance.mixedViewLayout.get(viewId);
+                if (layout != null && instance.pusher != null &&
+                    instance.pusher.getMixerManager() != null) {
+                  VeLiveStreamMixDescription description =
+                      new VeLiveStreamMixDescription();
                   description.mixVideoStreams.add(layout);
-                  instance.pusher.getMixerManager().updateStreamMixDescription(description);
+                  instance.pusher.getMixerManager().updateStreamMixDescription(
+                      description);
                 }
                 mixerView.performManualCapture();
               } catch (Exception e) {
-                // Ignore
+                Log.w(TAG, "Failed to perform operations in onViewReady", e);
               }
             }
-          }, 1000);
+          }, 300);
         }
       }
     } catch (Exception e) {
-      // Ignore
+      Log.w(TAG, "Error in onViewReady", e);
     }
   }
 
@@ -225,18 +235,18 @@ public class MixerManager {
       if (bitmap == null || bitmap.isRecycled()) {
         return;
       }
-      
+
       if (pusher == null || pusher.getMixerManager() == null) {
         return;
       }
-      
+
       int width = bitmap.getWidth();
       int height = bitmap.getHeight();
-      
+
       if (width <= 0 || height <= 0) {
         return;
       }
-      
+
       TextureMgr textureMgr = new TextureMgr(width, height);
       textureMgr.dealWithTexture(bitmap, new TextureMgr.RenderListener() {
         @Override
@@ -245,12 +255,14 @@ public class MixerManager {
             if (texture <= 0) {
               return;
             }
-            
+
             long pts = System.currentTimeMillis() * 1000;
-            VeLiveVideoFrame videoFrame = new VeLiveVideoFrame(width, height, pts, texture, false, null);
-            
+            VeLiveVideoFrame videoFrame =
+                new VeLiveVideoFrame(width, height, pts, texture, false, null);
+
             if (pusher != null && pusher.getMixerManager() != null) {
-              pusher.getMixerManager().sendCustomVideoFrame(videoFrame, streamId);
+              pusher.getMixerManager().sendCustomVideoFrame(videoFrame,
+                                                            streamId);
             }
           } catch (Exception e) {
             // Ignore
@@ -266,16 +278,17 @@ public class MixerManager {
       // Ignore
     }
   }
-  
+
   /**
    * Static method to set up callback for MixerView
    * Now with intelligent layout waiting logic
    */
-  private static void setupCallbackForMixerView(MixerView mixerView, int streamId) {
+  private static void setupCallbackForMixerView(MixerView mixerView,
+                                                int streamId) {
     if (mixerView == null) {
       return;
     }
-    
+
     mixerView.setBitmapCaptureCallback(new BitmapCaptureCallback() {
       @Override
       public void onBitmapCaptured(Bitmap bitmap) {
@@ -289,13 +302,13 @@ public class MixerManager {
           // Ignore
         }
       }
-      
+
       @Override
       public void onCaptureError(String error) {
         // Ignore
       }
     });
-    
+
     if (mixerView.getWidth() > 0 && mixerView.getHeight() > 0) {
       try {
         mixerView.performManualCapture();
@@ -303,32 +316,36 @@ public class MixerManager {
         // Ignore
       }
     } else {
-      ViewTreeObserver.OnGlobalLayoutListener layoutListener = new ViewTreeObserver.OnGlobalLayoutListener() {
-        @Override
-        public void onGlobalLayout() {
-          try {
-            if (mixerView.getViewTreeObserver().isAlive()) {
-              if (mixerView.getWidth() > 0 && mixerView.getHeight() > 0) {
-                mixerView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                mixerView.performManualCapture();
+      ViewTreeObserver.OnGlobalLayoutListener layoutListener =
+          new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+              try {
+                if (mixerView.getViewTreeObserver().isAlive()) {
+                  if (mixerView.getWidth() > 0 && mixerView.getHeight() > 0) {
+                    mixerView.getViewTreeObserver()
+                        .removeOnGlobalLayoutListener(this);
+                    mixerView.performManualCapture();
+                  }
+                }
+              } catch (Exception e) {
+                // Ignore
               }
             }
-          } catch (Exception e) {
-            // Ignore
-          }
-        }
-      };
-      
+          };
+
       try {
-        mixerView.getViewTreeObserver().addOnGlobalLayoutListener(layoutListener);
+        mixerView.getViewTreeObserver().addOnGlobalLayoutListener(
+            layoutListener);
       } catch (Exception e) {
         // Ignore
       }
     }
   }
-  
+
   /**
-   * Static version of sendBitmapToMixer - finds the active MixerManager instance
+   * Static version of sendBitmapToMixer - finds the active MixerManager
+   * instance
    */
   private static void sendBitmapToMixerStatic(int streamId, Bitmap bitmap) {
     try {
@@ -340,7 +357,7 @@ public class MixerManager {
       // Ignore
     }
   }
-  
+
   /**
    * Find the active MixerManager instance
    */
@@ -351,44 +368,42 @@ public class MixerManager {
     }
     return null;
   }
-  
+
   private static volatile MixerManager currentInstance;
-  
+
   public MixerManager() {
-    synchronized (MixerManager.class) {
-      currentInstance = this;
-    }
+    synchronized (MixerManager.class) { currentInstance = this; }
   }
-  
+
   /**
-   * 清理资源，防止内存泄漏
+   * cleanup method to release resources
    */
   public void cleanup() {
     try {
       for (String viewId : cachedMixedViews.keySet()) {
         View view = cachedMixedViews.get(viewId);
         if (view instanceof MixerView) {
-          MixerView mixerView = (MixerView) view;
+          MixerView mixerView = (MixerView)view;
           mixerView.setBitmapCaptureCallback(null);
         }
       }
-      
+
       mixedViewLayout.clear();
       viewIdToStreamId.clear();
       pendingCallbacks.clear();
-      
+
       synchronized (MixerManager.class) {
         if (currentInstance == this) {
           currentInstance = null;
         }
       }
-      
+
       pusher = null;
     } catch (Exception e) {
       // Ignore
     }
   }
-  
+
   // Callback interface for bitmap capture
   public interface BitmapCaptureCallback {
     void onBitmapCaptured(Bitmap bitmap);

package/ios/VeLiveMixerHelper.m

@@ -150,6 +150,7 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
       @"y" : viewInfo[@"y"] ?: @(0),
       @"width" : viewInfo[@"width"] ?: @(0),
       @"height" : viewInfo[@"height"] ?: @(0),
+      @"alpha" : viewInfo[@"alpha"] ?: @(1.0),
       @"zOrder" : viewInfo[@"zOrder"] ?: @(1),
       @"renderMode" : viewInfo[@"renderMode"] ?: @(0),
       @"streamId" : @(videoStreamId)
@@ -164,6 +165,7 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
     videoLayout.width = [viewInfo[@"width"] floatValue];
     videoLayout.height = [viewInfo[@"height"] floatValue];
     videoLayout.zOrder = [viewInfo[@"zOrder"] intValue];
+    videoLayout.alpha = [viewInfo[@"alpha"] floatValue] ?: 1.0;
     videoLayout.renderMode = [viewInfo[@"renderMode"] intValue];
     description.mixVideoStreams = @[ videoLayout ];
     [self.pusher.getMixerManager updateStreamMixDescription:description];
@@ -173,6 +175,19 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
 
     if ([view isKindOfClass:[VeLiveMixerUIView class]]) {
       [VeLiveMixerHelper setupCallbackForMixerView:view streamId:videoStreamId];
+
+      // 延迟执行捕获，确保视图布局完成
+      dispatch_after(
+          dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)),
+          dispatch_get_main_queue(), ^{
+            @try {
+              if (view && view.bitmapCaptureCallback) {
+                [view performCaptureWithTrigger:@"addView"];
+              }
+            } @catch (NSException *exception) {
+              // Ignore
+            }
+          });
     } else {
       [self.pendingCallbacks setObject:@(videoStreamId) forKey:viewId];
     }
@@ -202,6 +217,8 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
                       forKey:@"height"];
     [updatedLayout setObject:(viewInfo[@"zOrder"] ?: layout[@"zOrder"])
                       forKey:@"zOrder"];
+    [updatedLayout setObject:(viewInfo[@"alpha"] ?: layout[@"alpha"])
+                      forKey:@"alpha"];
     [updatedLayout setObject:(viewInfo[@"renderMode"] ?: layout[@"renderMode"])
                       forKey:@"renderMode"];
 
@@ -213,6 +230,7 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
     videoLayout.y = [updatedLayout[@"y"] floatValue];
     videoLayout.width = [updatedLayout[@"width"] floatValue];
     videoLayout.height = [updatedLayout[@"height"] floatValue];
+    videoLayout.alpha = [updatedLayout[@"alpha"] floatValue];
     videoLayout.zOrder = [updatedLayout[@"zOrder"] intValue];
     videoLayout.renderMode = [updatedLayout[@"renderMode"] intValue];
     description.mixVideoStreams = @[ videoLayout ];
@@ -220,9 +238,20 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
 
     [self.mixedViewLayout setObject:updatedLayout forKey:viewId];
 
+    // 延迟执行捕获，确保属性更新完成
     VeLiveMixerUIView *mixerView =
         [[VeLiveMixerHelper cachedMixedViews] objectForKey:viewId];
-    [mixerView performCaptureWithTrigger:@"update"];
+    if ([mixerView isKindOfClass:[VeLiveMixerUIView class]]) {
+      dispatch_after(
+          dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)),
+          dispatch_get_main_queue(), ^{
+            @try {
+              [mixerView performCaptureWithTrigger:@"update"];
+            } @catch (NSException *exception) {
+              // Ignore
+            }
+          });
+    }
 
     return YES;
   } @catch (NSException *exception) {
@@ -293,7 +322,7 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
   mixerView.bitmapCaptureCallback = callback;
 
   dispatch_after(
-      dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)),
+      dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)),
       dispatch_get_main_queue(), ^{
         @try {
           if (mixerView && mixerView.bitmapCaptureCallback) {