diff options
| author | Erwin Jansen <jansene@google.com> | 2021-06-23 05:52:25 -0700 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2021-06-23 06:45:54 -0700 |
| commit | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (patch) | |
| tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /audio/channel_receive_frame_transformer_delegate.h | |
| parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
| parent | 49cb4599560d6005d5df0dadfca2db04b288f216 (diff) | |
| download | webrtc-16be34ae72cdb525c88c2b31b21b976f35fe36d8.tar.gz | |
Merge upstream-master and enable ARM64
We bring in the latest WebRTC changes and turn on arm.
This adds a new third party lib: crc32c, and includes a workaround
for handling a depencency issue for arm.
Bug: 191745658
Change-Id: Ic5be99911990ef14a5f733f19394032b20f85024
Diffstat (limited to 'audio/channel_receive_frame_transformer_delegate.h')
| -rw-r--r-- | audio/channel_receive_frame_transformer_delegate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/channel_receive_frame_transformer_delegate.h b/audio/channel_receive_frame_transformer_delegate.h index 0af748e37f..f59834d24e 100644 --- a/audio/channel_receive_frame_transformer_delegate.h +++ b/audio/channel_receive_frame_transformer_delegate.h @@ -32,7 +32,7 @@ class ChannelReceiveFrameTransformerDelegate : public TransformedFrameCallback { ChannelReceiveFrameTransformerDelegate( ReceiveFrameCallback receive_frame_callback, rtc::scoped_refptr<FrameTransformerInterface> frame_transformer, - rtc::Thread* channel_receive_thread); + TaskQueueBase* channel_receive_thread); // Registers |this| as callback for |frame_transformer_|, to get the // transformed frames. @@ -67,7 +67,7 @@ class ChannelReceiveFrameTransformerDelegate : public TransformedFrameCallback { RTC_GUARDED_BY(sequence_checker_); rtc::scoped_refptr<FrameTransformerInterface> frame_transformer_ RTC_GUARDED_BY(sequence_checker_); - rtc::Thread* channel_receive_thread_; + TaskQueueBase* const channel_receive_thread_; }; } // namespace webrtc |