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

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

Issue 1530333007: Don't use default aec_dump in webrtcvoiceengine when non is provided (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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 | « no previous file | no next file » | 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 2004 Google Inc. 3 * Copyright 2004 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 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 options.highpass_filter = rtc::Optional<bool>(true); 578 options.highpass_filter = rtc::Optional<bool>(true);
579 options.stereo_swapping = rtc::Optional<bool>(false); 579 options.stereo_swapping = rtc::Optional<bool>(false);
580 options.audio_jitter_buffer_max_packets = rtc::Optional<int>(50); 580 options.audio_jitter_buffer_max_packets = rtc::Optional<int>(50);
581 options.audio_jitter_buffer_fast_accelerate = rtc::Optional<bool>(false); 581 options.audio_jitter_buffer_fast_accelerate = rtc::Optional<bool>(false);
582 options.typing_detection = rtc::Optional<bool>(true); 582 options.typing_detection = rtc::Optional<bool>(true);
583 options.adjust_agc_delta = rtc::Optional<int>(0); 583 options.adjust_agc_delta = rtc::Optional<int>(0);
584 options.experimental_agc = rtc::Optional<bool>(false); 584 options.experimental_agc = rtc::Optional<bool>(false);
585 options.extended_filter_aec = rtc::Optional<bool>(false); 585 options.extended_filter_aec = rtc::Optional<bool>(false);
586 options.delay_agnostic_aec = rtc::Optional<bool>(false); 586 options.delay_agnostic_aec = rtc::Optional<bool>(false);
587 options.experimental_ns = rtc::Optional<bool>(false); 587 options.experimental_ns = rtc::Optional<bool>(false);
588 options.aec_dump = rtc::Optional<bool>(false);
589 588
590 // Apply any given options on top. 589 // Apply any given options on top.
591 options.SetAll(options_in); 590 options.SetAll(options_in);
592 591
593 // kEcConference is AEC with high suppression. 592 // kEcConference is AEC with high suppression.
594 webrtc::EcModes ec_mode = webrtc::kEcConference; 593 webrtc::EcModes ec_mode = webrtc::kEcConference;
595 webrtc::AecmModes aecm_mode = webrtc::kAecmSpeakerphone; 594 webrtc::AecmModes aecm_mode = webrtc::kAecmSpeakerphone;
596 webrtc::AgcModes agc_mode = webrtc::kAgcAdaptiveAnalog; 595 webrtc::AgcModes agc_mode = webrtc::kAgcAdaptiveAnalog;
597 webrtc::NsModes ns_mode = webrtc::kNsHighSuppression; 596 webrtc::NsModes ns_mode = webrtc::kNsHighSuppression;
598 if (options.aecm_generate_comfort_noise) { 597 if (options.aecm_generate_comfort_noise) {
(...skipping 1901 matching lines...) Expand 10 before | Expand all | Expand 10 after
2500 } 2499 }
2501 } else { 2500 } else {
2502 LOG(LS_INFO) << "Stopping playout for channel #" << channel; 2501 LOG(LS_INFO) << "Stopping playout for channel #" << channel;
2503 engine()->voe()->base()->StopPlayout(channel); 2502 engine()->voe()->base()->StopPlayout(channel);
2504 } 2503 }
2505 return true; 2504 return true;
2506 } 2505 }
2507 } // namespace cricket 2506 } // namespace cricket
2508 2507
2509 #endif // HAVE_WEBRTC_VOICE 2508 #endif // HAVE_WEBRTC_VOICE
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698