Reason for revert: Breaks android buildbots. Original issue's description: > Reland of Add content type information to encoded images and corresponding rtp extension header (patchset #1 id:1 of https://codereview.webrtc.org/2816463002/ ) > > Reason for revert: > Reland with appropriate changes to API to not break depending projects. > > Original issue's description: > > Revert of Add content type information to encoded images and corresponding rtp extension header (patchset #31 id:600001 of https://codereview.webrtc.org/2772033002/ ) > > > > Reason for revert: > > Breaks dependent projects. > > > > Original issue's description: > > > Add content type information to Encoded Images and add corresponding RTP extension header. > > > Use it to separate UMA e2e delay metric between screenshare from video. > > > Content type extension is set based on encoder settings and processed and decoders. > > > > > > Also, > > > Fix full-stack-tests to calculate RTT correctly, so new metric could be tested. > > > > > > BUG=webrtc:7420 > > > > > > Review-Url: https://codereview.webrtc.org/2772033002 > > > Cr-Commit-Position: refs/heads/master@{#17640} > > > Committed:64e739aeae> > > > TBR=tommi@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,nisse@webrtc.org,mflodman@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:7420 > > > > Review-Url: https://codereview.webrtc.org/2816463002 > > Cr-Commit-Position: refs/heads/master@{#17644} > > Committed:5721866808> > TBR=tommi@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,nisse@webrtc.org,mflodman@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7420 > > Review-Url: https://codereview.webrtc.org/2812913002 > Cr-Commit-Position: refs/heads/master@{#17651} > Committed:774f6b4b96TBR=tommi@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,nisse@webrtc.org,mflodman@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7420 Review-Url: https://codereview.webrtc.org/2809653004 Cr-Commit-Position: refs/heads/master@{#17653}
103 lines
3.8 KiB
C++
103 lines
3.8 KiB
C++
/*
|
|
* Copyright (c) 2016 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_EXTENSIONS_H_
|
|
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "webrtc/api/video/video_rotation.h"
|
|
#include "webrtc/base/array_view.h"
|
|
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AbsoluteSendTime {
|
|
public:
|
|
static constexpr RTPExtensionType kId = kRtpExtensionAbsoluteSendTime;
|
|
static constexpr uint8_t kValueSizeBytes = 3;
|
|
static constexpr const char* kUri =
|
|
"http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time";
|
|
|
|
static bool Parse(rtc::ArrayView<const uint8_t> data, uint32_t* time_24bits);
|
|
static bool Write(uint8_t* data, int64_t time_ms);
|
|
|
|
static constexpr uint32_t MsTo24Bits(int64_t time_ms) {
|
|
return static_cast<uint32_t>(((time_ms << 18) + 500) / 1000) & 0x00FFFFFF;
|
|
}
|
|
};
|
|
|
|
class AudioLevel {
|
|
public:
|
|
static constexpr RTPExtensionType kId = kRtpExtensionAudioLevel;
|
|
static constexpr uint8_t kValueSizeBytes = 1;
|
|
static constexpr const char* kUri =
|
|
"urn:ietf:params:rtp-hdrext:ssrc-audio-level";
|
|
|
|
static bool Parse(rtc::ArrayView<const uint8_t> data,
|
|
bool* voice_activity,
|
|
uint8_t* audio_level);
|
|
static bool Write(uint8_t* data, bool voice_activity, uint8_t audio_level);
|
|
};
|
|
|
|
class TransmissionOffset {
|
|
public:
|
|
static constexpr RTPExtensionType kId = kRtpExtensionTransmissionTimeOffset;
|
|
static constexpr uint8_t kValueSizeBytes = 3;
|
|
static constexpr const char* kUri = "urn:ietf:params:rtp-hdrext:toffset";
|
|
|
|
static bool Parse(rtc::ArrayView<const uint8_t> data, int32_t* rtp_time);
|
|
static bool Write(uint8_t* data, int32_t rtp_time);
|
|
};
|
|
|
|
class TransportSequenceNumber {
|
|
public:
|
|
static constexpr RTPExtensionType kId = kRtpExtensionTransportSequenceNumber;
|
|
static constexpr uint8_t kValueSizeBytes = 2;
|
|
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* value);
|
|
static bool Write(uint8_t* data, uint16_t value);
|
|
};
|
|
|
|
class VideoOrientation {
|
|
public:
|
|
static constexpr RTPExtensionType kId = kRtpExtensionVideoRotation;
|
|
static constexpr uint8_t kValueSizeBytes = 1;
|
|
static constexpr const char* kUri = "urn:3gpp:video-orientation";
|
|
|
|
static bool Parse(rtc::ArrayView<const uint8_t> data, VideoRotation* value);
|
|
static bool Write(uint8_t* data, VideoRotation value);
|
|
static bool Parse(rtc::ArrayView<const uint8_t> data, uint8_t* value);
|
|
static bool Write(uint8_t* data, uint8_t value);
|
|
};
|
|
|
|
class PlayoutDelayLimits {
|
|
public:
|
|
static constexpr RTPExtensionType kId = kRtpExtensionPlayoutDelay;
|
|
static constexpr uint8_t kValueSizeBytes = 3;
|
|
static constexpr const char* kUri =
|
|
"http://www.webrtc.org/experiments/rtp-hdrext/playout-delay";
|
|
|
|
// 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.
|
|
static constexpr int kGranularityMs = 10;
|
|
// Maximum playout delay value in milliseconds.
|
|
static constexpr int kMaxMs = 0xfff * kGranularityMs; // 40950.
|
|
|
|
static bool Parse(rtc::ArrayView<const uint8_t> data,
|
|
PlayoutDelay* playout_delay);
|
|
static bool Write(uint8_t* data, const PlayoutDelay& playout_delay);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_
|