6589def397
This makes SetChannel() consistently make 2 invokes instead of a multiple of senders+receivers (previous minimum was 4 but could be larger). * Stop() doesn't hop to the worker thread. * SetMediaChannel(), an already-required step on the worker thread for senders and *sometimes* for receivers[1], is now consistently required for both. This simplifies transceiver teardown and enables the next bullet. * Transceiver stops all senders and receivers in one go rather than ping ponging between threads. [1] When not required, it was done implicitly inside of Stop(). See changes in `RtpTransceiver::SetChannel` Bug: webrtc:13540 Change-Id: Ied61636c8ef09d782bf519524fff2a31e15219a8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/249797 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#36057}
81 lines
3.0 KiB
C++
81 lines
3.0 KiB
C++
/*
|
|
* Copyright 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_
|
|
#define PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "pc/rtp_receiver.h"
|
|
#include "test/gmock.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// The definition of MockRtpReceiver is copied in to avoid multiple inheritance.
|
|
class MockRtpReceiverInternal : public RtpReceiverInternal {
|
|
public:
|
|
// RtpReceiverInterface methods.
|
|
MOCK_METHOD(rtc::scoped_refptr<MediaStreamTrackInterface>,
|
|
track,
|
|
(),
|
|
(const, override));
|
|
MOCK_METHOD(rtc::scoped_refptr<DtlsTransportInterface>,
|
|
dtls_transport,
|
|
(),
|
|
(const, override));
|
|
MOCK_METHOD(std::vector<std::string>, stream_ids, (), (const, override));
|
|
MOCK_METHOD(std::vector<rtc::scoped_refptr<MediaStreamInterface>>,
|
|
streams,
|
|
(),
|
|
(const, override));
|
|
MOCK_METHOD(cricket::MediaType, media_type, (), (const, override));
|
|
MOCK_METHOD(std::string, id, (), (const, override));
|
|
MOCK_METHOD(RtpParameters, GetParameters, (), (const, override));
|
|
MOCK_METHOD(void, SetObserver, (RtpReceiverObserverInterface*), (override));
|
|
MOCK_METHOD(void,
|
|
SetJitterBufferMinimumDelay,
|
|
(absl::optional<double>),
|
|
(override));
|
|
MOCK_METHOD(std::vector<RtpSource>, GetSources, (), (const, override));
|
|
MOCK_METHOD(void,
|
|
SetFrameDecryptor,
|
|
(rtc::scoped_refptr<FrameDecryptorInterface>),
|
|
(override));
|
|
MOCK_METHOD(rtc::scoped_refptr<FrameDecryptorInterface>,
|
|
GetFrameDecryptor,
|
|
(),
|
|
(const, override));
|
|
|
|
// RtpReceiverInternal methods.
|
|
MOCK_METHOD(void, Stop, (), (override));
|
|
MOCK_METHOD(void, SetSourceEnded, (), (override));
|
|
MOCK_METHOD(void, SetMediaChannel, (cricket::MediaChannel*), (override));
|
|
MOCK_METHOD(void, SetupMediaChannel, (uint32_t), (override));
|
|
MOCK_METHOD(void, SetupUnsignaledMediaChannel, (), (override));
|
|
MOCK_METHOD(uint32_t, ssrc, (), (const, override));
|
|
MOCK_METHOD(void, NotifyFirstPacketReceived, (), (override));
|
|
MOCK_METHOD(void, set_stream_ids, (std::vector<std::string>), (override));
|
|
MOCK_METHOD(void,
|
|
set_transport,
|
|
(rtc::scoped_refptr<DtlsTransportInterface>),
|
|
(override));
|
|
MOCK_METHOD(void,
|
|
SetStreams,
|
|
(const std::vector<rtc::scoped_refptr<MediaStreamInterface>>&),
|
|
(override));
|
|
MOCK_METHOD(int, AttachmentId, (), (const, override));
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_
|