Fix build for m104

webrtc-sdk · Jul 21, 2022 · a828846 · a828846
1 parent 50a3302
commit a828846
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
@@ -136,7 +136,7 @@ - (instancetype)init {
                        nativeAudioDecoderFactory:webrtc::CreateBuiltinAudioDecoderFactory()
                        nativeVideoEncoderFactory:std::move(native_encoder_factory)
                        nativeVideoDecoderFactory:std::move(native_decoder_factory)
-                               audioDeviceModule:[self audioDeviceModule:bypassVoiceProcessing]
+                               audioDeviceModule:[self audioDeviceModule:bypassVoiceProcessing].get()
                            audioProcessingModule:nullptr];
 #endif
 }

diff --git a/video/frame_buffer_proxy.cc b/video/frame_buffer_proxy.cc
@@ -65,6 +65,14 @@ class FrameBuffer2Proxy : public FrameBufferProxy {
     });
   }
 
+  void StartOnWorker() override {
+    RTC_DCHECK_RUN_ON(&worker_sequence_checker_);
+    decode_queue_->PostTask([this] {
+      frame_buffer_.Start();
+      decode_safety_->SetAlive();
+    });
+  }
+
   void SetProtectionMode(VCMVideoProtection protection_mode) override {
     RTC_DCHECK_RUN_ON(&worker_sequence_checker_);
     frame_buffer_.SetProtectionMode(kProtectionNackFEC);
@@ -234,6 +242,14 @@ class FrameBuffer3Proxy : public FrameBufferProxy {
     });
   }
 
+  void StartOnWorker() override {
+    RTC_DCHECK_RUN_ON(&worker_sequence_checker_);
+    decode_queue_->PostTask([this] {
+      RTC_DCHECK_RUN_ON(decode_queue_);
+      decode_safety_->SetAlive();
+    });
+  }
+
   void SetProtectionMode(VCMVideoProtection protection_mode) override {
     RTC_DCHECK_RUN_ON(&worker_sequence_checker_);
     protection_mode_ = kProtectionNackFEC;

diff --git a/video/frame_buffer_proxy.h b/video/frame_buffer_proxy.h
@@ -54,6 +54,7 @@ class FrameBufferProxy {
 
   // Run on the worker thread.
   virtual void StopOnWorker() = 0;
+  virtual void StartOnWorker() = 0;
   virtual void SetProtectionMode(VCMVideoProtection protection_mode) = 0;
   virtual void Clear() = 0;
   virtual absl::optional<int64_t> InsertFrame(

diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc
@@ -361,7 +361,7 @@ void VideoReceiveStream2::Start() {
     return;
   }
 
-  frame_buffer_->Start();
+  frame_buffer_->StartOnWorker();
   const bool protected_by_fec = config_.rtp.protected_by_flexfec ||
                                 rtp_video_stream_receiver_.IsUlpfecEnabled();