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}
151 lines
4.8 KiB
C++
151 lines
4.8 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.
|
|
*/
|
|
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
|
|
|
|
#include "webrtc/base/arraysize.h"
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/logging.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
|
|
|
|
namespace webrtc {
|
|
namespace {
|
|
|
|
using RtpUtility::Word32Align;
|
|
|
|
struct ExtensionInfo {
|
|
RTPExtensionType type;
|
|
size_t value_size;
|
|
const char* uri;
|
|
};
|
|
|
|
template <typename Extension>
|
|
constexpr ExtensionInfo CreateExtensionInfo() {
|
|
return {Extension::kId, Extension::kValueSizeBytes, Extension::kUri};
|
|
}
|
|
|
|
constexpr ExtensionInfo kExtensions[] = {
|
|
CreateExtensionInfo<TransmissionOffset>(),
|
|
CreateExtensionInfo<AudioLevel>(),
|
|
CreateExtensionInfo<AbsoluteSendTime>(),
|
|
CreateExtensionInfo<VideoOrientation>(),
|
|
CreateExtensionInfo<TransportSequenceNumber>(),
|
|
CreateExtensionInfo<PlayoutDelayLimits>(),
|
|
};
|
|
|
|
// Because of kRtpExtensionNone, NumberOfExtension is 1 bigger than the actual
|
|
// number of known extensions.
|
|
static_assert(arraysize(kExtensions) ==
|
|
static_cast<int>(kRtpExtensionNumberOfExtensions) - 1,
|
|
"kExtensions expect to list all known extensions");
|
|
|
|
size_t ValueSize(RTPExtensionType type) {
|
|
for (const ExtensionInfo& extension : kExtensions)
|
|
if (type == extension.type)
|
|
return extension.value_size;
|
|
|
|
RTC_NOTREACHED();
|
|
return 0;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
constexpr RTPExtensionType RtpHeaderExtensionMap::kInvalidType;
|
|
constexpr uint8_t RtpHeaderExtensionMap::kInvalidId;
|
|
constexpr uint8_t RtpHeaderExtensionMap::kMinId;
|
|
constexpr uint8_t RtpHeaderExtensionMap::kMaxId;
|
|
|
|
RtpHeaderExtensionMap::RtpHeaderExtensionMap() {
|
|
total_values_size_bytes_ = 0;
|
|
for (auto& type : types_)
|
|
type = kInvalidType;
|
|
for (auto& id : ids_)
|
|
id = kInvalidId;
|
|
}
|
|
|
|
RtpHeaderExtensionMap::RtpHeaderExtensionMap(
|
|
std::initializer_list<RtpExtension> extensions)
|
|
: RtpHeaderExtensionMap() {
|
|
for (const RtpExtension& extension : extensions)
|
|
RegisterByUri(extension.id, extension.uri);
|
|
}
|
|
|
|
bool RtpHeaderExtensionMap::RegisterByType(uint8_t id, RTPExtensionType type) {
|
|
for (const ExtensionInfo& extension : kExtensions)
|
|
if (type == extension.type)
|
|
return Register(id, extension.type, extension.value_size, extension.uri);
|
|
RTC_NOTREACHED();
|
|
return false;
|
|
}
|
|
|
|
bool RtpHeaderExtensionMap::RegisterByUri(uint8_t id, const std::string& uri) {
|
|
for (const ExtensionInfo& extension : kExtensions)
|
|
if (uri == extension.uri)
|
|
return Register(id, extension.type, extension.value_size, extension.uri);
|
|
LOG(LS_WARNING) << "Unknown extension uri:'" << uri
|
|
<< "', id: " << static_cast<int>(id) << '.';
|
|
return false;
|
|
}
|
|
|
|
size_t RtpHeaderExtensionMap::GetTotalLengthInBytes() const {
|
|
if (total_values_size_bytes_ == 0)
|
|
return 0;
|
|
return Word32Align(kRtpOneByteHeaderLength + total_values_size_bytes_);
|
|
}
|
|
|
|
int32_t RtpHeaderExtensionMap::Deregister(RTPExtensionType type) {
|
|
if (IsRegistered(type)) {
|
|
uint8_t id = GetId(type);
|
|
total_values_size_bytes_ -= (ValueSize(type) + 1);
|
|
types_[id] = kInvalidType;
|
|
ids_[type] = kInvalidId;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
bool RtpHeaderExtensionMap::Register(uint8_t id,
|
|
RTPExtensionType type,
|
|
size_t value_size,
|
|
const char* uri) {
|
|
RTC_DCHECK_GT(type, kRtpExtensionNone);
|
|
RTC_DCHECK_LT(type, kRtpExtensionNumberOfExtensions);
|
|
RTC_DCHECK_GE(value_size, 1U);
|
|
RTC_DCHECK_LE(value_size, 16U);
|
|
|
|
if (id < kMinId || id > kMaxId) {
|
|
LOG(LS_WARNING) << "Failed to register extension uri:'" << uri
|
|
<< "' with invalid id:" << static_cast<int>(id) << ".";
|
|
return false;
|
|
}
|
|
|
|
if (GetType(id) == type) { // Same type/id pair already registered.
|
|
LOG(LS_VERBOSE) << "Reregistering extension uri:'" << uri
|
|
<< "', id:" << static_cast<int>(id);
|
|
return true;
|
|
}
|
|
|
|
if (GetType(id) != kInvalidType) { // |id| used by another extension type.
|
|
LOG(LS_WARNING) << "Failed to register extension uri:'" << uri
|
|
<< "', id:" << static_cast<int>(id)
|
|
<< ". Id already in use by extension type "
|
|
<< static_cast<int>(GetType(id));
|
|
return false;
|
|
}
|
|
RTC_DCHECK(!IsRegistered(type));
|
|
|
|
types_[id] = type;
|
|
ids_[type] = id;
|
|
total_values_size_bytes_ += (value_size + 1);
|
|
return true;
|
|
}
|
|
|
|
} // namespace webrtc
|