Reason for revert: Intend to fix perf failures and reland. Original issue's description: > Revert of Don't hardcode MediaType::ANY in FakeNetworkPipe. (patchset #4 id:60001 of https://codereview.webrtc.org/2774463003/ ) > > Reason for revert: > Reverting since this seems to break multiple WebRTC Perf buildbots > > Original issue's description: > > Don't hardcode MediaType::ANY in FakeNetworkPipe. > > > > Instead let each test set the appropriate media type. This simplifies > > demuxing in Call and later in RtpTransportController. > > > > BUG=webrtc:7135 > > > > Review-Url: https://codereview.webrtc.org/2774463003 > > Cr-Commit-Position: refs/heads/master@{#17418} > > Committed:9c47b00e24> > TBR=stefan@webrtc.org,deadbeef@webrtc.org,solenberg@webrtc.org,pbos@webrtc.org,sprang@webrtc.org,nisse@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7135 > > Review-Url: https://codereview.webrtc.org/2784543002 > Cr-Commit-Position: refs/heads/master@{#17427} > Committed:3a3bd50610TBR=stefan@webrtc.org,deadbeef@webrtc.org,solenberg@webrtc.org,pbos@webrtc.org,sprang@webrtc.org,lliuu@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7135 Review-Url: https://codereview.webrtc.org/2783853002 Cr-Commit-Position: refs/heads/master@{#17459}
77 lines
2.2 KiB
C++
77 lines
2.2 KiB
C++
/*
|
|
* Copyright (c) 2013 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 WEBRTC_TEST_DIRECT_TRANSPORT_H_
|
|
#define WEBRTC_TEST_DIRECT_TRANSPORT_H_
|
|
|
|
#include <assert.h>
|
|
|
|
#include <deque>
|
|
|
|
#include "webrtc/api/call/transport.h"
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/event.h"
|
|
#include "webrtc/base/platform_thread.h"
|
|
#include "webrtc/call/call.h"
|
|
#include "webrtc/test/fake_network_pipe.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class Clock;
|
|
class PacketReceiver;
|
|
|
|
namespace test {
|
|
|
|
class DirectTransport : public Transport {
|
|
public:
|
|
DirectTransport(Call* send_call, MediaType media_type);
|
|
DirectTransport(const FakeNetworkPipe::Config& config, Call* send_call,
|
|
MediaType media_type);
|
|
// These deprecated variants always use MediaType::VIDEO.
|
|
RTC_DEPRECATED explicit DirectTransport(Call* send_call)
|
|
: DirectTransport(send_call, MediaType::VIDEO) {}
|
|
|
|
RTC_DEPRECATED DirectTransport(const FakeNetworkPipe::Config& config,
|
|
Call* send_call)
|
|
: DirectTransport(config, send_call, MediaType::VIDEO) {}
|
|
|
|
~DirectTransport();
|
|
|
|
void SetConfig(const FakeNetworkPipe::Config& config);
|
|
|
|
virtual void StopSending();
|
|
// TODO(holmer): Look into moving this to the constructor.
|
|
virtual void SetReceiver(PacketReceiver* receiver);
|
|
|
|
bool SendRtp(const uint8_t* data,
|
|
size_t length,
|
|
const PacketOptions& options) override;
|
|
bool SendRtcp(const uint8_t* data, size_t length) override;
|
|
|
|
int GetAverageDelayMs();
|
|
|
|
private:
|
|
static bool NetworkProcess(void* transport);
|
|
bool SendPackets();
|
|
|
|
rtc::CriticalSection lock_;
|
|
Call* const send_call_;
|
|
rtc::Event packet_event_;
|
|
rtc::PlatformThread thread_;
|
|
Clock* const clock_;
|
|
|
|
bool shutting_down_;
|
|
|
|
FakeNetworkPipe fake_network_;
|
|
};
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_TEST_DIRECT_TRANSPORT_H_
|