d0acbd8645
This reverts commit c1ad1ff178f0d0dfcde42843c51ae703005aaca1. Reason for revert: This blocks the worker thread for a longer contiguous period of time which can lead to delays in processing packets. And due to other recent changes, the need to speed up SetLocalDescription/SetRemoteDescription is reduced. Still plan to reland some of the changes from the CL, just not the part that groups the Invokes. Original change's description: > Do all BaseChannel operations within a single Thread::Invoke. > > Instead of doing a separate Invoke for each channel, this CL first > gathers a list of operations to be performed on the signaling thread, > then does a single Invoke on the worker thread (and nested Invoke > on the network thread) to update all channels at once. > > This includes the methods: > * Enable > * SetLocalContent/SetRemoteContent > * RegisterRtpDemuxerSink > * UpdateRtpHeaderExtensionMap > > Also, removed the need for a network thread Invoke in > IsReadyToSendMedia_w by moving ownership of was_ever_writable_ to the > worker thread. > > Bug: webrtc:12266 > Change-Id: I31e61fe0758aeb053b09db84f234deb58dfb3d05 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194181 > Commit-Queue: Taylor <deadbeef@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32817} TBR=deadbeef@webrtc.org,hta@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:12266 Change-Id: I40ec519a614dc740133219f775b5638a488529b1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/203860 Reviewed-by: Taylor <deadbeef@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Taylor <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33111}
71 lines
2.3 KiB
C++
71 lines
2.3 KiB
C++
/*
|
|
* Copyright 2018 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_CHANNEL_INTERFACE_H_
|
|
#define PC_TEST_MOCK_CHANNEL_INTERFACE_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "pc/channel_interface.h"
|
|
#include "test/gmock.h"
|
|
|
|
namespace cricket {
|
|
|
|
// Mock class for BaseChannel.
|
|
// Use this class in unit tests to avoid dependecy on a specific
|
|
// implementation of BaseChannel.
|
|
class MockChannelInterface : public cricket::ChannelInterface {
|
|
public:
|
|
MOCK_METHOD(cricket::MediaType, media_type, (), (const, override));
|
|
MOCK_METHOD(MediaChannel*, media_channel, (), (const, override));
|
|
MOCK_METHOD(const std::string&, transport_name, (), (const, override));
|
|
MOCK_METHOD(const std::string&, content_name, (), (const, override));
|
|
MOCK_METHOD(bool, enabled, (), (const, override));
|
|
MOCK_METHOD(bool, Enable, (bool), (override));
|
|
MOCK_METHOD(sigslot::signal1<ChannelInterface*>&,
|
|
SignalFirstPacketReceived,
|
|
(),
|
|
(override));
|
|
MOCK_METHOD(bool,
|
|
SetLocalContent,
|
|
(const cricket::MediaContentDescription*,
|
|
webrtc::SdpType,
|
|
std::string*),
|
|
(override));
|
|
MOCK_METHOD(bool,
|
|
SetRemoteContent,
|
|
(const cricket::MediaContentDescription*,
|
|
webrtc::SdpType,
|
|
std::string*),
|
|
(override));
|
|
MOCK_METHOD(bool, SetPayloadTypeDemuxingEnabled, (bool), (override));
|
|
MOCK_METHOD(const std::vector<StreamParams>&,
|
|
local_streams,
|
|
(),
|
|
(const, override));
|
|
MOCK_METHOD(const std::vector<StreamParams>&,
|
|
remote_streams,
|
|
(),
|
|
(const, override));
|
|
MOCK_METHOD(bool,
|
|
SetRtpTransport,
|
|
(webrtc::RtpTransportInternal*),
|
|
(override));
|
|
MOCK_METHOD(RtpHeaderExtensions,
|
|
GetNegotiatedRtpHeaderExtensions,
|
|
(),
|
|
(const));
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // PC_TEST_MOCK_CHANNEL_INTERFACE_H_
|