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

Revert "Extend TransportSequenceNumber RTP header extension"

Browse Source 
This reverts commit 28c7362bc485d22bdc8c744bc725022780187a96.

Reason for revert: It breaks Linux64 Release (libfuzzer):
https://logs.chromium.org/logs/webrtc/buildbucket/cr-buildbucket.appspot.com/8921003137877469920/+/steps/compile/0/stdout

Original change's description:
> Extend TransportSequenceNumber RTP header extension
> 
> Extend TransportSequenceNumber RTP header extension to support
> feedback on sender request.
> 
> Bug: webrtc:10262
> Change-Id: Ibc1cf18162d15cd102e951c9dc697d8ea536ebb6
> Reviewed-on: https://webrtc-review.googlesource.com/c/123233
> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> Reviewed-by: Alex Loiko <aleloi@webrtc.org>
> Commit-Queue: Johannes Kron <kron@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#26766}

TBR=danilchap@webrtc.org,aleloi@webrtc.org,kron@webrtc.org

Change-Id: Ie8a73f5fdffd99919ceaa1ae8911a1645f2077e9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10262
Reviewed-on: https://webrtc-review.googlesource.com/c/123522
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26767}
This commit is contained in:
Mirko Bonadei
2019-02-20 13:11:40 +00:00
committed by Commit Bot
parent 28c7362bc4
commit 109b5fb5f5
9 changed files with 10 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
modules/rtp_rtcp/source/rtp_packet_unittest.cc
View File

@ -827,62 +827,4 @@ TEST(RtpPacketTest, CreateAndParseColorSpaceExtensionWithoutHdrMetadata) {
TestCreateAndParseColorSpaceExtension(/*with_hdr_metadata=*/false);
}
TEST(RtpPacketTest, CreateAndParseTransportSequenceNumber) {
// Create a packet with transport sequence number extension populated.
RtpPacketToSend::ExtensionManager extensions;
constexpr int kExtensionId = 1;
extensions.Register<TransportSequenceNumber>(kExtensionId);
RtpPacketToSend send_packet(&extensions);
send_packet.SetPayloadType(kPayloadType);
send_packet.SetSequenceNumber(kSeqNum);
send_packet.SetTimestamp(kTimestamp);
send_packet.SetSsrc(kSsrc);
constexpr int kTransportSequenceNumber = 12345;
send_packet.SetExtension<TransportSequenceNumber>(kTransportSequenceNumber);
// Serialize the packet and then parse it again.
RtpPacketReceived receive_packet(&extensions);
EXPECT_TRUE(receive_packet.Parse(send_packet.Buffer()));
uint16_t received_transport_sequeunce_number;
EXPECT_TRUE(receive_packet.GetExtension<TransportSequenceNumber>(
&received_transport_sequeunce_number));
EXPECT_EQ(received_transport_sequeunce_number, kTransportSequenceNumber);
}
TEST(RtpPacketTest, CreateAndParseTransportSequenceNumberWithFeedbackRequest) {
// Create a packet with TransportSequenceNumberV2 extension populated.
RtpPacketToSend::ExtensionManager extensions;
constexpr int kExtensionId = 1;
extensions.Register<TransportSequenceNumberV2>(kExtensionId);
RtpPacketToSend send_packet(&extensions);
send_packet.SetPayloadType(kPayloadType);
send_packet.SetSequenceNumber(kSeqNum);
send_packet.SetTimestamp(kTimestamp);
send_packet.SetSsrc(kSsrc);
constexpr int kTransportSequenceNumber = 12345;
constexpr absl::optional<FeedbackRequest> kFeedbackRequest =
FeedbackRequest{/*include_timestamps=*/true, /*sequence_count=*/3};
send_packet.SetExtension<TransportSequenceNumberV2>(kTransportSequenceNumber,
kFeedbackRequest);
// Serialize the packet and then parse it again.
RtpPacketReceived receive_packet(&extensions);
EXPECT_TRUE(receive_packet.Parse(send_packet.Buffer()));
// Parse transport sequence number and feedback request.
uint16_t received_transport_sequeunce_number;
absl::optional<FeedbackRequest> received_feedback_request;
EXPECT_TRUE(receive_packet.GetExtension<TransportSequenceNumberV2>(
&received_transport_sequeunce_number, &received_feedback_request));
EXPECT_EQ(received_transport_sequeunce_number, kTransportSequenceNumber);
ASSERT_TRUE(received_feedback_request);
EXPECT_EQ(received_feedback_request->include_timestamps,
kFeedbackRequest->include_timestamps);
EXPECT_EQ(received_feedback_request->sequence_count,
kFeedbackRequest->sequence_count);
}
} // namespace webrtc