mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 14:20:45 +01:00

I need to replace the audio part of PayloadUnion with SdpAudioFormat, but that's a non-trivially-deletable class and those just don't work well in unions, especially unions that don't have a discriminator that says which member is currently active. This CL converts the union to a class, adds a discriminator, and provides accessor functions. CL #2 in the series will change all outsiders to use the accessors instead of the public member variables directly, and CL #3 will remove the public member variables. (It needs to be done in separate steps like this because PayloadUnion is unfortunately part of the API, and just changing it all in one go would break users.) BUG=webrtc:8159 Change-Id: I38c44bbb21a2d38600cff59bf37d8d47dfdbce21 Reviewed-on: https://webrtc-review.googlesource.com/4340 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20025}
70 lines
2.2 KiB
C++
70 lines
2.2 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 MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_
|
|
#define MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_
|
|
|
|
#include <cstring>
|
|
#include <map>
|
|
|
|
#include "modules/rtp_rtcp/include/receive_statistics.h"
|
|
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
|
|
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
#include "modules/rtp_rtcp/source/rtp_rtcp_config.h"
|
|
#include "rtc_base/deprecation.h"
|
|
#include "typedefs.h" // NOLINT(build/include)
|
|
|
|
namespace webrtc {
|
|
|
|
const uint8_t kRtpMarkerBitMask = 0x80;
|
|
|
|
RtpFeedback* NullObjectRtpFeedback();
|
|
|
|
namespace RtpUtility {
|
|
|
|
struct Payload {
|
|
Payload(const char* name, const PayloadUnion& pu)
|
|
: audio(pu.is_audio()), typeSpecific(pu) {
|
|
std::strncpy(this->name, name, sizeof(this->name) - 1);
|
|
this->name[sizeof(this->name) - 1] = '\0';
|
|
}
|
|
char name[RTP_PAYLOAD_NAME_SIZE];
|
|
bool audio;
|
|
PayloadUnion typeSpecific;
|
|
};
|
|
|
|
bool StringCompare(const char* str1, const char* str2, const uint32_t length);
|
|
|
|
// Round up to the nearest size that is a multiple of 4.
|
|
size_t Word32Align(size_t size);
|
|
|
|
class RtpHeaderParser {
|
|
public:
|
|
RtpHeaderParser(const uint8_t* rtpData, size_t rtpDataLength);
|
|
~RtpHeaderParser();
|
|
|
|
bool RTCP() const;
|
|
bool ParseRtcp(RTPHeader* header) const;
|
|
bool Parse(RTPHeader* parsedPacket,
|
|
RtpHeaderExtensionMap* ptrExtensionMap = nullptr) const;
|
|
|
|
private:
|
|
void ParseOneByteExtensionHeader(RTPHeader* parsedPacket,
|
|
const RtpHeaderExtensionMap* ptrExtensionMap,
|
|
const uint8_t* ptrRTPDataExtensionEnd,
|
|
const uint8_t* ptr) const;
|
|
|
|
const uint8_t* const _ptrRTPDataBegin;
|
|
const uint8_t* const _ptrRTPDataEnd;
|
|
};
|
|
} // namespace RtpUtility
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_
|