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

Side by Side Diff: webrtc/modules/audio_coding/neteq/neteq.cc

Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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
11 #include "webrtc/modules/audio_coding/neteq/include/neteq.h" 11 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
12 12
13 #include <memory>
14 #include <sstream> 13 #include <sstream>
15 14
16 #include "webrtc/modules/audio_coding/neteq/accelerate.h" 15 #include "webrtc/modules/audio_coding/neteq/accelerate.h"
17 #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" 16 #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h"
18 #include "webrtc/modules/audio_coding/neteq/decoder_database.h" 17 #include "webrtc/modules/audio_coding/neteq/decoder_database.h"
19 #include "webrtc/modules/audio_coding/neteq/delay_manager.h" 18 #include "webrtc/modules/audio_coding/neteq/delay_manager.h"
20 #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" 19 #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h"
21 #include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" 20 #include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h"
22 #include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" 21 #include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h"
23 #include "webrtc/modules/audio_coding/neteq/expand.h" 22 #include "webrtc/modules/audio_coding/neteq/expand.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 PreemptiveExpandFactory* preemptive_expand_factory = 62 PreemptiveExpandFactory* preemptive_expand_factory =
64 new PreemptiveExpandFactory; 63 new PreemptiveExpandFactory;
65 return new NetEqImpl(config, std::move(tick_timer), buffer_level_filter, 64 return new NetEqImpl(config, std::move(tick_timer), buffer_level_filter,
66 decoder_database, delay_manager, delay_peak_detector, 65 decoder_database, delay_manager, delay_peak_detector,
67 dtmf_buffer, dtmf_tone_generator, packet_buffer, 66 dtmf_buffer, dtmf_tone_generator, packet_buffer,
68 payload_splitter, timestamp_scaler, accelerate_factory, 67 payload_splitter, timestamp_scaler, accelerate_factory,
69 expand_factory, preemptive_expand_factory); 68 expand_factory, preemptive_expand_factory);
70 } 69 }
71 70
72 } // namespace webrtc 71 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/decoder_database.h ('k') | webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698