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

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

Issue 1438663003: modules/audio_coding: Remove some codec include dirs (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase again Created 5 years, 1 month 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/comfort_noise.h" 11 #include "webrtc/modules/audio_coding/neteq/comfort_noise.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 14
15 #include "webrtc/base/logging.h" 15 #include "webrtc/base/logging.h"
16 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" 16 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
17 #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h" 17 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
18 #include "webrtc/modules/audio_coding/neteq/decoder_database.h" 18 #include "webrtc/modules/audio_coding/neteq/decoder_database.h"
19 #include "webrtc/modules/audio_coding/neteq/dsp_helper.h" 19 #include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
20 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" 20 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 void ComfortNoise::Reset() { 24 void ComfortNoise::Reset() {
25 first_call_ = true; 25 first_call_ = true;
26 internal_error_code_ = 0; 26 internal_error_code_ = 0;
27 } 27 }
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 } 130 }
131 // Remove |overlap_length_| samples from the front of |output| since they 131 // Remove |overlap_length_| samples from the front of |output| since they
132 // were mixed into |sync_buffer_| above. 132 // were mixed into |sync_buffer_| above.
133 output->PopFront(overlap_length_); 133 output->PopFront(overlap_length_);
134 } 134 }
135 first_call_ = false; 135 first_call_ = false;
136 return kOK; 136 return kOK;
137 } 137 }
138 138
139 } // namespace webrtc 139 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698