a8ad11de82
Prior to this CL, calling RtpTransceiver::SetChannel() with null arguments would cause the receiver's track to end. This is wrong, because the channel can be nulled for other reasons than the transceiver being stopped/removed - such as when the transceiver is rolled back but still in use. Also, stopping a transceiver will end the track, so we should simply ensure to always stop the transceiver when that is needed. This CL makes sure that the transceiver is stopped or stopping in all appropriate places, allowing us to remove the ability to end the source for any other reason. A side-effect of this is that: - The track never ends prematurely, fixing https://crbug.com/1315611. - Removed transceivers are always stopped, fixing https://crbug.com/webrtc/14005. This CL fixes the issue of track being ended in the ontrack event when running https://jsfiddle.net/henbos/nxebusjm/. - We don't have WPT test coverage for this, so I'll add that separately. With SetSourceEnded() removed, some stopping/stop in response to rejecting locally SDP munged content had to be added in order not to regress the existing test coverage for this: *PeerConnectionInterfaceTest.RejectMediaContent/1 Bug: chromium:1315611, webrtc:14005. Change-Id: I21f30a1259e51324066dc84f72a72485b9e0fadc Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260180 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/main@{#36669}
80 lines
2.9 KiB
C++
80 lines
2.9 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, 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_
|