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

package/ios/VeLiveMixerHelper.m

@@ -6,11 +6,11 @@
 //
 
 #import "VeLiveMixerHelper.h"
-#include <objc/NSObjCRuntime.h>
-#import <UIKit/UIKit.h>
 #import <TTSDKLivePushRTS/TTSDKLivePushRTS.h>
+#import <UIKit/UIKit.h>
 #import <mach/mach.h>
 #import <mach/task_info.h>
+#include <objc/NSObjCRuntime.h>
 
 static NSString *TAG = @"VeLiveMixerHelper";
 
@@ -22,36 +22,42 @@ static NSString *TAG = @"VeLiveMixerHelper";
 
 @interface VeLiveMixerHelper ()
 
-@property(nonatomic, strong) NSMutableDictionary<NSString *, NSDictionary *> *mixedViewLayout;
-@property(nonatomic, strong) NSMutableDictionary<NSString *, NSNumber *> *viewIdToStreamId;
-@property(nonatomic, strong) NSMutableDictionary<NSString *, NSNumber *> *pendingCallbacks;
-@property(nonatomic, strong) NSMutableDictionary<NSString *, VeLiveMixerBitmapCallback *> *callbacks;
-@property (nonatomic, strong) NSTimer *memoryMonitorTimer;
+@property(nonatomic, strong)
+    NSMutableDictionary<NSString *, NSDictionary *> *mixedViewLayout;
+@property(nonatomic, strong)
+    NSMutableDictionary<NSString *, NSNumber *> *viewIdToStreamId;
+@property(nonatomic, strong)
+    NSMutableDictionary<NSString *, NSNumber *> *pendingCallbacks;
+@property(nonatomic, strong)
+    NSMutableDictionary<NSString *, VeLiveMixerBitmapCallback *> *callbacks;
+@property(nonatomic, strong) NSTimer *memoryMonitorTimer;
 
 @end
 
 #pragma mark - VeLiveMixerBitmapCallback Declaration
 
 @interface VeLiveMixerBitmapCallback : NSObject <VeLiveBitmapCaptureCallback>
-@property (nonatomic, assign) int streamId;
+@property(nonatomic, assign) int streamId;
 - (instancetype)initWithStreamId:(int)streamId;
 @end
 
 @implementation VeLiveMixerHelper
 
 // 对齐Android的static cachedMixedViews
-static NSMutableDictionary<NSString *, VeLiveMixerUIView *> *_cachedMixedViews = nil;
+static NSMutableDictionary<NSString *, VeLiveMixerUIView *> *_cachedMixedViews =
+    nil;
 static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释放
 
 + (NSMutableDictionary<NSString *, VeLiveMixerUIView *> *)cachedMixedViews {
-    if (!_cachedMixedViews) {
-        _cachedMixedViews = [[NSMutableDictionary alloc] init];
-    }
-    return _cachedMixedViews;
+  if (!_cachedMixedViews) {
+    _cachedMixedViews = [[NSMutableDictionary alloc] init];
+  }
+  return _cachedMixedViews;
 }
 
-+ (void)setCachedMixedViews:(NSMutableDictionary<NSString *, VeLiveMixerUIView *> *)cachedMixedViews {
-    _cachedMixedViews = cachedMixedViews;
++ (void)setCachedMixedViews:
+    (NSMutableDictionary<NSString *, VeLiveMixerUIView *> *)cachedMixedViews {
+  _cachedMixedViews = cachedMixedViews;
 }
 
 - (instancetype)init {
@@ -77,7 +83,7 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
   _viewIdToStreamId = [[NSMutableDictionary alloc] init];
   _pendingCallbacks = [[NSMutableDictionary alloc] init];
   _callbacks = [[NSMutableDictionary alloc] init];
-  
+
   currentInstance = self;
 }
 
@@ -115,7 +121,7 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
 
 - (void)setPusher:(VeLivePusher *)pusher {
   _pusher = pusher;
-  
+
   if (currentInstance != self) {
     currentInstance = self;
   }
@@ -126,30 +132,32 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
     if (!self.pusher) {
       return -1;
     }
-    
+
     VeLiveMixerUIView *view = [VeLiveMixerHelper cachedMixedViews][viewId];
     if (![view isKindOfClass:[VeLiveMixerUIView class]]) {
       // View not ready, store pending callback
     }
-    
+
     NSNumber *existingStreamId = [self.viewIdToStreamId objectForKey:viewId];
-    if(existingStreamId != nil) {
+    if (existingStreamId != nil) {
       return [existingStreamId intValue];
     }
-    
+
     int videoStreamId = [[self.pusher getMixerManager] addVideoStream];
-    
+
     NSDictionary *layout = @{
-      @"x": viewInfo[@"x"] ?: @(0),
-      @"y": viewInfo[@"y"] ?: @(0),
-      @"width": viewInfo[@"width"] ?: @(0),
-      @"height": viewInfo[@"height"] ?: @(0),
-      @"zOrder": viewInfo[@"zOrder"] ?: @(1),
-      @"renderMode": viewInfo[@"renderMode"] ?: @(0),
-      @"streamId": @(videoStreamId)
+      @"x" : viewInfo[@"x"] ?: @(0),
+      @"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)
     };
-    
-    VeLiveStreamMixDescription *description = [[VeLiveStreamMixDescription alloc] init];
+
+    VeLiveStreamMixDescription *description =
+        [[VeLiveStreamMixDescription alloc] init];
     VeLiveMixVideoLayout *videoLayout = [[VeLiveMixVideoLayout alloc] init];
     videoLayout.streamId = videoStreamId;
     videoLayout.x = [viewInfo[@"x"] floatValue];
@@ -157,19 +165,33 @@ 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];
+    description.mixVideoStreams = @[ videoLayout ];
     [self.pusher.getMixerManager updateStreamMixDescription:description];
-    
+
     [self.mixedViewLayout setObject:layout forKey:viewId];
     [self.viewIdToStreamId setObject:@(videoStreamId) forKey:viewId];
-    
+
     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];
     }
-    
+
     return videoStreamId;
   } @catch (NSException *exception) {
     return -1;
@@ -182,35 +204,55 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
     if (!layout) {
       return NO;
     }
-    
+
     NSNumber *streamIdNumber = [self.viewIdToStreamId objectForKey:viewId];
     int videoStreamId = [streamIdNumber intValue];
-    
+
     NSMutableDictionary *updatedLayout = [layout mutableCopy];
     [updatedLayout setObject:(viewInfo[@"x"] ?: layout[@"x"]) forKey:@"x"];
     [updatedLayout setObject:(viewInfo[@"y"] ?: layout[@"y"]) forKey:@"y"];
-    [updatedLayout setObject:(viewInfo[@"width"] ?: layout[@"width"]) forKey:@"width"];
-    [updatedLayout setObject:(viewInfo[@"height"] ?: layout[@"height"]) forKey:@"height"];
-    [updatedLayout setObject:(viewInfo[@"zOrder"] ?: layout[@"zOrder"]) forKey:@"zOrder"];
-    [updatedLayout setObject:(viewInfo[@"renderMode"] ?: layout[@"renderMode"]) forKey:@"renderMode"];
-
-    VeLiveStreamMixDescription *description = [[VeLiveStreamMixDescription alloc] init];
+    [updatedLayout setObject:(viewInfo[@"width"] ?: layout[@"width"])
+                      forKey:@"width"];
+    [updatedLayout setObject:(viewInfo[@"height"] ?: layout[@"height"])
+                      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"];
+
+    VeLiveStreamMixDescription *description =
+        [[VeLiveStreamMixDescription alloc] init];
     VeLiveMixVideoLayout *videoLayout = [[VeLiveMixVideoLayout alloc] init];
     videoLayout.streamId = videoStreamId;
     videoLayout.x = [updatedLayout[@"x"] floatValue];
     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];
+    description.mixVideoStreams = @[ videoLayout ];
     [self.pusher.getMixerManager updateStreamMixDescription:description];
-    
+
     [self.mixedViewLayout setObject:updatedLayout forKey:viewId];
-    
-    VeLiveMixerUIView *mixerView = [[VeLiveMixerHelper cachedMixedViews] objectForKey:viewId];
-    [mixerView performCaptureWithTrigger:@"update"];
-    
+
+    // 延迟执行捕获，确保属性更新完成
+    VeLiveMixerUIView *mixerView =
+        [[VeLiveMixerHelper cachedMixedViews] objectForKey:viewId];
+    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) {
     return NO;
@@ -223,26 +265,27 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
     if (!layout) {
       return NO;
     }
-    
+
     NSNumber *streamIdNumber = [self.viewIdToStreamId objectForKey:viewId];
     if (streamIdNumber) {
       int streamId = [streamIdNumber intValue];
       [self.pusher.getMixerManager removeVideoStream:streamId];
-      
+
       NSString *callbackKey = [NSString stringWithFormat:@"%d", streamId];
       [self.callbacks removeObjectForKey:callbackKey];
     }
-    
+
     [self.viewIdToStreamId removeObjectForKey:viewId];
     [self.pendingCallbacks removeObjectForKey:viewId];
-    
-    VeLiveMixerUIView *view = [[VeLiveMixerHelper cachedMixedViews] objectForKey:viewId];
+
+    VeLiveMixerUIView *view =
+        [[VeLiveMixerHelper cachedMixedViews] objectForKey:viewId];
     if ([view isKindOfClass:[VeLiveMixerUIView class]]) {
       view.bitmapCaptureCallback = nil;
     }
-    
+
     [self.mixedViewLayout removeObjectForKey:viewId];
-    
+
     return YES;
   } @catch (NSException *exception) {
     return NO;
@@ -250,7 +293,8 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
 }
 
 - (void)captureView:(NSString *)viewId {
-  VeLiveMixerUIView *view = [[VeLiveMixerHelper cachedMixedViews] objectForKey:viewId];
+  VeLiveMixerUIView *view =
+      [[VeLiveMixerHelper cachedMixedViews] objectForKey:viewId];
   if ([view isKindOfClass:[VeLiveMixerUIView class]]) {
     [view performCaptureWithTrigger:@"manual"];
   }
@@ -258,55 +302,64 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
 
 #pragma mark - Static Methods
 
-+ (void)setupCallbackForMixerView:(VeLiveMixerUIView *)mixerView streamId:(int)streamId {
++ (void)setupCallbackForMixerView:(VeLiveMixerUIView *)mixerView
+                         streamId:(int)streamId {
   if (mixerView == nil) {
     return;
   }
-  
+
   VeLiveMixerHelper *instance = [VeLiveMixerHelper findActiveMixerManager];
   if (!instance) {
     return;
   }
-  
-  VeLiveMixerBitmapCallback *callback = [[VeLiveMixerBitmapCallback alloc] initWithStreamId:streamId];
-  
+
+  VeLiveMixerBitmapCallback *callback =
+      [[VeLiveMixerBitmapCallback alloc] initWithStreamId:streamId];
+
   NSString *callbackKey = [NSString stringWithFormat:@"%d", streamId];
   [instance.callbacks setObject:callback forKey:callbackKey];
-  
+
   mixerView.bitmapCaptureCallback = callback;
-  
-  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-    @try {
-      if (mixerView && mixerView.bitmapCaptureCallback) {
-        VeLiveMixerHelper *instance = [VeLiveMixerHelper findActiveMixerManager];
-        if (instance && instance.pusher) {
-          @try {
-            NSString *viewId = mixerView.viewId;
-            NSDictionary *layout = [instance.mixedViewLayout objectForKey:viewId];
-            if (layout) {
-              VeLiveStreamMixDescription *description = [[VeLiveStreamMixDescription alloc] init];
-              VeLiveMixVideoLayout *videoLayout = [[VeLiveMixVideoLayout alloc] init];
-              videoLayout.streamId = streamId;
-              videoLayout.x = [layout[@"x"] floatValue];
-              videoLayout.y = [layout[@"y"] floatValue];
-              videoLayout.width = [layout[@"width"] floatValue];
-              videoLayout.height = [layout[@"height"] floatValue];
-              videoLayout.zOrder = [layout[@"zOrder"] intValue];
-              videoLayout.renderMode = [layout[@"renderMode"] intValue];
-              description.mixVideoStreams = @[videoLayout];
-              [instance.pusher.getMixerManager updateStreamMixDescription:description];
+
+  dispatch_after(
+      dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)),
+      dispatch_get_main_queue(), ^{
+        @try {
+          if (mixerView && mixerView.bitmapCaptureCallback) {
+            VeLiveMixerHelper *instance =
+                [VeLiveMixerHelper findActiveMixerManager];
+            if (instance && instance.pusher) {
+              @try {
+                NSString *viewId = mixerView.viewId;
+                NSDictionary *layout =
+                    [instance.mixedViewLayout objectForKey:viewId];
+                if (layout) {
+                  VeLiveStreamMixDescription *description =
+                      [[VeLiveStreamMixDescription alloc] init];
+                  VeLiveMixVideoLayout *videoLayout =
+                      [[VeLiveMixVideoLayout alloc] init];
+                  videoLayout.streamId = streamId;
+                  videoLayout.x = [layout[@"x"] floatValue];
+                  videoLayout.y = [layout[@"y"] floatValue];
+                  videoLayout.width = [layout[@"width"] floatValue];
+                  videoLayout.height = [layout[@"height"] floatValue];
+                  videoLayout.zOrder = [layout[@"zOrder"] intValue];
+                  videoLayout.renderMode = [layout[@"renderMode"] intValue];
+                  description.mixVideoStreams = @[ videoLayout ];
+                  [instance.pusher.getMixerManager
+                      updateStreamMixDescription:description];
+                }
+              } @catch (NSException *e) {
+                // Ignore
+              }
             }
-          } @catch (NSException *e) {
-            // Ignore
+
+            [mixerView performCaptureWithTrigger:@"update"];
           }
+        } @catch (NSException *exception) {
+          // Ignore
         }
-        
-        [mixerView performCaptureWithTrigger:@"update"];
-      }
-    } @catch (NSException *exception) {
-      // Ignore
-    }
-  });
+      });
 }
 
 + (void)sendBitmapToMixerStatic:(int)streamId bitmap:(UIImage *)bitmap {
@@ -320,15 +373,18 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
   return currentInstance;
 }
 
-+ (void)onViewReady:(NSString *)viewId mixerView:(VeLiveMixerUIView *)mixerView {
++ (void)onViewReady:(NSString *)viewId
+          mixerView:(VeLiveMixerUIView *)mixerView {
   @try {
     VeLiveMixerHelper *instance = [VeLiveMixerHelper findActiveMixerManager];
     if (instance != nil) {
-      NSNumber *streamIdNumber = [instance.pendingCallbacks objectForKey:viewId];
+      NSNumber *streamIdNumber =
+          [instance.pendingCallbacks objectForKey:viewId];
       if (streamIdNumber != nil) {
         int streamId = [streamIdNumber intValue];
         [instance.pendingCallbacks removeObjectForKey:viewId];
-        [VeLiveMixerHelper setupCallbackForMixerView:mixerView streamId:streamId];
+        [VeLiveMixerHelper setupCallbackForMixerView:mixerView
+                                            streamId:streamId];
       }
     }
   } @catch (NSException *exception) {
@@ -338,36 +394,42 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
 
 - (void)cleanup {
   [self stopMemoryMonitoring];
-  
+
   for (NSString *viewId in self.mixedViewLayout.allKeys) {
-    VeLiveMixerUIView *view = [[VeLiveMixerHelper cachedMixedViews] objectForKey:viewId];
+    VeLiveMixerUIView *view =
+        [[VeLiveMixerHelper cachedMixedViews] objectForKey:viewId];
     if ([view isKindOfClass:[VeLiveMixerUIView class]]) {
       view.bitmapCaptureCallback = nil;
     }
   }
-  
+
   [self.mixedViewLayout removeAllObjects];
   [self.pendingCallbacks removeAllObjects];
   [self.callbacks removeAllObjects];
-  
+
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
     @autoreleasepool {
       [[NSURLCache sharedURLCache] removeAllCachedResponses];
       [[NSURLCache sharedURLCache] setMemoryCapacity:0];
       [[NSURLCache sharedURLCache] setMemoryCapacity:10 * 1024 * 1024];
-      
-      [[NSNotificationCenter defaultCenter] postNotificationName:UIApplicationDidReceiveMemoryWarningNotification object:nil];
-      
-      dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        // Final cleanup completed
-      });
+
+      [[NSNotificationCenter defaultCenter]
+          postNotificationName:UIApplicationDidReceiveMemoryWarningNotification
+                        object:nil];
+
+      dispatch_after(
+          dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)),
+          dispatch_get_main_queue(),
+          ^{
+              // Final cleanup completed
+          });
     }
   });
 }
 
 - (void)dealloc {
   [self cleanup];
-  
+
   if (currentInstance == self) {
     currentInstance = nil;
   }
@@ -376,11 +438,12 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
 #pragma mark - Memory Monitoring
 
 - (void)startMemoryMonitoring {
-  self.memoryMonitorTimer = [NSTimer scheduledTimerWithTimeInterval:30.0
-                                                             target:self
-                                                           selector:@selector(checkMemoryUsage)
-                                                           userInfo:nil
-                                                            repeats:YES];
+  self.memoryMonitorTimer =
+      [NSTimer scheduledTimerWithTimeInterval:30.0
+                                       target:self
+                                     selector:@selector(checkMemoryUsage)
+                                     userInfo:nil
+                                      repeats:YES];
 }
 
 - (void)stopMemoryMonitoring {
@@ -394,11 +457,12 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
   @autoreleasepool {
     struct task_basic_info info;
     mach_msg_type_number_t size = TASK_BASIC_INFO_COUNT;
-    kern_return_t kerr = task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&info, &size);
-    
+    kern_return_t kerr =
+        task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&info, &size);
+
     if (kerr == KERN_SUCCESS) {
       double memoryUsageMB = info.resident_size / 1024.0 / 1024.0;
-      
+
       if (memoryUsageMB > 200.0) {
         [self performMemoryCleanup];
       }
@@ -415,20 +479,24 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
         if ([view isKindOfClass:[VeLiveMixerUIView class]]) {
           if ([view.captureMode isEqualToString:@"realtime"]) {
             [view stopCapture];
-            
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-              if (view && [cachedViews objectForKey:viewId] == view) {
-                [view startCapture];
-              }
-            });
+
+            dispatch_after(
+                dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)),
+                dispatch_get_main_queue(), ^{
+                  if (view && [cachedViews objectForKey:viewId] == view) {
+                    [view startCapture];
+                  }
+                });
           }
         }
       }
-      
+
       [[NSURLCache sharedURLCache] removeAllCachedResponses];
       [[NSURLCache sharedURLCache] setMemoryCapacity:5 * 1024 * 1024];
-      
-      [[NSNotificationCenter defaultCenter] postNotificationName:UIApplicationDidReceiveMemoryWarningNotification object:nil];
+
+      [[NSNotificationCenter defaultCenter]
+          postNotificationName:UIApplicationDidReceiveMemoryWarningNotification
+                        object:nil];
     }
   });
 }
@@ -440,34 +508,26 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
     if (!self.pusher || !bitmap) {
       return;
     }
-    
+
     CVPixelBufferRef pixelBuffer = NULL;
-    
+
     @try {
       pixelBuffer = [self pixelBufferFromUIImage:bitmap];
       if (!pixelBuffer) {
         return;
       }
-      
+
       VeLiveVideoFrame *videoFrame = [[VeLiveVideoFrame alloc] init];
       videoFrame.bufferType = VeLiveVideoBufferTypePixelBuffer;
       videoFrame.pts = CMTimeMakeWithSeconds(CACurrentMediaTime(), 1000000000);
       videoFrame.pixelBuffer = pixelBuffer;
-      
-      __block CVPixelBufferRef bufferToRelease = pixelBuffer;
-      [videoFrame setReleaseCallback:^{
-        @autoreleasepool {
-          if (bufferToRelease) {
-            CVPixelBufferRelease(bufferToRelease);
-            bufferToRelease = NULL;
-          }
-        }
-      }];
-      
-      [[self.pusher getMixerManager] sendCustomVideoFrame:videoFrame streamId:streamId];
-      
+
+      [[self.pusher getMixerManager] sendCustomVideoFrame:videoFrame
+                                                 streamId:streamId];
+      CVPixelBufferRelease(pixelBuffer);
+
       pixelBuffer = NULL;
-      
+
     } @catch (NSException *exception) {
       if (pixelBuffer) {
         CVPixelBufferRelease(pixelBuffer);
@@ -483,55 +543,53 @@ static VeLiveMixerHelper *currentInstance = nil; // 强引用，防止被ARC释
   if (!image) {
     return NULL;
   }
-  
+
   CGImageRef cgImage = image.CGImage;
   if (!cgImage) {
     return NULL;
   }
-  
+
   CGFloat width = CGImageGetWidth(cgImage);
   CGFloat height = CGImageGetHeight(cgImage);
-  
+
   NSDictionary *options = @{
-    (NSString *)kCVPixelBufferCGImageCompatibilityKey: @YES,
-    (NSString *)kCVPixelBufferCGBitmapContextCompatibilityKey: @YES,
-    (NSString *)kCVPixelBufferIOSurfacePropertiesKey: @{}
+    (NSString *)kCVPixelBufferCGImageCompatibilityKey : @YES,
+    (NSString *)kCVPixelBufferCGBitmapContextCompatibilityKey : @YES,
+    (NSString *)kCVPixelBufferIOSurfacePropertiesKey : @{}
   };
-  
+
   CVPixelBufferRef pixelBuffer = NULL;
-  CVReturn status = CVPixelBufferCreate(kCFAllocatorDefault,
-                                       width, height,
-                                       kCVPixelFormatType_32BGRA,
-                                       (__bridge CFDictionaryRef)options,
-                                       &pixelBuffer);
-  
+  CVReturn status = CVPixelBufferCreate(
+      kCFAllocatorDefault, width, height, kCVPixelFormatType_32BGRA,
+      (__bridge CFDictionaryRef)options, &pixelBuffer);
+
   if (status != kCVReturnSuccess || !pixelBuffer) {
     return NULL;
   }
-  
+
   CVPixelBufferLockBaseAddress(pixelBuffer, 0);
-  
+
   void *pixelData = CVPixelBufferGetBaseAddress(pixelBuffer);
   size_t bytesPerRow = CVPixelBufferGetBytesPerRow(pixelBuffer);
-  
+
   CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-  CGContextRef context = CGBitmapContextCreate(pixelData, width, height,
-                                              8, bytesPerRow, colorSpace,
-                                              kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
-  
+  CGContextRef context = CGBitmapContextCreate(
+      pixelData, width, height, 8, bytesPerRow, colorSpace,
+      kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
+
   if (!context) {
     CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
     CVPixelBufferRelease(pixelBuffer);
     CGColorSpaceRelease(colorSpace);
     return NULL;
   }
-  
+
   CGContextDrawImage(context, CGRectMake(0, 0, width, height), cgImage);
-  
+
   CGContextRelease(context);
   CGColorSpaceRelease(colorSpace);
   CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
-  
+
   return pixelBuffer;
 }