Merge remote-tracking branch 'upstream/master' into dl/upstream_merge_july2025

Author: davidliu

Documentation/BasicUsage.md

@@ -232,11 +232,9 @@ That will allow you to enable and disable video streams on demand while a call i
 
 ```javascript
 let sessionConstraints = {
-	mandatory: {
-		OfferToReceiveAudio: true,
-		OfferToReceiveVideo: true,
-		VoiceActivityDetection: true
-	}
+	offerToReceiveAudio: true,
+	offerToReceiveVideo: true,
+	voiceActivityDetection: true
 };
 ```
 
@@ -341,6 +339,30 @@ Don't forget, the user facing camera is usually mirrored.
 | objectFit | string | 'contain' | Can be `'contain'` or `'cover'` nothing more or less. | 
 | streamURL | string | 'streamURL' | Required to have an actual video stream rendering. |
 | zOrder | number | 0 | Similar to zIndex. |
+| onDimensionsChange | function | undefined | Callback fired when video dimensions change. Receives event with nativeEvent containing width and height. |
+
+## Handling Video Dimension Changes
+
+You can listen for changes in video dimensions using the onDimensionsChange callback.  
+This is useful for adapting your UI based on the video's aspect ratio or for analytics.
+
+```javascript
+import React, { useState } from 'react';
+
+const [videoDimensions, setVideoDimensions] = useState({ width: 0, height: 0 });
+
+<RTCView
+	mirror={true}
+	objectFit={'cover'}
+	streamURL={localMediaStream.toURL()}
+	zOrder={0}
+	onDimensionsChange={(event) => {
+		const { width, height } = event.nativeEvent;
+		setVideoDimensions({ width, height });
+		console.log(`Video dimensions changed: ${width}x${height}`);
+	}}
+/>
+```
 
 ## Controlling remote audio tracks
 

Documentation/CallGuide.md

@@ -143,11 +143,9 @@ So you can now start creating an offer which then needs sending send off to the
 
 ```javascript
 let sessionConstraints = {
-	mandatory: {
-		OfferToReceiveAudio: true,
-		OfferToReceiveVideo: true,
-		VoiceActivityDetection: true
-	}
+	offerToReceiveAudio: true,
+	offerToReceiveVideo: true,
+	voiceActivityDetection: true
 };
 
 try {

android/src/main/java/com/oney/WebRTCModule/RTCVideoViewManager.java

@@ -1,8 +1,13 @@
 package com.oney.WebRTCModule;
 
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
+
+import java.util.HashMap;
+import java.util.Map;
 
 public class RTCVideoViewManager extends SimpleViewManager<WebRTCView> {
     private static final String REACT_CLASS = "RTCVideoView";
@@ -70,4 +75,24 @@ public void setStreamURL(WebRTCView view, String streamURL) {
     public void setZOrder(WebRTCView view, int zOrder) {
         view.setZOrder(zOrder);
     }
+
+    /**
+     * Sets the callback for when video dimensions change.
+     *
+     * @param view The {@code WebRTCView} on which the callback is to be set.
+     * @param onDimensionsChange The callback to be called when video dimensions change.
+     */
+    @ReactProp(name = "onDimensionsChange")
+    public void setOnDimensionsChange(WebRTCView view, boolean onDimensionsChange) {
+        view.setOnDimensionsChange(onDimensionsChange);
+    }
+
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        Map<String, Object> eventTypeConstants = new HashMap<>();
+        Map<String, String> dimensionsChangeEvent = new HashMap<>();
+        dimensionsChangeEvent.put("registrationName", "onDimensionsChange");
+        eventTypeConstants.put("onDimensionsChange", dimensionsChangeEvent);
+        return eventTypeConstants;
+    }
 }

android/src/main/java/com/oney/WebRTCModule/WebRTCView.java

@@ -10,7 +10,12 @@
 
 import androidx.core.view.ViewCompat;
 
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 import org.webrtc.EglBase;
 import org.webrtc.Logging;
@@ -144,6 +149,11 @@ public void run() {
      */
     private VideoTrack videoTrack;
 
+    /**
+     * The callback to be called when video dimensions change.
+     */
+    private boolean onDimensionsChangeEnabled = false;
+
     public WebRTCView(Context context) {
         super(context);
 
@@ -257,6 +267,24 @@ private void onFrameResolutionChanged(int videoWidth, int videoHeight, int rotat
             // The onFrameResolutionChanged method call executes on the
             // surfaceViewRenderer's render Thread.
             post(requestSurfaceViewRendererLayoutRunnable);
+
+            // Call the onDimensionsChange callback if it's enabled
+            if (onDimensionsChangeEnabled) {
+                post(() -> {
+                    try {
+                        ReactContext reactContext = (ReactContext) getContext();
+                        WritableMap params = Arguments.createMap();
+                        params.putInt("width", videoWidth);
+                        params.putInt("height", videoHeight);
+
+                        // Send the event through React Native's event system
+                        reactContext.getJSModule(RCTEventEmitter.class)
+                                .receiveEvent(getId(), "onDimensionsChange", params);
+                    } catch (Exception e) {
+                        Log.e(TAG, "Error calling onDimensionsChange callback", e);
+                    }
+                });
+            }
         }
     }
 
@@ -543,4 +571,13 @@ private void tryAddRendererToVideoTrack() {
             rendererAttached = true;
         }
     }
+
+    /**
+     * Sets whether the onDimensionsChange callback should be called.
+     *
+     * @param enabled Whether the callback should be enabled.
+     */
+    public void setOnDimensionsChange(boolean enabled) {
+        this.onDimensionsChangeEnabled = enabled;
+    }
 }

ios/RCTWebRTC/RTCVideoViewManager.m

@@ -23,7 +23,7 @@
  * Implements an equivalent of {@code HTMLVideoElement} i.e. Web's video
  * element.
  */
-@interface RTCVideoView : RCTView
+@interface RTCVideoView : RCTView<RTCVideoViewDelegate>
 
 /**
  * The indicator which determines whether this {@code RTCVideoView} is to mirror
@@ -53,6 +53,9 @@ @interface RTCVideoView : RCTView
 @property(nonatomic, readonly) RTCMTLVideoView *videoView;
 #endif
 
+// Add a reference to the view manager
+@property(nonatomic, weak) RTCVideoViewManager *viewManager;
+
 /**
  * The {@link RTCVideoTrack}, if any, which this instance renders.
  */
@@ -63,6 +66,8 @@ @interface RTCVideoView : RCTView
  */
 @property(nonatomic, weak) WebRTCModule *module;
 
+@property(nonatomic, copy) RCTDirectEventBlock onDimensionsChange;
+
 @end
 
 @implementation RTCVideoView
@@ -113,6 +118,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
 #endif
         _objectFit = RTCVideoViewObjectFitCover;
         [self addSubview:self.videoView];
+        self.videoView.delegate = self;
     }
 
     return self;
@@ -292,6 +298,18 @@ - (void)setVideoTrack:(RTCVideoTrack *)videoTrack {
     }
 }
 
+- (void)videoView:(id)videoView didChangeVideoSize:(CGSize)size {
+    // Capture the callback block to avoid accessing it across threads
+    RCTDirectEventBlock callback = self.onDimensionsChange;
+    if (callback) {
+        NSDictionary *eventData = @{@"width" : @(size.width), @"height" : @(size.height)};
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            callback(eventData);
+        });
+    }
+}
+
 @end
 
 @implementation RTCVideoViewManager
@@ -301,6 +319,7 @@ @implementation RTCVideoViewManager
 - (RCTView *)view {
     RTCVideoView *v = [[RTCVideoView alloc] init];
     v.module = [self.bridge moduleForName:@"WebRTCModule"];
+    v.viewManager = self;
     v.clipsToBounds = YES;
     return v;
 }
@@ -327,6 +346,8 @@ - (dispatch_queue_t)methodQueue {
     view.objectFit = fit;
 }
 
+RCT_EXPORT_VIEW_PROPERTY(onDimensionsChange, RCTDirectEventBlock)
+
 RCT_CUSTOM_VIEW_PROPERTY(streamURL, NSString *, RTCVideoView) {
     if (!json) {
         view.videoTrack = nil;

src/RTCPeerConnection.ts

@@ -18,6 +18,7 @@ import RTCRtpTransceiver from './RTCRtpTransceiver';
 import RTCSessionDescription, { RTCSessionDescriptionInit } from './RTCSessionDescription';
 import RTCTrackEvent from './RTCTrackEvent';
 import * as RTCUtil from './RTCUtil';
+import { RTCOfferOptions } from './RTCUtil';
 
 const log = new Logger('pc');
 const { WebRTCModule } = NativeModules;
@@ -132,7 +133,7 @@ export default class RTCPeerConnection extends EventTarget<RTCPeerConnectionEven
         log.debug(`${this._pcId} ctor`);
     }
 
-    async createOffer(options) {
+    async createOffer(options?:RTCOfferOptions) {
         log.debug(`${this._pcId} createOffer`);
 
         const {

src/RTCUtil.ts

@@ -12,6 +12,13 @@ const FACING_MODES = [ 'user', 'environment' ];
 
 const ASPECT_RATIO = 16 / 9;
 
+export type RTCOfferOptions  = {
+    iceRestart?:boolean;
+    offerToReceiveAudio?: boolean;
+    offerToReceiveVideo?: boolean;
+    voiceActivityDetection?:boolean
+};
+
 const STANDARD_OFFER_OPTIONS = {
     icerestart: 'IceRestart',
     offertoreceiveaudio: 'OfferToReceiveAudio',
@@ -157,10 +164,10 @@ export function isSdpTypeValid(type: string): boolean {
  * @param options - user supplied options
  * @return Normalized options
  */
-export function normalizeOfferOptions(options: object = {}): object {
-    const newOptions = {};
+export function normalizeOfferOptions(options?: RTCOfferOptions) {
+    const newOptions: Record<string,string> = {};
 
-    if (!options) {
+    if (typeof options !== 'object') {
         return newOptions;
     }
 

src/RTCView.ts

@@ -70,7 +70,17 @@ export interface RTCVideoViewProps extends ViewProps {
    *
    * iOS only. Requires iOS 15.0 or above, and the PIP background mode capability.
    */
-  iosPIP?: RTCIOSPIPOptions
+  iosPIP?: RTCIOSPIPOptions;
+
+  /**
+   * Callback function that is called when the dimensions of the video change.
+   *
+   * @param {Object} event - The event object containing the new dimensions.
+   * @param {Object} event.nativeEvent - The native event data.
+   * @param {number} event.nativeEvent.width - The width of the video.
+   * @param {number} event.nativeEvent.height - The height of the video.
+   */
+  onDimensionsChange?: (event: { nativeEvent: { width: number; height: number } }) => void;
 }
 
 export interface RTCIOSPIPOptions {