ec81bcd519
This reverts commit e30c27205148b34ba421184efe65f6a0780b436d (https://codereview.webrtc.org/1958053002/) Original reverted cl is in patch set #1. Changes in following patch sets. The cl now also make sure SendPacer starts with the configured bitrate provided in a call to CongestionController::SetBweBitrates)() It turns out that the failing tests in 609816 is due to a bug in the current code that runs the proper at 300kbit regardless of configured start bitrate. Original cl description: Remove SendPacer from ViEEncoder This CL moves the logic where the ViEEncoder pause if the pacer is full to the BitrateController. If the queue is full, the controller reports a bitrate of zero to Call (and BitrateAllocator) BUG=chromium:609816, webrtc:5687 TBR=mflodman@webrtc.org NOTRY=True // Due to bug in android_x86 cq builder.... Review-Url: https://codereview.webrtc.org/1958113003 Cr-Commit-Position: refs/heads/master@{#12688}
41 lines
1.4 KiB
C++
41 lines
1.4 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_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_
|
|
#define WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "testing/gmock/include/gmock/gmock.h"
|
|
|
|
#include "webrtc/modules/pacing/paced_sender.h"
|
|
#include "webrtc/system_wrappers/include/clock.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class MockPacedSender : public PacedSender {
|
|
public:
|
|
MockPacedSender() : PacedSender(Clock::GetRealTimeClock(), nullptr) {}
|
|
MOCK_METHOD6(SendPacket, bool(Priority priority,
|
|
uint32_t ssrc,
|
|
uint16_t sequence_number,
|
|
int64_t capture_time_ms,
|
|
size_t bytes,
|
|
bool retransmission));
|
|
MOCK_METHOD1(SetEstimatedBitrate, void(uint32_t));
|
|
MOCK_CONST_METHOD0(QueueInMs, int64_t());
|
|
MOCK_CONST_METHOD0(QueueInPackets, int());
|
|
MOCK_CONST_METHOD0(ExpectedQueueTimeMs, int64_t());
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_PACING_MOCK_MOCK_PACED_SENDER_H_
|