Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(527)

Side by Side Diff: webrtc/modules/audio_processing/beamformer/array_util.cc

Issue 1432553007: Rename Maybe to Optional (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 bool AreParallel(const Point& a, const Point& b) { 50 bool AreParallel(const Point& a, const Point& b) {
51 Point cross_product = CrossProduct(a, b); 51 Point cross_product = CrossProduct(a, b);
52 return DotProduct(cross_product, cross_product) < kMaxDotProduct; 52 return DotProduct(cross_product, cross_product) < kMaxDotProduct;
53 } 53 }
54 54
55 bool ArePerpendicular(const Point& a, const Point& b) { 55 bool ArePerpendicular(const Point& a, const Point& b) {
56 return std::abs(DotProduct(a, b)) < kMaxDotProduct; 56 return std::abs(DotProduct(a, b)) < kMaxDotProduct;
57 } 57 }
58 58
59 rtc::Maybe<Point> GetDirectionIfLinear( 59 rtc::Optional<Point> GetDirectionIfLinear(
60 const std::vector<Point>& array_geometry) { 60 const std::vector<Point>& array_geometry) {
61 RTC_DCHECK_GT(array_geometry.size(), 1u); 61 RTC_DCHECK_GT(array_geometry.size(), 1u);
62 const Point first_pair_direction = 62 const Point first_pair_direction =
63 PairDirection(array_geometry[0], array_geometry[1]); 63 PairDirection(array_geometry[0], array_geometry[1]);
64 for (size_t i = 2u; i < array_geometry.size(); ++i) { 64 for (size_t i = 2u; i < array_geometry.size(); ++i) {
65 const Point pair_direction = 65 const Point pair_direction =
66 PairDirection(array_geometry[i - 1], array_geometry[i]); 66 PairDirection(array_geometry[i - 1], array_geometry[i]);
67 if (!AreParallel(first_pair_direction, pair_direction)) { 67 if (!AreParallel(first_pair_direction, pair_direction)) {
68 return rtc::Maybe<Point>(); 68 return rtc::Optional<Point>();
69 } 69 }
70 } 70 }
71 return rtc::Maybe<Point>(first_pair_direction); 71 return rtc::Optional<Point>(first_pair_direction);
72 } 72 }
73 73
74 rtc::Maybe<Point> GetNormalIfPlanar(const std::vector<Point>& array_geometry) { 74 rtc::Optional<Point> GetNormalIfPlanar(
75 const std::vector<Point>& array_geometry) {
75 RTC_DCHECK_GT(array_geometry.size(), 1u); 76 RTC_DCHECK_GT(array_geometry.size(), 1u);
76 const Point first_pair_direction = 77 const Point first_pair_direction =
77 PairDirection(array_geometry[0], array_geometry[1]); 78 PairDirection(array_geometry[0], array_geometry[1]);
78 Point pair_direction(0.f, 0.f, 0.f); 79 Point pair_direction(0.f, 0.f, 0.f);
79 size_t i = 2u; 80 size_t i = 2u;
80 bool is_linear = true; 81 bool is_linear = true;
81 for (; i < array_geometry.size() && is_linear; ++i) { 82 for (; i < array_geometry.size() && is_linear; ++i) {
82 pair_direction = PairDirection(array_geometry[i - 1], array_geometry[i]); 83 pair_direction = PairDirection(array_geometry[i - 1], array_geometry[i]);
83 if (!AreParallel(first_pair_direction, pair_direction)) { 84 if (!AreParallel(first_pair_direction, pair_direction)) {
84 is_linear = false; 85 is_linear = false;
85 } 86 }
86 } 87 }
87 if (is_linear) { 88 if (is_linear) {
88 return rtc::Maybe<Point>(); 89 return rtc::Optional<Point>();
89 } 90 }
90 const Point normal_direction = 91 const Point normal_direction =
91 CrossProduct(first_pair_direction, pair_direction); 92 CrossProduct(first_pair_direction, pair_direction);
92 for (; i < array_geometry.size(); ++i) { 93 for (; i < array_geometry.size(); ++i) {
93 pair_direction = PairDirection(array_geometry[i - 1], array_geometry[i]); 94 pair_direction = PairDirection(array_geometry[i - 1], array_geometry[i]);
94 if (!ArePerpendicular(normal_direction, pair_direction)) { 95 if (!ArePerpendicular(normal_direction, pair_direction)) {
95 return rtc::Maybe<Point>(); 96 return rtc::Optional<Point>();
96 } 97 }
97 } 98 }
98 return rtc::Maybe<Point>(normal_direction); 99 return rtc::Optional<Point>(normal_direction);
99 } 100 }
100 101
101 rtc::Maybe<Point> GetArrayNormalIfExists( 102 rtc::Optional<Point> GetArrayNormalIfExists(
102 const std::vector<Point>& array_geometry) { 103 const std::vector<Point>& array_geometry) {
103 const rtc::Maybe<Point> direction = GetDirectionIfLinear(array_geometry); 104 const rtc::Optional<Point> direction = GetDirectionIfLinear(array_geometry);
104 if (direction) { 105 if (direction) {
105 return rtc::Maybe<Point>(Point(direction->y(), -direction->x(), 0.f)); 106 return rtc::Optional<Point>(Point(direction->y(), -direction->x(), 0.f));
106 } 107 }
107 const rtc::Maybe<Point> normal = GetNormalIfPlanar(array_geometry); 108 const rtc::Optional<Point> normal = GetNormalIfPlanar(array_geometry);
108 if (normal && normal->z() < kMaxDotProduct) { 109 if (normal && normal->z() < kMaxDotProduct) {
109 return normal; 110 return normal;
110 } 111 }
111 return rtc::Maybe<Point>(); 112 return rtc::Optional<Point>();
112 } 113 }
113 114
114 Point AzimuthToPoint(float azimuth) { 115 Point AzimuthToPoint(float azimuth) {
115 return Point(std::cos(azimuth), std::sin(azimuth), 0.f); 116 return Point(std::cos(azimuth), std::sin(azimuth), 0.f);
116 } 117 }
117 118
118 } // namespace webrtc 119 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698