Fix set frame transformer (#125)

Author: hiroshihorie

audio/channel_receive.cc

@@ -917,24 +917,29 @@ void ChannelReceive::SetAssociatedSendChannel(
 void ChannelReceive::SetDepacketizerToDecoderFrameTransformer(
     rtc::scoped_refptr<webrtc::FrameTransformerInterface> frame_transformer) {
   RTC_DCHECK_RUN_ON(&worker_thread_checker_);
-  if (!frame_transformer) {
-    RTC_DCHECK_NOTREACHED() << "Not setting the transformer?";
-    return;
-  }
-  if(frame_transformer_delegate_) {
+
+  // Check if a reset is needed
+  if (frame_transformer_delegate_ &&
+      frame_transformer_delegate_->FrameTransformer() != frame_transformer) {
     frame_transformer_delegate_->Reset();
-  }
-  if (frame_transformer_delegate_) {
-    // Depending on when the channel is created, the transformer might be set
-    // twice. Don't replace the delegate if it was already initialized.
-    // TODO(crbug.com/webrtc/15674): Prevent multiple calls during
-    // reconfiguration.
-    RTC_CHECK_EQ(frame_transformer_delegate_->FrameTransformer(),
-                 frame_transformer);
-    return;
+    frame_transformer_delegate_ = nullptr;
+    RTC_DLOG(LS_INFO) << "Frame transformer delegate has been reset.";
   }
 
-  InitFrameTransformerDelegate(std::move(frame_transformer));
+  // Initialize the delegate if needed
+  if (frame_transformer_delegate_ &&
+      frame_transformer_delegate_->FrameTransformer() == frame_transformer) {
+    RTC_DLOG(LS_INFO)
+        << "Frame transformer is already set to the provided transformer.";
+  } else {
+    if (!frame_transformer) {
+      RTC_DCHECK_NOTREACHED() << "Attempted to set a null frame transformer.";
+    } else {
+      RTC_DLOG(LS_INFO) << "Initializing frame transformer delegate with the "
+                           "new frame transformer.";
+      InitFrameTransformerDelegate(std::move(frame_transformer));
+    }
+  }
 }
 
 void ChannelReceive::SetFrameDecryptor(

sdk/objc/api/peerconnection/RTCFrameCryptor.mm

@@ -127,21 +127,27 @@ - (nullable instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory
     rtc::scoped_refptr<webrtc::MediaStreamTrackInterface> nativeTrack = nativeRtpSender->track();
     if (nativeTrack == nullptr) return nil;
 
-    _observer = rtc::make_ref_counted<webrtc::RTCFrameCryptorDelegateAdapter>(self);
-    _participantId = participantId;
-
     webrtc::FrameCryptorTransformer::MediaType mediaType =
         nativeTrack->kind() == "audio" ? webrtc::FrameCryptorTransformer::MediaType::kAudioFrame
                                        : webrtc::FrameCryptorTransformer::MediaType::kVideoFrame;
 
+    os_unfair_lock_lock(&_lock);
+    _observer = rtc::make_ref_counted<webrtc::RTCFrameCryptorDelegateAdapter>(self);
+    _participantId = participantId;
+
     _frame_crypto_transformer =
         rtc::scoped_refptr<webrtc::FrameCryptorTransformer>(new webrtc::FrameCryptorTransformer(
             factory.signalingThread, [participantId stdString], mediaType,
             [self algorithmFromEnum:algorithm], keyProvider.nativeKeyProvider));
 
-    nativeRtpSender->SetEncoderToPacketizerFrameTransformer(_frame_crypto_transformer);
+    factory.workerThread->BlockingCall([self, nativeRtpSender] {
+      // Must be called on Worker thread
+      nativeRtpSender->SetEncoderToPacketizerFrameTransformer(_frame_crypto_transformer);
+    });
+
     _frame_crypto_transformer->SetEnabled(false);
     _frame_crypto_transformer->RegisterFrameCryptorTransformerObserver(_observer);
+    os_unfair_lock_unlock(&_lock);
   }
 
   return self;
@@ -161,21 +167,27 @@ - (nullable instancetype)initWithFactory:(RTC_OBJC_TYPE(RTCPeerConnectionFactory
     rtc::scoped_refptr<webrtc::MediaStreamTrackInterface> nativeTrack = nativeRtpReceiver->track();
     if (nativeTrack == nullptr) return nil;
 
-    _observer = rtc::make_ref_counted<webrtc::RTCFrameCryptorDelegateAdapter>(self);
-    _participantId = participantId;
-
     webrtc::FrameCryptorTransformer::MediaType mediaType =
         nativeTrack->kind() == "audio" ? webrtc::FrameCryptorTransformer::MediaType::kAudioFrame
                                        : webrtc::FrameCryptorTransformer::MediaType::kVideoFrame;
 
+    os_unfair_lock_lock(&_lock);
+    _observer = rtc::make_ref_counted<webrtc::RTCFrameCryptorDelegateAdapter>(self);
+    _participantId = participantId;
+
     _frame_crypto_transformer =
         rtc::scoped_refptr<webrtc::FrameCryptorTransformer>(new webrtc::FrameCryptorTransformer(
             factory.signalingThread, [participantId stdString], mediaType,
             [self algorithmFromEnum:algorithm], keyProvider.nativeKeyProvider));
 
-    nativeRtpReceiver->SetDepacketizerToDecoderFrameTransformer(_frame_crypto_transformer);
+    factory.workerThread->BlockingCall([self, nativeRtpReceiver] {
+      // Must be called on Worker thread
+      nativeRtpReceiver->SetDepacketizerToDecoderFrameTransformer(_frame_crypto_transformer);
+    });
+
     _frame_crypto_transformer->SetEnabled(false);
     _frame_crypto_transformer->RegisterFrameCryptorTransformerObserver(_observer);
+    os_unfair_lock_unlock(&_lock);
   }
 
   return self;