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

Pass buffer with size when writing rtp header extension

Browse Source 
Bug: chromium:826911
Change-Id: I617fecfee74745004067d892d6e31c94304f99ea
Reviewed-on: https://webrtc-review.googlesource.com/83945
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23641}
This commit is contained in:
Danil Chapovalov
2018-06-18 13:48:20 +02:00
committed by Commit Bot
parent 0040b66ad3
commit 9bf31584d1
4 changed files with 68 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ class AbsoluteSendTime {
static bool Parse(rtc::ArrayView<const uint8_t> data, uint32_t* time_24bits);
static size_t ValueSize(uint32_t time_24bits) { return kValueSizeBytes; }
static bool Write(uint8_t* data, uint32_t time_24bits);
static bool Write(rtc::ArrayView<uint8_t> data, uint32_t time_24bits);
static constexpr uint32_t MsTo24Bits(int64_t time_ms) {
return static_cast<uint32_t>(((time_ms << 18) + 500) / 1000) & 0x00FFFFFF;
@ -50,7 +50,9 @@ class AudioLevel {
static size_t ValueSize(bool voice_activity, uint8_t audio_level) {
return kValueSizeBytes;
}
static bool Write(uint8_t* data, bool voice_activity, uint8_t audio_level);
static bool Write(rtc::ArrayView<uint8_t> data,
bool voice_activity,
uint8_t audio_level);
};
class TransmissionOffset {
@ -61,7 +63,7 @@ class TransmissionOffset {
static bool Parse(rtc::ArrayView<const uint8_t> data, int32_t* rtp_time);
static size_t ValueSize(int32_t rtp_time) { return kValueSizeBytes; }
static bool Write(uint8_t* data, int32_t rtp_time);
static bool Write(rtc::ArrayView<uint8_t> data, int32_t rtp_time);
};
class TransportSequenceNumber {
@ -73,7 +75,7 @@ class TransportSequenceNumber {
"draft-holmer-rmcat-transport-wide-cc-extensions-01";
static bool Parse(rtc::ArrayView<const uint8_t> data, uint16_t* value);
static size_t ValueSize(uint16_t value) { return kValueSizeBytes; }
static bool Write(uint8_t* data, uint16_t value);
static bool Write(rtc::ArrayView<uint8_t> data, uint16_t value);
};
class VideoOrientation {
@ -84,10 +86,10 @@ class VideoOrientation {
static bool Parse(rtc::ArrayView<const uint8_t> data, VideoRotation* value);
static size_t ValueSize(VideoRotation) { return kValueSizeBytes; }
static bool Write(uint8_t* data, VideoRotation value);
static bool Write(rtc::ArrayView<uint8_t> data, VideoRotation value);
static bool Parse(rtc::ArrayView<const uint8_t> data, uint8_t* value);
static size_t ValueSize(uint8_t value) { return kValueSizeBytes; }
static bool Write(uint8_t* data, uint8_t value);
static bool Write(rtc::ArrayView<uint8_t> data, uint8_t value);
};
class PlayoutDelayLimits {
@ -109,7 +111,8 @@ class PlayoutDelayLimits {
static size_t ValueSize(const PlayoutDelay&) {
return kValueSizeBytes;
}
static bool Write(uint8_t* data, const PlayoutDelay& playout_delay);
static bool Write(rtc::ArrayView<uint8_t> data,
const PlayoutDelay& playout_delay);
};
class VideoContentTypeExtension {
@ -124,7 +127,8 @@ class VideoContentTypeExtension {
static size_t ValueSize(VideoContentType) {
return kValueSizeBytes;
}
static bool Write(uint8_t* data, VideoContentType content_type);
static bool Write(rtc::ArrayView<uint8_t> data,
VideoContentType content_type);
};
class VideoTimingExtension {
@ -137,13 +141,16 @@ class VideoTimingExtension {
static bool Parse(rtc::ArrayView<const uint8_t> data,
VideoSendTiming* timing);
static size_t ValueSize(const VideoSendTiming&) { return kValueSizeBytes; }
static bool Write(uint8_t* data, const VideoSendTiming& timing);
static bool Write(rtc::ArrayView<uint8_t> data,
const VideoSendTiming& timing);
static size_t ValueSize(uint16_t time_delta_ms, uint8_t idx) {
return kValueSizeBytes;
}
// Writes only single time delta to position idx.
static bool Write(uint8_t* data, uint16_t time_delta_ms, uint8_t idx);
static bool Write(rtc::ArrayView<uint8_t> data,
uint16_t time_delta_ms,
uint8_t idx);
};
// Base extension class for RTP header extensions which are strings.
@ -159,11 +166,12 @@ class BaseRtpStringExtension {
static size_t ValueSize(const StringRtpHeaderExtension& str) {
return str.size();
}
static bool Write(uint8_t* data, const StringRtpHeaderExtension& str);
static bool Write(rtc::ArrayView<uint8_t> data,
const StringRtpHeaderExtension& str);
static bool Parse(rtc::ArrayView<const uint8_t> data, std::string* str);
static size_t ValueSize(const std::string& str) { return str.size(); }
static bool Write(uint8_t* data, const std::string& str);
static bool Write(rtc::ArrayView<uint8_t> data, const std::string& str);
};
class RtpStreamId : public BaseRtpStringExtension {