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

Side by Side Diff: webrtc/modules/audio_coding/neteq/decoder_database.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/decoder_database.h" 11 #include "webrtc/modules/audio_coding/neteq/decoder_database.h"
12 12
13 #include <utility> // pair 13 #include <utility> // pair
14 14
15 #include "webrtc/api/audio_codecs/audio_decoder.h" 15 #include "webrtc/api/audio_codecs/audio_decoder.h"
16 #include "webrtc/rtc_base/checks.h" 16 #include "webrtc/base/checks.h"
17 #include "webrtc/rtc_base/logging.h" 17 #include "webrtc/base/logging.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 DecoderDatabase::DecoderDatabase( 21 DecoderDatabase::DecoderDatabase(
22 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory) 22 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory)
23 : active_decoder_type_(-1), 23 : active_decoder_type_(-1),
24 active_cng_decoder_type_(-1), 24 active_cng_decoder_type_(-1),
25 decoder_factory_(decoder_factory) {} 25 decoder_factory_(decoder_factory) {}
26 26
27 DecoderDatabase::~DecoderDatabase() = default; 27 DecoderDatabase::~DecoderDatabase() = default;
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 // Payload type is not found. 346 // Payload type is not found.
347 LOG(LS_WARNING) << "CheckPayloadTypes: unknown RTP payload type " 347 LOG(LS_WARNING) << "CheckPayloadTypes: unknown RTP payload type "
348 << static_cast<int>(it->payload_type); 348 << static_cast<int>(it->payload_type);
349 return kDecoderNotFound; 349 return kDecoderNotFound;
350 } 350 }
351 } 351 }
352 return kOK; 352 return kOK;
353 } 353 }
354 354
355 } // namespace webrtc 355 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/decoder_database.h ('k') | webrtc/modules/audio_coding/neteq/delay_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698