From b34f6a8520de5e4813e7f3e7cd2d2d7cb7d8c01f Mon Sep 17 00:00:00 2001 From: danilchap Date: Tue, 23 May 2017 11:06:56 -0700 Subject: [PATCH] Remove deprecated isFirstPacket member name Original rename .isFirstPacket to .is_first_packet_in_frame was done in https://codereview.webrtc.org/2614503002 BUG=None Review-Url: https://codereview.webrtc.org/2895473004 Cr-Commit-Position: refs/heads/master@{#18247} --- webrtc/modules/include/module_common_types.h | 5 +---- webrtc/modules/video_coding/packet.h | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/webrtc/modules/include/module_common_types.h b/webrtc/modules/include/module_common_types.h index ba1c6a7f1d..4d38c67fe7 100644 --- a/webrtc/modules/include/module_common_types.h +++ b/webrtc/modules/include/module_common_types.h @@ -61,10 +61,7 @@ struct RTPVideoHeader { VideoContentType content_type; - union { - bool is_first_packet_in_frame; - RTC_DEPRECATED bool isFirstPacket; // first packet in frame - }; + bool is_first_packet_in_frame; uint8_t simulcastIdx; // Index if the simulcast encoder creating // this frame, 0 if not using simulcast. RtpVideoCodecTypes codec; diff --git a/webrtc/modules/video_coding/packet.h b/webrtc/modules/video_coding/packet.h index 488c058a8e..e2ad09aedc 100644 --- a/webrtc/modules/video_coding/packet.h +++ b/webrtc/modules/video_coding/packet.h @@ -11,7 +11,6 @@ #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" @@ -40,10 +39,7 @@ class VCMPacket { FrameType frameType; VideoCodecType codec; - union { - RTC_DEPRECATED bool isFirstPacket; // Is this first packet in a frame. - bool is_first_packet_in_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.