diff options
author | Mirko Bonadei <mbonadei@webrtc.org> | 2020-05-04 16:14:32 +0200 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-05-04 15:01:26 +0000 |
commit | a81e9c82fc3fbc984f0f110407d1e44c9c01958a (patch) | |
tree | b1fe38ff3a668f8ff926a45271ad152df12f73e2 /modules/audio_coding | |
parent | ce1320cc4db57f51ed487f8d92b3adb777f88c9d (diff) | |
download | webrtc-a81e9c82fc3fbc984f0f110407d1e44c9c01958a.tar.gz |
Wrap WebRTC OBJC API types with RTC_OBJC_TYPE.
This CL introduced 2 new macros that affect the WebRTC OBJC API symbols:
- RTC_OBJC_TYPE_PREFIX:
Macro used to prepend a prefix to the API types that are exported with
RTC_OBJC_EXPORT.
Clients can patch the definition of this macro locally and build
WebRTC.framework with their own prefix in case symbol clashing is a
problem.
This macro must only be defined by changing the value in
sdk/objc/base/RTCMacros.h and not on via compiler flag to ensure
it has a unique value.
- RCT_OBJC_TYPE:
Macro used internally to reference API types. Declaring an API type
without using this macro will not include the declared type in the
set of types that will be affected by the configurable
RTC_OBJC_TYPE_PREFIX.
Manual changes:
https://webrtc-review.googlesource.com/c/src/+/173781/5..10
The auto-generated changes in PS#5 have been done with:
https://webrtc-review.googlesource.com/c/src/+/174061.
Bug: None
Change-Id: I0d54ca94db764fb3b6cb4365873f79e14cd879b8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173781
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31153}
Diffstat (limited to 'modules/audio_coding')
-rw-r--r-- | modules/audio_coding/codecs/ilbc/complexityMeasures.m | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/modules/audio_coding/codecs/ilbc/complexityMeasures.m b/modules/audio_coding/codecs/ilbc/complexityMeasures.m index 5c39e3615c..4bda83622f 100644 --- a/modules/audio_coding/codecs/ilbc/complexityMeasures.m +++ b/modules/audio_coding/codecs/ilbc/complexityMeasures.m @@ -1,14 +1,12 @@ -% -% 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. -% +% % 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.% -clear; + clear; pack; % % Enter the path to YOUR executable and remember to define the perprocessor @@ -56,4 +54,4 @@ result % Compute maximum complexity for a single frame (enc/dec separately and together) maxEncComplexityInAFrame = (max(sum(new(1:size(new,1)/2,:),2))/0.03)/1000000 maxDecComplexityInAFrame = (max(sum(new(size(new,1)/2+1:end,:),2))/0.03)/1000000 -totalComplexity = maxEncComplexityInAFrame + maxDecComplexityInAFrame
\ No newline at end of file +totalComplexity = maxEncComplexityInAFrame + maxDecComplexityInAFrame |