admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce RtpPacket::GetExtension accessor that return result

Browse Source 
instead of using output parameter.

Bug: None
Change-Id: I1d5c150b7cb6302aa29e040e8c9fe68bddfd8c0e
Reviewed-on: https://webrtc-review.googlesource.com/c/110240
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25565}
This commit is contained in:
Danil Chapovalov 2018-11-08 15:12:45 +01:00 committed by Commit Bot
parent 357f596558
commit c5dd3009b4
4 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h
View File

@ -21,6 +21,7 @@ namespace webrtc {
class RtpGenericFrameDescriptorExtension {
public:
using value_type = RtpGenericFrameDescriptor;
static constexpr RTPExtensionType kId = kRtpExtensionGenericFrameDescriptor;
static constexpr char kUri[] =
"http://www.webrtc.org/experiments/rtp-hdrext/"

9
modules/rtp_rtcp/source/rtp_header_extensions.h
View File

@ -27,6 +27,7 @@ namespace webrtc {
class AbsoluteSendTime {
public:
using value_type = uint32_t;
static constexpr RTPExtensionType kId = kRtpExtensionAbsoluteSendTime;
static constexpr uint8_t kValueSizeBytes = 3;
static constexpr const char kUri[] =
@ -61,6 +62,7 @@ class AudioLevel {
class TransmissionOffset {
public:
using value_type = int32_t;
static constexpr RTPExtensionType kId = kRtpExtensionTransmissionTimeOffset;
static constexpr uint8_t kValueSizeBytes = 3;
static constexpr const char kUri[] = "urn:ietf:params:rtp-hdrext:toffset";
@ -72,6 +74,7 @@ class TransmissionOffset {
class TransportSequenceNumber {
public:
using value_type = uint16_t;
static constexpr RTPExtensionType kId = kRtpExtensionTransportSequenceNumber;
static constexpr uint8_t kValueSizeBytes = 2;
static constexpr const char kUri[] =
@ -84,6 +87,7 @@ class TransportSequenceNumber {
class VideoOrientation {
public:
using value_type = VideoRotation;
static constexpr RTPExtensionType kId = kRtpExtensionVideoRotation;
static constexpr uint8_t kValueSizeBytes = 1;
static constexpr const char kUri[] = "urn:3gpp:video-orientation";
@ -98,6 +102,7 @@ class VideoOrientation {
class PlayoutDelayLimits {
public:
using value_type = PlayoutDelay;
static constexpr RTPExtensionType kId = kRtpExtensionPlayoutDelay;
static constexpr uint8_t kValueSizeBytes = 3;
static constexpr const char kUri[] =
@ -121,6 +126,7 @@ class PlayoutDelayLimits {
class VideoContentTypeExtension {
public:
using value_type = VideoContentType;
static constexpr RTPExtensionType kId = kRtpExtensionVideoContentType;
static constexpr uint8_t kValueSizeBytes = 1;
static constexpr const char kUri[] =
@ -137,6 +143,7 @@ class VideoContentTypeExtension {
class VideoTimingExtension {
public:
using value_type = VideoSendTiming;
static constexpr RTPExtensionType kId = kRtpExtensionVideoTiming;
static constexpr uint8_t kValueSizeBytes = 13;
static constexpr const char kUri[] =
@ -159,6 +166,7 @@ class VideoTimingExtension {
class FrameMarkingExtension {
public:
using value_type = FrameMarking;
static constexpr RTPExtensionType kId = kRtpExtensionFrameMarking;
static constexpr const char kUri[] =
"http://tools.ietf.org/html/draft-ietf-avtext-framemarking-07";
@ -177,6 +185,7 @@ class FrameMarkingExtension {
// Subclasses must defined kId and kUri static constexpr members.
class BaseRtpStringExtension {
public:
using value_type = std::string;
// String RTP header extensions are limited to 16 bytes because it is the
// maximum length that can be encoded with one-byte header extensions.
static constexpr uint8_t kMaxValueSizeBytes = 16;

23
modules/rtp_rtcp/source/rtp_packet.h
View File

@ -12,6 +12,7 @@
#include <vector>
#include "absl/types/optional.h"
#include "api/array_view.h"
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
@ -95,8 +96,11 @@ class RtpPacket {
template <typename Extension>
bool HasExtension() const;
template <typename Extension, typename... Values>
bool GetExtension(Values...) const;
template <typename Extension, typename FirstValue, typename... Values>
bool GetExtension(FirstValue, Values...) const;
template <typename Extension>
absl::optional<typename Extension::value_type> GetExtension() const;
// Returns view of the raw extension or empty view on failure.
template <typename Extension>
@ -183,12 +187,21 @@ bool RtpPacket::HasExtension() const {
return !FindExtension(Extension::kId).empty();
}
template <typename Extension, typename... Values>
bool RtpPacket::GetExtension(Values... values) const {
template <typename Extension, typename FirstValue, typename... Values>
bool RtpPacket::GetExtension(FirstValue first, Values... values) const {
auto raw = FindExtension(Extension::kId);
if (raw.empty())
return false;
return Extension::Parse(raw, values...);
return Extension::Parse(raw, first, values...);
}
template <typename Extension>
absl::optional<typename Extension::value_type> RtpPacket::GetExtension() const {
absl::optional<typename Extension::value_type> result;
auto raw = FindExtension(Extension::kId);
if (raw.empty() || !Extension::Parse(raw, &result.emplace()))
result = absl::nullopt;
return result;
}
template <typename Extension>

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

@ -466,6 +466,23 @@ TEST(RtpPacketTest, ParseWithExtension) {
EXPECT_EQ(0u, packet.padding_size());
}
TEST(RtpPacketTest, GetExtensionWithoutParametersReturnsOptionalValue) {
RtpPacket::ExtensionManager extensions;
extensions.Register<TransmissionOffset>(kTransmissionOffsetExtensionId);
extensions.Register<RtpStreamId>(kRtpStreamIdExtensionId);
RtpPacketReceived packet(&extensions);
EXPECT_TRUE(packet.Parse(kPacketWithTO, sizeof(kPacketWithTO)));
auto time_offset = packet.GetExtension<TransmissionOffset>();
static_assert(
std::is_same<decltype(time_offset),
absl::optional<TransmissionOffset::value_type>>::value,
"");
EXPECT_EQ(time_offset, kTimeOffset);
EXPECT_FALSE(packet.GetExtension<RtpStreamId>().has_value());
}
TEST(RtpPacketTest, GetRawExtensionWhenPresent) {
constexpr uint8_t kRawPacket[] = {
// comment for clang-format to align kRawPacket nicer.