From 11ab77d14f07eba2096c7251c1a39a7d444ff359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Mon, 16 Nov 2020 15:38:23 +0100 Subject: [PATCH] Add transition define RTC_OBJC_HAVE_LEGACY_RTC_RTP_FRAGMENTATION_HEADER MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also tweak presubmit checks to allow changes to RTCMacros.h. Bug: webrtc:6471 No-Presubmit: True Change-Id: I19e38e4cb05b831ebd2faa223029f36d45f480ff Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/193621 Reviewed-by: Karl Wiberg Reviewed-by: Mirko Bonadei Reviewed-by: Kári Helgason Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#32619} --- PRESUBMIT.py | 2 ++ sdk/objc/base/RTCMacros.h | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 7b45a85766..091037c08e 100755 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -1122,6 +1122,8 @@ def CheckObjcApiSymbols(input_api, output_api, source_file_filter): for f in input_api.AffectedSourceFiles(file_filter): if not f.LocalPath().endswith('.h') or not 'sdk/objc' in f.LocalPath(): continue + if f.LocalPath().endswith('sdk/objc/base/RTCMacros.h'): + continue contents = input_api.ReadFile(f) for match in rtc_objc_export.finditer(contents): export_block = match.group(0) diff --git a/sdk/objc/base/RTCMacros.h b/sdk/objc/base/RTCMacros.h index e527ff6bc4..e1c46b23bb 100644 --- a/sdk/objc/base/RTCMacros.h +++ b/sdk/objc/base/RTCMacros.h @@ -49,4 +49,9 @@ #define RTC_FWD_DECL_OBJC_CLASS(classname) typedef struct objc_object classname #endif +// TODO(bugs.webrtc.org/6471): This define is a transition aid. It will be +// deleted together with the RTCRtpFragmentationHeader argument to +// RTCVideoEncoderCallback, see RTCVideoEncoder.h. +#define RTC_OBJC_HAVE_LEGACY_RTC_RTP_FRAGMENTATION_HEADER 1 + #endif // SDK_OBJC_BASE_RTCMACROS_H_