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

Side by Side Diff: webrtc/modules/audio_processing/audio_processing_impl.cc

Issue 1731153002: Replace scoped_ptr with unique_ptr in webrtc/common_audio/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: revert real_fourier.h + make changes so that things compile Created 4 years, 10 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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 ? formats_.rev_proc_format.num_frames() 288 ? formats_.rev_proc_format.num_frames()
289 : formats_.api_format.reverse_output_stream().num_frames(); 289 : formats_.api_format.reverse_output_stream().num_frames();
290 if (formats_.api_format.reverse_input_stream().num_channels() > 0) { 290 if (formats_.api_format.reverse_input_stream().num_channels() > 0) {
291 render_.render_audio.reset(new AudioBuffer( 291 render_.render_audio.reset(new AudioBuffer(
292 formats_.api_format.reverse_input_stream().num_frames(), 292 formats_.api_format.reverse_input_stream().num_frames(),
293 formats_.api_format.reverse_input_stream().num_channels(), 293 formats_.api_format.reverse_input_stream().num_channels(),
294 formats_.rev_proc_format.num_frames(), 294 formats_.rev_proc_format.num_frames(),
295 formats_.rev_proc_format.num_channels(), 295 formats_.rev_proc_format.num_channels(),
296 rev_audio_buffer_out_num_frames)); 296 rev_audio_buffer_out_num_frames));
297 if (rev_conversion_needed()) { 297 if (rev_conversion_needed()) {
298 render_.render_converter = rtc::ScopedToUnique(AudioConverter::Create( 298 render_.render_converter = AudioConverter::Create(
299 formats_.api_format.reverse_input_stream().num_channels(), 299 formats_.api_format.reverse_input_stream().num_channels(),
300 formats_.api_format.reverse_input_stream().num_frames(), 300 formats_.api_format.reverse_input_stream().num_frames(),
301 formats_.api_format.reverse_output_stream().num_channels(), 301 formats_.api_format.reverse_output_stream().num_channels(),
302 formats_.api_format.reverse_output_stream().num_frames())); 302 formats_.api_format.reverse_output_stream().num_frames());
303 } else { 303 } else {
304 render_.render_converter.reset(nullptr); 304 render_.render_converter.reset(nullptr);
305 } 305 }
306 } else { 306 } else {
307 render_.render_audio.reset(nullptr); 307 render_.render_audio.reset(nullptr);
308 render_.render_converter.reset(nullptr); 308 render_.render_converter.reset(nullptr);
309 } 309 }
310 capture_.capture_audio.reset( 310 capture_.capture_audio.reset(
311 new AudioBuffer(formats_.api_format.input_stream().num_frames(), 311 new AudioBuffer(formats_.api_format.input_stream().num_frames(),
312 formats_.api_format.input_stream().num_channels(), 312 formats_.api_format.input_stream().num_channels(),
(...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 debug_dump_.capture.event_msg->mutable_config()->CopyFrom(config); 1450 debug_dump_.capture.event_msg->mutable_config()->CopyFrom(config);
1451 1451
1452 RETURN_ON_ERR(WriteMessageToDebugFile(debug_dump_.debug_file.get(), 1452 RETURN_ON_ERR(WriteMessageToDebugFile(debug_dump_.debug_file.get(),
1453 &debug_dump_.num_bytes_left_for_log_, 1453 &debug_dump_.num_bytes_left_for_log_,
1454 &crit_debug_, &debug_dump_.capture)); 1454 &crit_debug_, &debug_dump_.capture));
1455 return kNoError; 1455 return kNoError;
1456 } 1456 }
1457 #endif // WEBRTC_AUDIOPROC_DEBUG_DUMP 1457 #endif // WEBRTC_AUDIOPROC_DEBUG_DUMP
1458 1458
1459 } // namespace webrtc 1459 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/common_audio/sparse_fir_filter_unittest.cc ('k') | webrtc/modules/audio_processing/transient/transient_suppressor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698