commit 109b5fb5f5b2f46e1798c91c4a024ce26f57f0b0
author Mirko Bonadei <mbonadei@webrtc.org> Wed Feb 20 13:11:40 2019 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Feb 20 13:11:54 2019 +0000
tree e12c582e0f59d3915a4156862dfaaefedbc41a8d
parent 28c7362bc485d22bdc8c744bc725022780187a96

Revert "Extend TransportSequenceNumber RTP header extension"

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}

modules/rtp_rtcp/source/rtp_header_extensions.h

diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h
index e37388a..9f4a28b 100644
--- a/modules/rtp_rtcp/source/rtp_header_extensions.h
+++ b/modules/rtp_rtcp/source/rtp_header_extensions.h
@@ -81,38 +81,9 @@
   static constexpr const char kUri[] =
       "http://www.ietf.org/id/"
       "draft-holmer-rmcat-transport-wide-cc-extensions-01";
-  static bool Parse(rtc::ArrayView<const uint8_t> data,
-                    uint16_t* transport_sequence_number);
-  static size_t ValueSize(uint16_t /*transport_sequence_number*/) {
-    return kValueSizeBytes;
-  }
-  static bool Write(rtc::ArrayView<uint8_t> data,
-                    uint16_t transport_sequence_number);
-};
-
-class TransportSequenceNumberV2 {
- public:
-  static constexpr RTPExtensionType kId =
-      kRtpExtensionTransportSequenceNumber02;
-  static constexpr uint8_t kValueSizeBytesWithFeedbackRequest = 4;
-  static constexpr const char kUri[] =
-      "http://www.ietf.org/id/"
-      "draft-holmer-rmcat-transport-wide-cc-extensions-02";
-  static bool Parse(rtc::ArrayView<const uint8_t> data,
-                    uint16_t* transport_sequence_number,
-                    absl::optional<FeedbackRequest>* feedback_request);
-  static size_t ValueSize(
-      uint16_t /*transport_sequence_number*/,
-      const absl::optional<FeedbackRequest>& feedback_request) {
-    return feedback_request ? kValueSizeBytesWithFeedbackRequest
-                            : TransportSequenceNumber::kValueSizeBytes;
-  }
-  static bool Write(rtc::ArrayView<uint8_t> data,
-                    uint16_t transport_sequence_number,
-                    const absl::optional<FeedbackRequest>& feedback_request);
-
- private:
-  static constexpr uint16_t kIncludeTimestampsBit = 1 << 15;
+  static bool Parse(rtc::ArrayView<const uint8_t> data, uint16_t* value);
+  static size_t ValueSize(uint16_t value) { return kValueSizeBytes; }
+  static bool Write(rtc::ArrayView<uint8_t> data, uint16_t value);
 };
 
 class VideoOrientation {