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

Side by Side Diff: webrtc/modules/audio_processing/aec/aec_core.cc

Issue 1763703002: Changed name for the upcoming AEC from NextGenerationAec to AEC3. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase with latest master Created 4 years, 9 months 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 1421 matching lines...) Expand 10 before | Expand all | Expand 10 after
1432 #ifdef WEBRTC_ANDROID 1432 #ifdef WEBRTC_ANDROID
1433 aec->delay_agnostic_enabled = 1; // DA-AEC enabled by default. 1433 aec->delay_agnostic_enabled = 1; // DA-AEC enabled by default.
1434 // DA-AEC assumes the system is causal from the beginning and will self adjust 1434 // DA-AEC assumes the system is causal from the beginning and will self adjust
1435 // the lookahead when shifting is required. 1435 // the lookahead when shifting is required.
1436 WebRtc_set_lookahead(aec->delay_estimator, 0); 1436 WebRtc_set_lookahead(aec->delay_estimator, 0);
1437 #else 1437 #else
1438 aec->delay_agnostic_enabled = 0; 1438 aec->delay_agnostic_enabled = 0;
1439 WebRtc_set_lookahead(aec->delay_estimator, kLookaheadBlocks); 1439 WebRtc_set_lookahead(aec->delay_estimator, kLookaheadBlocks);
1440 #endif 1440 #endif
1441 aec->extended_filter_enabled = 0; 1441 aec->extended_filter_enabled = 0;
1442 aec->next_generation_aec_enabled = 0; 1442 aec->aec3_enabled = 0;
1443 1443
1444 // Assembly optimization 1444 // Assembly optimization
1445 WebRtcAec_FilterFar = FilterFar; 1445 WebRtcAec_FilterFar = FilterFar;
1446 WebRtcAec_ScaleErrorSignal = ScaleErrorSignal; 1446 WebRtcAec_ScaleErrorSignal = ScaleErrorSignal;
1447 WebRtcAec_FilterAdaptation = FilterAdaptation; 1447 WebRtcAec_FilterAdaptation = FilterAdaptation;
1448 WebRtcAec_OverdriveAndSuppress = OverdriveAndSuppress; 1448 WebRtcAec_OverdriveAndSuppress = OverdriveAndSuppress;
1449 WebRtcAec_ComfortNoise = ComfortNoise; 1449 WebRtcAec_ComfortNoise = ComfortNoise;
1450 WebRtcAec_SubbandCoherence = SubbandCoherence; 1450 WebRtcAec_SubbandCoherence = SubbandCoherence;
1451 WebRtcAec_StoreAsComplex = StoreAsComplex; 1451 WebRtcAec_StoreAsComplex = StoreAsComplex;
1452 WebRtcAec_PartitionDelay = PartitionDelay; 1452 WebRtcAec_PartitionDelay = PartitionDelay;
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
1866 } 1866 }
1867 1867
1868 void WebRtcAec_enable_delay_agnostic(AecCore* self, int enable) { 1868 void WebRtcAec_enable_delay_agnostic(AecCore* self, int enable) {
1869 self->delay_agnostic_enabled = enable; 1869 self->delay_agnostic_enabled = enable;
1870 } 1870 }
1871 1871
1872 int WebRtcAec_delay_agnostic_enabled(AecCore* self) { 1872 int WebRtcAec_delay_agnostic_enabled(AecCore* self) {
1873 return self->delay_agnostic_enabled; 1873 return self->delay_agnostic_enabled;
1874 } 1874 }
1875 1875
1876 void WebRtcAec_enable_next_generation_aec(AecCore* self, int enable) { 1876 void WebRtcAec_enable_aec3(AecCore* self, int enable) {
1877 self->next_generation_aec_enabled = (enable != 0); 1877 self->aec3_enabled = (enable != 0);
1878 } 1878 }
1879 1879
1880 int WebRtcAec_next_generation_aec_enabled(AecCore* self) { 1880 int WebRtcAec_aec3_enabled(AecCore* self) {
1881 assert(self->next_generation_aec_enabled == 0 || 1881 assert(self->aec3_enabled == 0 || self->aec3_enabled == 1);
1882 self->next_generation_aec_enabled == 1); 1882 return self->aec3_enabled;
1883 return self->next_generation_aec_enabled;
1884 } 1883 }
1885 1884
1886 1885
1887 void WebRtcAec_enable_extended_filter(AecCore* self, int enable) { 1886 void WebRtcAec_enable_extended_filter(AecCore* self, int enable) {
1888 self->extended_filter_enabled = enable; 1887 self->extended_filter_enabled = enable;
1889 self->num_partitions = enable ? kExtendedNumPartitions : kNormalNumPartitions; 1888 self->num_partitions = enable ? kExtendedNumPartitions : kNormalNumPartitions;
1890 // Update the delay estimator with filter length. See InitAEC() for details. 1889 // Update the delay estimator with filter length. See InitAEC() for details.
1891 WebRtc_set_allowed_offset(self->delay_estimator, self->num_partitions / 2); 1890 WebRtc_set_allowed_offset(self->delay_estimator, self->num_partitions / 2);
1892 } 1891 }
1893 1892
1894 int WebRtcAec_extended_filter_enabled(AecCore* self) { 1893 int WebRtcAec_extended_filter_enabled(AecCore* self) {
1895 return self->extended_filter_enabled; 1894 return self->extended_filter_enabled;
1896 } 1895 }
1897 1896
1898 int WebRtcAec_system_delay(AecCore* self) { 1897 int WebRtcAec_system_delay(AecCore* self) {
1899 return self->system_delay; 1898 return self->system_delay;
1900 } 1899 }
1901 1900
1902 void WebRtcAec_SetSystemDelay(AecCore* self, int delay) { 1901 void WebRtcAec_SetSystemDelay(AecCore* self, int delay) {
1903 assert(delay >= 0); 1902 assert(delay >= 0);
1904 self->system_delay = delay; 1903 self->system_delay = delay;
1905 } 1904 }
1906 } // namespace webrtc 1905 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/aec/aec_core.h ('k') | webrtc/modules/audio_processing/aec/aec_core_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698