Update to m137 with audio engine (flutter-webrtc#1875)

* Update frame cryptor symbol change

* Enable audio engine mode

* Observe device changes

* Lib to 125.6422.09

* Generated

* Update lib

* Update gitignore

* Re-apply gitignore

Author: hiroshihorie

.gitignore

@@ -1,21 +1,3 @@
-*.iml
-.idea
-.DS_Store
-example/pubspec.lock
-pubspec.lock
-example/ios/Podfile.lock
-GeneratedPluginRegistrant.java
-example/android/.gradle
-WorkspaceSettings.xcsettings
-example/.flutter-plugins
-example/android/local.properties
-.dart_tool/package_config.json
-android/.project
-example/ios/Runner/GeneratedPluginRegistrant.m
-example/ios/Runner/GeneratedPluginRegistrant.h
-example/ios/Flutter/Generated.xcconfig
-example/ios/Flutter/flutter_export_environment.sh
-
 # Miscellaneous
 *.class
 *.log
@@ -26,33 +8,24 @@ example/ios/Flutter/flutter_export_environment.sh
 .buildlog/
 .history
 .svn/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
 *.ipr
 *.iws
 .idea/
 
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
 # Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
 **/doc/api/
 .dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-/android/.gradle/
-
-
-android/.classpath
-android/.settings/org.eclipse.buildship.core.prefs
-
-# VSCode
-.vscode/
-
-!webrtc_android.iml
-!webrtc.iml
-
-# vs
-*.pdb
+build/

common/darwin/Classes/FlutterRTCFrameCryptor.m

@@ -565,21 +565,21 @@ - (void)keyProviderDispose:(nonnull NSDictionary*)constraints result:(nonnull Fl
   result(@{@"result" : @"success"});
 }
 
-- (NSString*)stringFromState:(FrameCryptionState)state {
+- (NSString*)stringFromState:(RTCFrameCryptorState)state {
   switch (state) {
-    case FrameCryptionStateNew:
+    case RTCFrameCryptorStateNew:
       return @"new";
-    case FrameCryptionStateOk:
+    case RTCFrameCryptorStateOk:
       return @"ok";
-    case FrameCryptionStateEncryptionFailed:
+    case RTCFrameCryptorStateEncryptionFailed:
       return @"encryptionFailed";
-    case FrameCryptionStateDecryptionFailed:
+    case RTCFrameCryptorStateDecryptionFailed:
       return @"decryptionFailed";
-    case FrameCryptionStateMissingKey:
+    case RTCFrameCryptorStateMissingKey:
       return @"missingKey";
-    case FrameCryptionStateKeyRatcheted:
+    case RTCFrameCryptorStateKeyRatcheted:
       return @"keyRatcheted";
-    case FrameCryptionStateInternalError:
+    case RTCFrameCryptorStateInternalError:
       return @"internalError";
     default:
       return @"unknown";
@@ -590,7 +590,7 @@ - (NSString*)stringFromState:(FrameCryptionState)state {
 
 - (void)frameCryptor:(RTC_OBJC_TYPE(RTCFrameCryptor) *)frameCryptor
     didStateChangeWithParticipantId:(NSString*)participantId
-                          withState:(FrameCryptionState)stateChanged {
+                          withState:(RTCFrameCryptorState)stateChanged {
   if (frameCryptor.eventSink) {
     postEvent(frameCryptor.eventSink, @{
       @"event" : @"frameCryptionStateChanged",

common/darwin/Classes/FlutterWebRTCPlugin.h

@@ -21,6 +21,7 @@ typedef void (^CapturerStopHandler)(CompletionHandler _Nonnull handler);
 
 @interface FlutterWebRTCPlugin : NSObject <FlutterPlugin,
                                            RTCPeerConnectionDelegate,
+                                           RTCAudioDeviceModuleDelegate,
                                            FlutterStreamHandler
 #if TARGET_OS_OSX
                                            ,

common/darwin/Classes/FlutterWebRTCPlugin.m

@@ -195,14 +195,10 @@ - (instancetype)initWithChannel:(FlutterMethodChannel*)channel
                                                name:AVAudioSessionRouteChangeNotification
                                              object:session];
 #endif
-#if TARGET_OS_OSX
-  [_peerConnectionFactory.audioDeviceModule setDevicesUpdatedHandler:^(void) {
-    NSLog(@"Handle Devices Updated!");
-    if (self.eventSink) {
-      postEvent( self.eventSink, @{@"event" : @"onDeviceChange"});
-    }
-  }];
-#endif
+
+  // Observe audio device module events.
+  _peerConnectionFactory.audioDeviceModule.observer = self;
+
   return self;
 }
 
@@ -257,7 +253,8 @@ - (void)initialize:(NSArray*)networkIgnoreMask
             [[VideoEncoderFactorySimulcast alloc] initWithPrimary:encoderFactory fallback:encoderFactory];
 
         _peerConnectionFactory =
-            [[RTCPeerConnectionFactory alloc] initWithBypassVoiceProcessing:bypassVoiceProcessing
+            [[RTCPeerConnectionFactory alloc] initWithAudioDeviceModuleType:RTCAudioDeviceModuleTypeAudioEngine
+                                                      bypassVoiceProcessing:bypassVoiceProcessing
                                                              encoderFactory:simulcastFactory
                                                              decoderFactory:decoderFactory
                                                       audioProcessingModule:_audioManager.audioProcessingModule];
@@ -2379,4 +2376,14 @@ - (FlutterRTCVideoRenderer *)findRendererByTrackId:(NSString *)trackId {
     }
     return nil;
 }
+
+#pragma mark - RTCAudioDeviceModuleDelegate methods
+
+- (void)audioDeviceModuleDidUpdateDevices:(RTCAudioDeviceModule *)audioDeviceModule {
+    NSLog(@"audioDeviceModule did update devices");
+    if (self.eventSink) {
+      postEvent( self.eventSink, @{@"event" : @"onDeviceChange"});
+    }
+}
+
 @end

example/.gitignore

@@ -5,9 +5,12 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
@@ -22,19 +25,23 @@
 
 # Flutter/Dart/Pub related
 **/doc/api/
+**/ios/Flutter/.last_build_id
 .dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
-.packages
 .pub-cache/
 .pub/
 /build/
-.metadata
-
-# Web related
 
 # Symbolication related
 app.*.symbols
 
-# Exceptions to above rules.
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
+
+/pubspec.lock

example/android/.gitignore

@@ -5,9 +5,10 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+.cxx/
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks

example/ios/.gitignore

@@ -32,3 +32,5 @@ Runner/GeneratedPluginRegistrant.*
 !default.mode2v3
 !default.pbxuser
 !default.perspectivev3
+
+/Podfile.lock