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

Side by Side Diff: talk/media/webrtc/webrtcvoiceengine_unittest.cc

Issue 1166463006: Revert r9378 "Rename APM Config DelayCorrection to ExtendedFilter" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine.cc ('k') | webrtc/modules/audio_processing/aec/aec_core.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2008 Google Inc. 3 * Copyright 2008 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 2877 matching lines...) Expand 10 before | Expand all | Expand 10 after
2888 ASSERT_TRUE(engine_.SetOptions(options)); 2888 ASSERT_TRUE(engine_.SetOptions(options));
2889 voe_.GetEcStatus(ec_enabled, ec_mode); 2889 voe_.GetEcStatus(ec_enabled, ec_mode);
2890 voe_.GetEcMetricsStatus(ec_metrics_enabled); 2890 voe_.GetEcMetricsStatus(ec_metrics_enabled);
2891 voe_.GetAecmMode(aecm_mode, cng_enabled); 2891 voe_.GetAecmMode(aecm_mode, cng_enabled);
2892 EXPECT_TRUE(ec_enabled); 2892 EXPECT_TRUE(ec_enabled);
2893 EXPECT_TRUE(ec_metrics_enabled); 2893 EXPECT_TRUE(ec_metrics_enabled);
2894 EXPECT_EQ(ec_mode, webrtc::kEcConference); 2894 EXPECT_EQ(ec_mode, webrtc::kEcConference);
2895 2895
2896 // Turn off echo cancellation and delay agnostic aec. 2896 // Turn off echo cancellation and delay agnostic aec.
2897 options.delay_agnostic_aec.Set(false); 2897 options.delay_agnostic_aec.Set(false);
2898 options.extended_filter_aec.Set(false); 2898 options.experimental_aec.Set(false);
2899 options.echo_cancellation.Set(false); 2899 options.echo_cancellation.Set(false);
2900 ASSERT_TRUE(engine_.SetOptions(options)); 2900 ASSERT_TRUE(engine_.SetOptions(options));
2901 voe_.GetEcStatus(ec_enabled, ec_mode); 2901 voe_.GetEcStatus(ec_enabled, ec_mode);
2902 EXPECT_FALSE(ec_enabled); 2902 EXPECT_FALSE(ec_enabled);
2903 // Turning delay agnostic aec back on should also turn on echo cancellation. 2903 // Turning delay agnostic aec back on should also turn on echo cancellation.
2904 options.delay_agnostic_aec.Set(true); 2904 options.delay_agnostic_aec.Set(true);
2905 ASSERT_TRUE(engine_.SetOptions(options)); 2905 ASSERT_TRUE(engine_.SetOptions(options));
2906 voe_.GetEcStatus(ec_enabled, ec_mode); 2906 voe_.GetEcStatus(ec_enabled, ec_mode);
2907 voe_.GetEcMetricsStatus(ec_metrics_enabled); 2907 voe_.GetEcMetricsStatus(ec_metrics_enabled);
2908 EXPECT_TRUE(ec_enabled); 2908 EXPECT_TRUE(ec_enabled);
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
3614 // channel of |recv_ch|.This is not a common case, since, normally, only the 3614 // channel of |recv_ch|.This is not a common case, since, normally, only the
3615 // default channel can be associated. However, the default is not deletable. 3615 // default channel can be associated. However, the default is not deletable.
3616 // So we force the |recv_ch| to associate with a non-default channel. 3616 // So we force the |recv_ch| to associate with a non-default channel.
3617 EXPECT_EQ(0, voe_.AssociateSendChannel(recv_ch, send_ch)); 3617 EXPECT_EQ(0, voe_.AssociateSendChannel(recv_ch, send_ch));
3618 EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch), send_ch); 3618 EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch), send_ch);
3619 3619
3620 EXPECT_TRUE(channel_->RemoveSendStream(2)); 3620 EXPECT_TRUE(channel_->RemoveSendStream(2));
3621 EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch), -1); 3621 EXPECT_EQ(voe_.GetAssociateSendChannel(recv_ch), -1);
3622 } 3622 }
3623 3623
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine.cc ('k') | webrtc/modules/audio_processing/aec/aec_core.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698