Skip to content

Commit a828846

Browse files
committed
Fix build for m104
1 parent 50a3302 commit a828846

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ - (instancetype)init {
136136
nativeAudioDecoderFactory:webrtc::CreateBuiltinAudioDecoderFactory()
137137
nativeVideoEncoderFactory:std::move(native_encoder_factory)
138138
nativeVideoDecoderFactory:std::move(native_decoder_factory)
139-
audioDeviceModule:[self audioDeviceModule:bypassVoiceProcessing]
139+
audioDeviceModule:[self audioDeviceModule:bypassVoiceProcessing].get()
140140
audioProcessingModule:nullptr];
141141
#endif
142142
}

video/frame_buffer_proxy.cc

+16
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ class FrameBuffer2Proxy : public FrameBufferProxy {
6565
});
6666
}
6767

68+
void StartOnWorker() override {
69+
RTC_DCHECK_RUN_ON(&worker_sequence_checker_);
70+
decode_queue_->PostTask([this] {
71+
frame_buffer_.Start();
72+
decode_safety_->SetAlive();
73+
});
74+
}
75+
6876
void SetProtectionMode(VCMVideoProtection protection_mode) override {
6977
RTC_DCHECK_RUN_ON(&worker_sequence_checker_);
7078
frame_buffer_.SetProtectionMode(kProtectionNackFEC);
@@ -234,6 +242,14 @@ class FrameBuffer3Proxy : public FrameBufferProxy {
234242
});
235243
}
236244

245+
void StartOnWorker() override {
246+
RTC_DCHECK_RUN_ON(&worker_sequence_checker_);
247+
decode_queue_->PostTask([this] {
248+
RTC_DCHECK_RUN_ON(decode_queue_);
249+
decode_safety_->SetAlive();
250+
});
251+
}
252+
237253
void SetProtectionMode(VCMVideoProtection protection_mode) override {
238254
RTC_DCHECK_RUN_ON(&worker_sequence_checker_);
239255
protection_mode_ = kProtectionNackFEC;

video/frame_buffer_proxy.h

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class FrameBufferProxy {
5454

5555
// Run on the worker thread.
5656
virtual void StopOnWorker() = 0;
57+
virtual void StartOnWorker() = 0;
5758
virtual void SetProtectionMode(VCMVideoProtection protection_mode) = 0;
5859
virtual void Clear() = 0;
5960
virtual absl::optional<int64_t> InsertFrame(

video/video_receive_stream2.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ void VideoReceiveStream2::Start() {
361361
return;
362362
}
363363

364-
frame_buffer_->Start();
364+
frame_buffer_->StartOnWorker();
365365
const bool protected_by_fec = config_.rtp.protected_by_flexfec ||
366366
rtp_video_stream_receiver_.IsUlpfecEnabled();
367367

0 commit comments

Comments
 (0)