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

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

Issue 2723253005: Fix cyclic deps: rent_a_codec<->audio_coding and rent_a_codec<->neteq (Closed)
Patch Set: Created 3 years, 9 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 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
13 13
14 #include <map> 14 #include <map>
15 #include <memory> 15 #include <memory>
16 #include <string> 16 #include <string>
17 17
18 #include "webrtc/api/audio_codecs/audio_decoder_factory.h" 18 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
19 #include "webrtc/api/audio_codecs/audio_format.h" 19 #include "webrtc/api/audio_codecs/audio_format.h"
20 #include "webrtc/base/constructormagic.h" 20 #include "webrtc/base/constructormagic.h"
21 #include "webrtc/base/scoped_ref_ptr.h"
21 #include "webrtc/common_types.h" // NULL 22 #include "webrtc/common_types.h" // NULL
22 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" 23 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
23 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h" 24 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
24 #include "webrtc/modules/audio_coding/neteq/packet.h" 25 #include "webrtc/modules/audio_coding/neteq/packet.h"
25 #include "webrtc/typedefs.h" 26 #include "webrtc/typedefs.h"
26 27
27 namespace webrtc { 28 namespace webrtc {
28 29
29 class DecoderDatabase { 30 class DecoderDatabase {
30 public: 31 public:
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 int active_decoder_type_; 232 int active_decoder_type_;
232 int active_cng_decoder_type_; 233 int active_cng_decoder_type_;
233 mutable std::unique_ptr<ComfortNoiseDecoder> active_cng_decoder_; 234 mutable std::unique_ptr<ComfortNoiseDecoder> active_cng_decoder_;
234 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 235 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
235 236
236 RTC_DISALLOW_COPY_AND_ASSIGN(DecoderDatabase); 237 RTC_DISALLOW_COPY_AND_ASSIGN(DecoderDatabase);
237 }; 238 };
238 239
239 } // namespace webrtc 240 } // namespace webrtc
240 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_ 241 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc ('k') | webrtc/modules/audio_coding/neteq/decoder_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698