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

Side by Side Diff: webrtc/modules/audio_processing/echo_control_mobile_impl.h

Issue 1454683002: Fixed the render queue item size preallocation and verification, moved constant declarations, remov… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Merge with latest changes in master 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 25 matching lines...) Expand all
36 RoutingMode routing_mode() const override; 36 RoutingMode routing_mode() const override;
37 bool is_comfort_noise_enabled() const override; 37 bool is_comfort_noise_enabled() const override;
38 38
39 // ProcessingComponent implementation. 39 // ProcessingComponent implementation.
40 int Initialize() override; 40 int Initialize() override;
41 41
42 // Reads render side data that has been queued on the render call. 42 // Reads render side data that has been queued on the render call.
43 void ReadQueuedRenderData(); 43 void ReadQueuedRenderData();
44 44
45 private: 45 private:
46 static const size_t kAllowedValuesOfSamplesPerFrame1 = 80;
47 static const size_t kAllowedValuesOfSamplesPerFrame2 = 160;
48 // TODO(peah): Decrease this once we properly handle hugely unbalanced
49 // reverse and forward call numbers.
50 static const size_t kMaxNumFramesToBuffer = 100;
51
52 // EchoControlMobile implementation. 46 // EchoControlMobile implementation.
53 int Enable(bool enable) override; 47 int Enable(bool enable) override;
54 int set_routing_mode(RoutingMode mode) override; 48 int set_routing_mode(RoutingMode mode) override;
55 int enable_comfort_noise(bool enable) override; 49 int enable_comfort_noise(bool enable) override;
56 int SetEchoPath(const void* echo_path, size_t size_bytes) override; 50 int SetEchoPath(const void* echo_path, size_t size_bytes) override;
57 int GetEchoPath(void* echo_path, size_t size_bytes) const override; 51 int GetEchoPath(void* echo_path, size_t size_bytes) const override;
58 52
59 // ProcessingComponent implementation. 53 // ProcessingComponent implementation.
60 void* CreateHandle() const override; 54 void* CreateHandle() const override;
61 int InitializeHandle(void* handle) const override; 55 int InitializeHandle(void* handle) const override;
(...skipping 13 matching lines...) Expand all
75 size_t render_queue_element_max_size_; 69 size_t render_queue_element_max_size_;
76 std::vector<int16_t> render_queue_buffer_; 70 std::vector<int16_t> render_queue_buffer_;
77 std::vector<int16_t> capture_queue_buffer_; 71 std::vector<int16_t> capture_queue_buffer_;
78 rtc::scoped_ptr< 72 rtc::scoped_ptr<
79 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>> 73 SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>>
80 render_signal_queue_; 74 render_signal_queue_;
81 }; 75 };
82 } // namespace webrtc 76 } // namespace webrtc
83 77
84 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_ 78 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/echo_cancellation_impl.cc ('k') | webrtc/modules/audio_processing/echo_control_mobile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698