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

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

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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/audio_decoder_impl.h" 11 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 14
15 #include "webrtc/base/checks.h"
15 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" 16 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
16 #include "webrtc/rtc_base/checks.h"
17 #ifdef WEBRTC_CODEC_G722 17 #ifdef WEBRTC_CODEC_G722
18 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" 18 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h"
19 #endif 19 #endif
20 #ifdef WEBRTC_CODEC_ILBC 20 #ifdef WEBRTC_CODEC_ILBC
21 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" 21 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
22 #endif 22 #endif
23 #ifdef WEBRTC_CODEC_ISACFX 23 #ifdef WEBRTC_CODEC_ISACFX
24 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h" // nogncheck 24 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h" // nogncheck
25 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isac fix.h" // nogncheck 25 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isac fix.h" // nogncheck
26 #endif 26 #endif
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 case NetEqDecoder::kDecoderArbitrary: { 79 case NetEqDecoder::kDecoderArbitrary: {
80 return true; 80 return true;
81 } 81 }
82 default: { 82 default: {
83 return false; 83 return false;
84 } 84 }
85 } 85 }
86 } 86 }
87 87
88 } // namespace webrtc 88 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/audio_decoder_impl.h ('k') | webrtc/modules/audio_coding/neteq/audio_multi_vector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698