Upgrade to webrtc m145

api/crypto/frame_crypto_transformer.cc

@@ -442,17 +442,18 @@ void FrameCryptorTransformer::encryptFrame(
   auto key_set = key_handler->GetKeySet(key_index_);
   uint8_t unencrypted_bytes = get_unencrypted_bytes(frame.get(), type_);
 
-  Buffer frame_header(unencrypted_bytes);
+  Buffer frame_header = Buffer::CreateUninitializedWithSize(unencrypted_bytes);
   for (size_t i = 0; i < unencrypted_bytes; i++) {
     frame_header[i] = data_in[i];
   }
 
-  Buffer frame_trailer(2);
+  Buffer frame_trailer = Buffer::CreateUninitializedWithSize(2);
   frame_trailer[0] = getIvSize();
   frame_trailer[1] = key_index_;
   Buffer iv = makeIv(frame->GetSsrc(), frame->GetTimestamp());
 
-  Buffer payload(data_in.size() - unencrypted_bytes);
+  Buffer payload =
+      Buffer::CreateUninitializedWithSize(data_in.size() - unencrypted_bytes);
   for (size_t i = unencrypted_bytes; i < data_in.size(); i++) {
     payload[i - unencrypted_bytes] = data_in[i];
   }
@@ -462,8 +463,7 @@ void FrameCryptorTransformer::encryptFrame(
                         key_set->encryption_key, iv, frame_header, payload,
                         &buffer) == Success) {
     Buffer encrypted_payload(buffer.data(), buffer.size());
-    Buffer tag(encrypted_payload.data() + encrypted_payload.size() - 16,
-                    16);
+    Buffer tag(encrypted_payload.data() + encrypted_payload.size() - 16, 16);
     Buffer data_without_header;
     data_without_header.AppendData(encrypted_payload);
     data_without_header.AppendData(iv);
@@ -566,12 +566,12 @@ void FrameCryptorTransformer::decryptFrame(
 
   uint8_t unencrypted_bytes = get_unencrypted_bytes(frame.get(), type_);
 
-  Buffer frame_header(unencrypted_bytes);
+  Buffer frame_header = Buffer::CreateUninitializedWithSize(unencrypted_bytes);
   for (size_t i = 0; i < unencrypted_bytes; i++) {
     frame_header[i] = data_in[i];
   }
 
-  Buffer frame_trailer(2);
+  Buffer frame_trailer = Buffer::CreateUninitializedWithSize(2);
   frame_trailer[0] = data_in[data_in.size() - 2];
   frame_trailer[1] = data_in[data_in.size() - 1];
   uint8_t ivLength = frame_trailer[0];
@@ -613,12 +613,13 @@ void FrameCryptorTransformer::decryptFrame(
 
   auto key_set = key_handler->GetKeySet(key_index);
 
-  Buffer iv = Buffer(ivLength);
+  Buffer iv = Buffer::CreateUninitializedWithSize(ivLength);
   for (size_t i = 0; i < ivLength; i++) {
     iv[i] = data_in[data_in.size() - 2 - ivLength + i];
   }
 
-  Buffer encrypted_buffer(data_in.size() - unencrypted_bytes);
+  Buffer encrypted_buffer =
+      Buffer::CreateUninitializedWithSize(data_in.size() - unencrypted_bytes);
   for (size_t i = unencrypted_bytes; i < data_in.size(); i++) {
     encrypted_buffer[i - unencrypted_bytes] = data_in[i];
   }
@@ -634,7 +635,8 @@ void FrameCryptorTransformer::decryptFrame(
         H265::ParseRbsp(encrypted_buffer.data(), encrypted_buffer.size()));
   }
 
-  Buffer encrypted_payload(encrypted_buffer.size() - ivLength - 2);
+  Buffer encrypted_payload = Buffer::CreateUninitializedWithSize(
+      encrypted_buffer.size() - ivLength - 2);
   for (size_t i = 0; i < encrypted_payload.size(); i++) {
     encrypted_payload[i] = encrypted_buffer[i];
   }
@@ -795,7 +797,8 @@ RTCErrorOr<webrtc::scoped_refptr<EncryptedPacket>> DataPacketCryptor::Encrypt(
 
   std::vector<uint8_t> buffer;
   Buffer payload(data.data(), data.size());
-  auto frame_header = Buffer(0);  // no frame header for data packets
+  auto frame_header = Buffer::CreateUninitializedWithSize(
+      0);  // no frame header for data packets
   if (AesEncryptDecrypt(EncryptOrDecrypt::kEncrypt, algorithm_,
                         key_set->encryption_key, iv, frame_header, payload,
                         &buffer) == Success) {
@@ -826,12 +829,13 @@ RTCErrorOr<std::vector<uint8_t>> DataPacketCryptor::Decrypt(
                         std::to_string(key_index) +
                         "] out of range for participant " + participant_id);
   }
-  
+
   std::vector<uint8_t> buffer;
   Buffer encrypted_payload(encryptedPacket->data.data(),
-                                encryptedPacket->data.size());
+                           encryptedPacket->data.size());
   Buffer iv(encryptedPacket->iv.data(), encryptedPacket->iv.size());
-  auto frame_header = Buffer(0);  // no frame header for data packets
+  auto frame_header = Buffer::CreateUninitializedWithSize(
+      0);  // no frame header for data packets
 
   auto key_set = key_handler->GetKeySet(key_index);
   auto initialKeyMaterial = key_set->material;

api/test/mock_transformable_video_frame.h

@@ -45,7 +45,6 @@ class MockTransformableVideoFrame : public TransformableVideoFrameInterface {
               (const, override));
   MOCK_METHOD(std::string, GetMimeType, (), (const, override));
   MOCK_METHOD(VideoFrameMetadata, Metadata, (), (const, override));
-  MOCK_METHOD(RTPVideoHeader&, header, (), (const, override));
   MOCK_METHOD(std::optional<Timestamp>,
               GetPresentationTimestamp,
               (),

modules/audio_device/include/test_audio_device.cc

@@ -51,17 +51,17 @@ constexpr int kFramesPerSecond = kNumMicrosecsPerSec / kFrameLengthUs;
 class TestAudioDeviceModuleImpl : public AudioDeviceModuleImpl {
  public:
   TestAudioDeviceModuleImpl(
-      TaskQueueFactory* task_queue_factory,
+      const Environment& env,
       std::unique_ptr<TestAudioDeviceModule::Capturer> capturer,
       std::unique_ptr<TestAudioDeviceModule::Renderer> renderer,
       float speed = 1)
       : AudioDeviceModuleImpl(
             AudioLayer::kDummyAudio,
-            std::make_unique<TestAudioDevice>(task_queue_factory,
+            std::make_unique<TestAudioDevice>(env,
                                               std::move(capturer),
                                               std::move(renderer),
                                               speed),
-            task_queue_factory,
+            &env.task_queue_factory(),
             /*create_detached=*/true) {}
 
   ~TestAudioDeviceModuleImpl() override = default;
@@ -70,16 +70,16 @@ class TestAudioDeviceModuleImpl : public AudioDeviceModuleImpl {
 class TestAudioDeviceModuleImpl : public AudioDeviceModuleForTest {
  public:
   TestAudioDeviceModuleImpl(
-      TaskQueueFactory* task_queue_factory,
+      const Environment& env,
       std::unique_ptr<TestAudioDeviceModule::Capturer> capturer,
       std::unique_ptr<TestAudioDeviceModule::Renderer> renderer,
       float speed = 1)
       : audio_device_(std::make_unique<TestAudioDevice>(
-            task_queue_factory,
+            env,
             std::move(capturer),
             std::move(renderer),
             speed)),
-        audio_device_buffer_(task_queue_factory,
+        audio_device_buffer_(&env.task_queue_factory(),
                              /*create_detached=*/true) {
     audio_device_->AttachAudioBuffer(&audio_device_buffer_);
   }
@@ -784,12 +784,12 @@ size_t TestAudioDeviceModule::SamplesPerFrame(int sampling_frequency_in_hz) {
 }
 
 scoped_refptr<AudioDeviceModule> TestAudioDeviceModule::Create(
-    TaskQueueFactory* task_queue_factory,
+    const Environment& env,
     std::unique_ptr<TestAudioDeviceModule::Capturer> capturer,
     std::unique_ptr<TestAudioDeviceModule::Renderer> renderer,
     float speed) {
   auto audio_device = make_ref_counted<TestAudioDeviceModuleImpl>(
-      task_queue_factory, std::move(capturer), std::move(renderer), speed);
+      env, std::move(capturer), std::move(renderer), speed);
 
 #if defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE)
   // Ensure that the current platform is supported.

sdk/BUILD.gn

@@ -95,6 +95,7 @@ if (is_ios || is_mac) {
   rtc_library("base_objc") {
     visibility = [ "*" ]
     sources = [
+      "objc/base/RTCAudioRenderer.h",
       "objc/base/RTCCodecSpecificInfo.h",
       "objc/base/RTCEncodedImage.h",
       "objc/base/RTCEncodedImage.m",
@@ -253,7 +254,7 @@ if (is_ios || is_mac) {
   }
 
   if (!build_with_chromium) {
-    if (is_ios) {
+    if (is_ios || is_mac) {
       rtc_library("native_api_audio_device_module") {
         visibility = [ "*" ]
 
@@ -263,7 +264,6 @@ if (is_ios || is_mac) {
         ]
 
         deps = [
-          ":audio_device",
           ":audio_device_module_error_handler",
           "../api:make_ref_counted",
           "../api:scoped_refptr",
@@ -274,8 +274,14 @@ if (is_ios || is_mac) {
           "../rtc_base:logging",
           "../system_wrappers",
         ]
+
+        if (is_ios) {
+          deps += [ ":audio_device" ]
+        }
       }
+    }
 
+    if (is_ios) {
       rtc_source_set("audio_session_observer") {
         visibility = [ ":*" ]
 
@@ -681,7 +687,6 @@ if (is_ios || is_mac) {
       if (is_mac) {
         sources += [
           "objc/components/renderer/metal/RTCMTLNSVideoView.h",
-          "objc/components/renderer/metal/RTCMTLNSVideoView.m",
         ]
         frameworks += [ "AppKit.framework" ]
       }
@@ -1094,11 +1099,19 @@ if (is_ios || is_mac) {
         "objc/api/peerconnection/RTCDataChannelConfiguration+Private.h",
         "objc/api/peerconnection/RTCDataChannelConfiguration.h",
         "objc/api/peerconnection/RTCDataChannelConfiguration.mm",
+        "objc/api/peerconnection/RTCDataPacketCryptor.h",
+        "objc/api/peerconnection/RTCDataPacketCryptor.mm",
         "objc/api/peerconnection/RTCDtmfSender+Private.h",
         "objc/api/peerconnection/RTCDtmfSender.h",
         "objc/api/peerconnection/RTCDtmfSender.mm",
         "objc/api/peerconnection/RTCFieldTrials.h",
         "objc/api/peerconnection/RTCFieldTrials.mm",
+        "objc/api/peerconnection/RTCFrameCryptor+Private.h",
+        "objc/api/peerconnection/RTCFrameCryptor.h",
+        "objc/api/peerconnection/RTCFrameCryptor.mm",
+        "objc/api/peerconnection/RTCFrameCryptorKeyProvider+Private.h",
+        "objc/api/peerconnection/RTCFrameCryptorKeyProvider.h",
+        "objc/api/peerconnection/RTCFrameCryptorKeyProvider.mm",
         "objc/api/peerconnection/RTCIODevice.h",
         "objc/api/peerconnection/RTCIODevice.mm",
         "objc/api/peerconnection/RTCIceCandidate+Private.h",
@@ -1257,6 +1270,7 @@ if (is_ios || is_mac) {
         "../api/audio_codecs:audio_codecs_api",
         "../api/audio_codecs:builtin_audio_decoder_factory",
         "../api/audio_codecs:builtin_audio_encoder_factory",
+        "../api/crypto:frame_crypto_transformer",
         "../api/crypto:frame_decryptor_interface",
         "../api/crypto:frame_encryptor_interface",
         "../api/environment",
@@ -1290,10 +1304,9 @@ if (is_ios || is_mac) {
         "../system_wrappers:metrics",
       ]
 
-      if (is_ios) {
+      if (is_ios || is_mac) {
         deps += [
           ":native_api_audio_device_module",
-          "../api/transport:network_control",
         ]
       }
     }
@@ -1448,6 +1461,11 @@ if (is_ios || is_mac) {
       }
     }
 
+    bundle_data("darwin_privacy_info") {
+      sources = [ "objc/PrivacyInfo.xcprivacy" ]
+      outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
+    }
+
     if (is_ios) {
       apple_framework_bundle_with_umbrella_header("framework_objc") {
         info_plist = "objc/Info.plist"
@@ -1473,6 +1491,7 @@ if (is_ios || is_mac) {
           "objc/base/RTCVideoFrame.h",
           "objc/base/RTCVideoFrameBuffer.h",
           "objc/base/RTCVideoRenderer.h",
+          "objc/base/RTCAudioRenderer.h",
           "objc/base/RTCYUVPlanarBuffer.h",
           "objc/components/audio/RTCAudioDevice.h",
           "objc/components/audio/RTCAudioSession.h",
@@ -1502,6 +1521,9 @@ if (is_ios || is_mac) {
           "objc/api/peerconnection/RTCConfiguration.h",
           "objc/api/peerconnection/RTCDataChannel.h",
           "objc/api/peerconnection/RTCDataChannelConfiguration.h",
+          "objc/api/peerconnection/RTCDataPacketCryptor.h",
+          "objc/api/peerconnection/RTCFrameCryptor.h",
+          "objc/api/peerconnection/RTCFrameCryptorKeyProvider.h",
           "objc/api/peerconnection/RTCFieldTrials.h",
           "objc/api/peerconnection/RTCIceCandidate.h",
           "objc/api/peerconnection/RTCIceCandidateErrorEvent.h",
@@ -1601,6 +1623,7 @@ if (is_ios || is_mac) {
         deps = [
           ":audio_objc",
           ":base_objc",
+          ":darwin_privacy_info",
           ":default_codec_factory_objc",
           ":metal_objc",
           ":native_api",
@@ -1642,6 +1665,39 @@ if (is_ios || is_mac) {
     }
 
     if (is_mac) {
+      rtc_library("desktopcapture_objc") {
+        visibility = [ "*" ]
+        sources = [
+          "objc/components/capturer/RTCDesktopCapturer+Private.h",
+          "objc/components/capturer/RTCDesktopCapturer.h",
+          "objc/components/capturer/RTCDesktopCapturer.mm",
+          "objc/components/capturer/RTCDesktopMediaList+Private.h",
+          "objc/components/capturer/RTCDesktopMediaList.h",
+          "objc/components/capturer/RTCDesktopMediaList.mm",
+          "objc/components/capturer/RTCDesktopSource+Private.h",
+          "objc/components/capturer/RTCDesktopSource.h",
+          "objc/components/capturer/RTCDesktopSource.mm",
+          "objc/native/src/objc_desktop_capture.h",
+          "objc/native/src/objc_desktop_capture.mm",
+          "objc/native/src/objc_desktop_media_list.h",
+          "objc/native/src/objc_desktop_media_list.mm",
+        ]
+        frameworks = [ "AppKit.framework" ]
+
+        configs += [ "..:common_objc" ]
+
+        public_configs = [ ":common_config_objc" ]
+
+        deps = [
+          ":base_objc",
+          ":helpers_objc",
+          ":videoframebuffer_objc",
+          "../modules/desktop_capture",
+          "../rtc_base/system:gcd_helpers",
+          "//third_party:jpeg",
+        ]
+      }
+
       apple_framework_bundle_with_umbrella_header("mac_framework_objc") {
         info_plist = "objc/Info.plist"
         output_name = "WebRTC"
@@ -1655,8 +1711,11 @@ if (is_ios || is_mac) {
           "objc/api/peerconnection/RTCCryptoOptions.h",
           "objc/api/peerconnection/RTCDataChannel.h",
           "objc/api/peerconnection/RTCDataChannelConfiguration.h",
+          "objc/api/peerconnection/RTCDataPacketCryptor.h",
           "objc/api/peerconnection/RTCDtmfSender.h",
           "objc/api/peerconnection/RTCFieldTrials.h",
+          "objc/api/peerconnection/RTCFrameCryptor.h",
+          "objc/api/peerconnection/RTCFrameCryptorKeyProvider.h",
           "objc/api/peerconnection/RTCIODevice.h",
           "objc/api/peerconnection/RTCIceCandidate.h",
           "objc/api/peerconnection/RTCIceCandidateErrorEvent.h",
@@ -1697,6 +1756,7 @@ if (is_ios || is_mac) {
           "objc/api/video_codec/RTCVideoEncoderVP9.h",
           "objc/api/video_frame_buffer/RTCNativeI420Buffer.h",
           "objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h",
+          "objc/base/RTCAudioRenderer.h",
           "objc/base/RTCCodecSpecificInfo.h",
           "objc/base/RTCEncodedImage.h",
           "objc/base/RTCI420Buffer.h",
@@ -1718,6 +1778,9 @@ if (is_ios || is_mac) {
           "objc/base/RTCVideoRenderer.h",
           "objc/base/RTCYUVPlanarBuffer.h",
           "objc/components/capturer/RTCCameraVideoCapturer.h",
+          "objc/components/capturer/RTCDesktopCapturer.h",
+          "objc/components/capturer/RTCDesktopMediaList.h",
+          "objc/components/capturer/RTCDesktopSource.h",
           "objc/components/capturer/RTCFileVideoCapturer.h",
           "objc/components/renderer/metal/RTCMTLNSVideoView.h",
           "objc/components/renderer/opengl/RTCVideoViewShading.h",
@@ -1741,7 +1804,9 @@ if (is_ios || is_mac) {
 
         deps = [
           ":base_objc",
+          ":darwin_privacy_info",
           ":default_codec_factory_objc",
+          ":desktopcapture_objc",
           ":metal_objc",
           ":native_api",
           ":native_video",