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

Side by Side Diff: webrtc/modules/audio_coding/neteq/audio_classifier.h

Issue 1697823002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/neteq/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-codecs
Patch Set: 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
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc » ('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 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_
13 13
14 extern "C" { 14 extern "C" {
15 #include "celt.h" 15 #include "celt.h"
16 #include "analysis.h" 16 #include "analysis.h"
17 #include "opus_private.h" 17 #include "opus_private.h"
18 } 18 }
19 19
20 #include "webrtc/base/scoped_ptr.h"
21 #include "webrtc/typedefs.h" 20 #include "webrtc/typedefs.h"
22 21
23 namespace webrtc { 22 namespace webrtc {
24 23
25 // This class provides a speech/music classification and is a wrapper over the 24 // This class provides a speech/music classification and is a wrapper over the
26 // Opus classifier. It currently only supports 48 kHz mono or stereo with a 25 // Opus classifier. It currently only supports 48 kHz mono or stereo with a
27 // frame size of 20 ms. 26 // frame size of 20 ms.
28 27
29 class AudioClassifier { 28 class AudioClassifier {
30 public: 29 public:
(...skipping 15 matching lines...) Expand all
46 AnalysisInfo analysis_info_; 45 AnalysisInfo analysis_info_;
47 bool is_music_; 46 bool is_music_;
48 float music_probability_; 47 float music_probability_;
49 const CELTMode* celt_mode_; 48 const CELTMode* celt_mode_;
50 TonalityAnalysisState analysis_state_; 49 TonalityAnalysisState analysis_state_;
51 }; 50 };
52 51
53 } // namespace webrtc 52 } // namespace webrtc
54 53
55 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ 54 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698