6ba58d67ce
Reason for revert: dependent project adjusted Original issue's description: > Revert of Simplify and extend RtpHeaderExtensionMap (patchset #12 id:260001 of https://codereview.webrtc.org/2452293004/ ) > > Reason for revert: > breaks downstream project > > Original issue's description: > > Simplify and extend RtpHeaderExtensionMap > > Add register functions for various codepaths. > > Add initialize-list constructor to create usable const RtpHeaderExtensionMap > > Optimize implementation for GetId/GetType. > > > > BUG=webrtc:1994 > > > > Committed: https://crrev.com/d1d26fbeb37a69471a34004c6ac2d3fafde5d404 > > Cr-Commit-Position: refs/heads/master@{#14986} > > TBR=sprang@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:1994 > > Committed: https://crrev.com/bc38b4d450a80bf45efbe5b0a452e0374cdae1e6 > Cr-Commit-Position: refs/heads/master@{#14988} TBR=sprang@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:1994 Review-Url: https://codereview.webrtc.org/2492443002 Cr-Commit-Position: refs/heads/master@{#15000}
103 lines
3.3 KiB
C++
103 lines
3.3 KiB
C++
/*
|
|
* Copyright (c) 2012 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_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSION_H_
|
|
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSION_H_
|
|
|
|
#include <initializer_list>
|
|
#include <string>
|
|
|
|
#include "webrtc/base/basictypes.h"
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/config.h"
|
|
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
|
|
namespace webrtc {
|
|
|
|
const uint16_t kRtpOneByteHeaderExtensionId = 0xBEDE;
|
|
|
|
const size_t kRtpOneByteHeaderLength = 4;
|
|
const size_t kTransmissionTimeOffsetLength = 4;
|
|
const size_t kAudioLevelLength = 2;
|
|
const size_t kAbsoluteSendTimeLength = 4;
|
|
const size_t kVideoRotationLength = 2;
|
|
const size_t kTransportSequenceNumberLength = 3;
|
|
const size_t kPlayoutDelayLength = 4;
|
|
|
|
// Playout delay in milliseconds. A playout delay limit (min or max)
|
|
// has 12 bits allocated. This allows a range of 0-4095 values which translates
|
|
// to a range of 0-40950 in milliseconds.
|
|
const int kPlayoutDelayGranularityMs = 10;
|
|
// Maximum playout delay value in milliseconds.
|
|
const int kPlayoutDelayMaxMs = 40950;
|
|
|
|
class RtpHeaderExtensionMap {
|
|
public:
|
|
static constexpr RTPExtensionType kInvalidType = kRtpExtensionNone;
|
|
static constexpr uint8_t kInvalidId = 0;
|
|
|
|
RtpHeaderExtensionMap();
|
|
RtpHeaderExtensionMap(std::initializer_list<RtpExtension>);
|
|
|
|
template <typename Extension>
|
|
bool Register(uint8_t id) {
|
|
return Register(id, Extension::kId, Extension::kValueSizeBytes,
|
|
Extension::kUri);
|
|
}
|
|
bool RegisterByType(uint8_t id, RTPExtensionType type);
|
|
bool RegisterByUri(uint8_t id, const std::string& uri);
|
|
|
|
bool IsRegistered(RTPExtensionType type) const {
|
|
return GetId(type) != kInvalidId;
|
|
}
|
|
// Return kInvalidType if not found.
|
|
RTPExtensionType GetType(uint8_t id) const {
|
|
RTC_DCHECK_GE(id, kMinId);
|
|
RTC_DCHECK_LE(id, kMaxId);
|
|
return types_[id];
|
|
}
|
|
// Return kInvalidId if not found.
|
|
uint8_t GetId(RTPExtensionType type) const {
|
|
RTC_DCHECK_GT(type, kRtpExtensionNone);
|
|
RTC_DCHECK_LT(type, kRtpExtensionNumberOfExtensions);
|
|
return ids_[type];
|
|
}
|
|
|
|
size_t GetTotalLengthInBytes() const;
|
|
|
|
// TODO(danilchap): Remove use of the functions below.
|
|
void Erase() { *this = RtpHeaderExtensionMap(); }
|
|
int32_t Register(RTPExtensionType type, uint8_t id) {
|
|
return RegisterByType(id, type) ? 0 : -1;
|
|
}
|
|
int32_t Deregister(RTPExtensionType type);
|
|
int32_t GetType(uint8_t id, RTPExtensionType* type) const {
|
|
*type = GetType(id);
|
|
return *type == kInvalidType ? -1 : 0;
|
|
}
|
|
void GetCopy(RtpHeaderExtensionMap* copy) const { *copy = *this; }
|
|
|
|
private:
|
|
static constexpr uint8_t kMinId = 1;
|
|
static constexpr uint8_t kMaxId = 14;
|
|
bool Register(uint8_t id,
|
|
RTPExtensionType type,
|
|
size_t value_size,
|
|
const char* uri);
|
|
|
|
size_t total_values_size_bytes_ = 0;
|
|
RTPExtensionType types_[kMaxId + 1];
|
|
uint8_t ids_[kRtpExtensionNumberOfExtensions];
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSION_H_
|
|
|