| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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_MAIN_ACM2_CODEC_OWNER_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_OWNER_H_ |
| 12 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_OWNER_H_ | 12 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_OWNER_H_ |
| 13 | 13 |
| 14 #include "webrtc/base/constructormagic.h" | 14 #include "webrtc/base/constructormagic.h" |
| 15 #include "webrtc/base/scoped_ptr.h" | 15 #include "webrtc/base/scoped_ptr.h" |
| 16 #include "webrtc/common_types.h" | 16 #include "webrtc/common_types.h" |
| 17 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" | 17 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" |
| 18 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" | 18 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" |
| 19 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedef
s.h" | 19 #include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.
h" |
| 20 | 20 |
| 21 #if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX) | 21 #if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX) |
| 22 #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h" | 22 #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h" |
| 23 #else | 23 #else |
| 24 // Dummy implementation, for when we don't have iSAC. | 24 // Dummy implementation, for when we don't have iSAC. |
| 25 namespace webrtc { | 25 namespace webrtc { |
| 26 class LockedIsacBandwidthInfo {}; | 26 class LockedIsacBandwidthInfo {}; |
| 27 } | 27 } |
| 28 #endif | 28 #endif |
| 29 | 29 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 // are active. | 77 // are active. |
| 78 rtc::scoped_ptr<AudioEncoder> cng_encoder_; | 78 rtc::scoped_ptr<AudioEncoder> cng_encoder_; |
| 79 rtc::scoped_ptr<AudioEncoder> red_encoder_; | 79 rtc::scoped_ptr<AudioEncoder> red_encoder_; |
| 80 | 80 |
| 81 RTC_DISALLOW_COPY_AND_ASSIGN(CodecOwner); | 81 RTC_DISALLOW_COPY_AND_ASSIGN(CodecOwner); |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 } // namespace acm2 | 84 } // namespace acm2 |
| 85 } // namespace webrtc | 85 } // namespace webrtc |
| 86 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_OWNER_H_ | 86 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_OWNER_H_ |
| OLD | NEW |