0d1b2b6880
Add RTC_DEPRACATed anonymous unions to not break downstream projects.
Orignal issue's description:
> commit 0ad21111fcc57a7e978edba3c4263f0062d7f9ff
> Author: danilchap <danilchap@webrtc.org>
> Date: Mon Dec 19 09:36:33 2016 -0800
>
> Revert of Rename RTPVideoHeader.isFirstPacket to
> .is_first_packet_in_frame. (patchset #1 id:1 of
> https://codereview.webrtc.org/2574943003/ )
>
> Reason for revert:
> breaks downstream project.
>
> Can you make this change in a compatible way using anonymous
> union:
> union {
> bool is_first_packet_in_frame;
> RTC_DEPRECATED bool isFirstPacket;
> };
> (unfortunetly this this treak breaks braced initialization in
> rtp_rtcp_impl_unittest.cc,
> so that should be rewritting in a more classic way)
>
> Original issue's description:
> > Rename RTPVideoHeader.isFirstPacket to
> > .is_first_packet_in_frame.
> >
> > Name should represent the actual meaning.
> >
> > BUG=None
> >
> > Review-Url: https://codereview.webrtc.org/2574943003
> > Cr-Commit-Position: refs/heads/master@{#15684}
> > Committed:
> > efde908380
>
> TBR=stefan@webrtc.org,sprang@webrtc.org,johan@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days
> ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=None
>
> Review-Url: https://codereview.webrtc.org/2589783003
> Cr-Commit-Position: refs/heads/master@{#15686}
>
BUG=None
Review-Url: https://codereview.webrtc.org/2614503002
Cr-Commit-Position: refs/heads/master@{#15987}
60 lines
1.7 KiB
C++
60 lines
1.7 KiB
C++
/*
|
|
* Copyright (c) 2011 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_VIDEO_CODING_PACKET_H_
|
|
#define WEBRTC_MODULES_VIDEO_CODING_PACKET_H_
|
|
|
|
#include "webrtc/base/deprecation.h"
|
|
#include "webrtc/modules/include/module_common_types.h"
|
|
#include "webrtc/modules/video_coding/jitter_buffer_common.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class VCMPacket {
|
|
public:
|
|
VCMPacket();
|
|
VCMPacket(const uint8_t* ptr,
|
|
const size_t size,
|
|
const WebRtcRTPHeader& rtpHeader);
|
|
|
|
void Reset();
|
|
|
|
uint8_t payloadType;
|
|
uint32_t timestamp;
|
|
// NTP time of the capture time in local timebase in milliseconds.
|
|
int64_t ntp_time_ms_;
|
|
uint16_t seqNum;
|
|
const uint8_t* dataPtr;
|
|
size_t sizeBytes;
|
|
bool markerBit;
|
|
int timesNacked;
|
|
|
|
FrameType frameType;
|
|
VideoCodecType codec;
|
|
|
|
union {
|
|
RTC_DEPRECATED bool isFirstPacket; // Is this first packet in a frame.
|
|
bool is_first_packet_in_frame;
|
|
};
|
|
VCMNaluCompleteness completeNALU; // Default is kNaluIncomplete.
|
|
bool insertStartCode; // True if a start code should be inserted before this
|
|
// packet.
|
|
int width;
|
|
int height;
|
|
RTPVideoHeader video_header;
|
|
|
|
protected:
|
|
void CopyCodecSpecifics(const RTPVideoHeader& videoHeader);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_VIDEO_CODING_PACKET_H_
|