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}
67 lines
2.1 KiB
C++
67 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2015 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_PACKET_ROUTER_H_
|
|
#define WEBRTC_MODULES_PACING_PACKET_ROUTER_H_
|
|
|
|
#include <list>
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/thread_annotations.h"
|
|
#include "webrtc/base/thread_checker.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/modules/pacing/paced_sender.h"
|
|
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class RtpRtcp;
|
|
namespace rtcp {
|
|
class TransportFeedback;
|
|
} // namespace rtcp
|
|
|
|
// PacketRouter routes outgoing data to the correct sending RTP module, based
|
|
// on the simulcast layer in RTPVideoHeader.
|
|
class PacketRouter : public PacedSender::PacketSender,
|
|
public TransportSequenceNumberAllocator {
|
|
public:
|
|
PacketRouter();
|
|
virtual ~PacketRouter();
|
|
|
|
void AddRtpModule(RtpRtcp* rtp_module);
|
|
void RemoveRtpModule(RtpRtcp* rtp_module);
|
|
|
|
// Implements PacedSender::Callback.
|
|
bool TimeToSendPacket(uint32_t ssrc,
|
|
uint16_t sequence_number,
|
|
int64_t capture_timestamp,
|
|
bool retransmission) override;
|
|
|
|
size_t TimeToSendPadding(size_t bytes) override;
|
|
|
|
void SetTransportWideSequenceNumber(uint16_t sequence_number);
|
|
uint16_t AllocateSequenceNumber() override;
|
|
|
|
// Send transport feedback packet to send-side.
|
|
virtual bool SendFeedback(rtcp::TransportFeedback* packet);
|
|
|
|
private:
|
|
rtc::ThreadChecker pacer_thread_checker_;
|
|
rtc::CriticalSection modules_crit_;
|
|
std::list<RtpRtcp*> rtp_modules_ GUARDED_BY(modules_crit_);
|
|
|
|
volatile int transport_seq_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(PacketRouter);
|
|
};
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_PACING_PACKET_ROUTER_H_
|