zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moves conversion to ReceivedPacket from RtpPacketReceived to Call.

Browse Source 
This moves the conversion from RtpPacketReceived to ReceivedPacket to
Call rather than RtpTransportController. This prepares for reusing the
struct for receive side network state estimation.

Bug: webrtc:10742
Change-Id: I9581438bc912ef4bb635a5d9a6dea488cf871d48
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/141872
Reviewed-by: Jonas Olsson <jonasolsson@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28284}
This commit is contained in:
Sebastian Jansson
2019-06-13 17:48:53 +02:00
committed by Commit Bot
parent 98cbb22911
commit 607a6f1c55
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
call/call.cc
View File

@ -1497,7 +1497,10 @@ void Call::NotifyBweOfReceivedPacket(const RtpPacketReceived& packet,
RTPHeader header; RTPHeader header;
packet.GetHeader(&header); packet.GetHeader(&header);
transport_send_ptr_->OnReceivedPacket(packet); ReceivedPacket packet_msg;
packet_msg.size = DataSize::bytes(packet.payload_size());
packet_msg.receive_time = Timestamp::ms(packet.arrival_time_ms());
transport_send_ptr_->OnReceivedPacket(packet_msg);
if (!use_send_side_bwe && header.extension.hasTransportSequenceNumber) { if (!use_send_side_bwe && header.extension.hasTransportSequenceNumber) {
// Inconsistent configuration of send side BWE. Do nothing. // Inconsistent configuration of send side BWE. Do nothing.

5
call/rtp_transport_controller_send.cc
View File

@ -327,10 +327,7 @@ void RtpTransportControllerSend::OnSentPacket(
} }
void RtpTransportControllerSend::OnReceivedPacket( void RtpTransportControllerSend::OnReceivedPacket(
const RtpPacketReceived& received_packet) { const ReceivedPacket& packet_msg) {
ReceivedPacket packet_msg;
packet_msg.size = DataSize::bytes(received_packet.payload_size());
packet_msg.receive_time = Timestamp::ms(received_packet.arrival_time_ms());
task_queue_.PostTask([this, packet_msg]() { task_queue_.PostTask([this, packet_msg]() {
RTC_DCHECK_RUN_ON(&task_queue_); RTC_DCHECK_RUN_ON(&task_queue_);
if (controller_) if (controller_)

2
call/rtp_transport_controller_send.h
View File

@ -96,7 +96,7 @@ class RtpTransportControllerSend final
int64_t GetFirstPacketTimeMs() const override; int64_t GetFirstPacketTimeMs() const override;
void EnablePeriodicAlrProbing(bool enable) override; void EnablePeriodicAlrProbing(bool enable) override;
void OnSentPacket(const rtc::SentPacket& sent_packet) override; void OnSentPacket(const rtc::SentPacket& sent_packet) override;
void OnReceivedPacket(const RtpPacketReceived& received_packet) override; void OnReceivedPacket(const ReceivedPacket& packet_msg) override;
void SetSdpBitrateParameters(const BitrateConstraints& constraints) override; void SetSdpBitrateParameters(const BitrateConstraints& constraints) override;
void SetClientBitratePreferences(const BitrateSettings& preferences) override; void SetClientBitratePreferences(const BitrateSettings& preferences) override;

2
call/rtp_transport_controller_send_interface.h
View File

@ -149,7 +149,7 @@ class RtpTransportControllerSendInterface {
virtual int64_t GetFirstPacketTimeMs() const = 0; virtual int64_t GetFirstPacketTimeMs() const = 0;
virtual void EnablePeriodicAlrProbing(bool enable) = 0; virtual void EnablePeriodicAlrProbing(bool enable) = 0;
virtual void OnSentPacket(const rtc::SentPacket& sent_packet) = 0; virtual void OnSentPacket(const rtc::SentPacket& sent_packet) = 0;
virtual void OnReceivedPacket(const RtpPacketReceived& received_packet) = 0; virtual void OnReceivedPacket(const ReceivedPacket& received_packet) = 0;
virtual void SetSdpBitrateParameters( virtual void SetSdpBitrateParameters(
const BitrateConstraints& constraints) = 0; const BitrateConstraints& constraints) = 0;

2
call/test/mock_rtp_transport_controller_send.h
View File

@ -65,7 +65,7 @@ class MockRtpTransportControllerSend
MOCK_METHOD1(SetSdpBitrateParameters, void(const BitrateConstraints&)); MOCK_METHOD1(SetSdpBitrateParameters, void(const BitrateConstraints&));
MOCK_METHOD1(SetClientBitratePreferences, void(const BitrateSettings&)); MOCK_METHOD1(SetClientBitratePreferences, void(const BitrateSettings&));
MOCK_METHOD1(OnTransportOverheadChanged, void(size_t)); MOCK_METHOD1(OnTransportOverheadChanged, void(size_t));
MOCK_METHOD1(OnReceivedPacket, void(const RtpPacketReceived&)); MOCK_METHOD1(OnReceivedPacket, void(const ReceivedPacket&));
}; };
} // namespace webrtc } // namespace webrtc
#endif // CALL_TEST_MOCK_RTP_TRANSPORT_CONTROLLER_SEND_H_ #endif // CALL_TEST_MOCK_RTP_TRANSPORT_CONTROLLER_SEND_H_