| 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_MANAGER_H_ |  11 #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_ | 
|  12 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_ |  12 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_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/base/thread_checker.h" |  16 #include "webrtc/base/thread_checker.h" | 
|  17 #include "webrtc/modules/audio_coding/main/acm2/codec_owner.h" |  17 #include "webrtc/modules/audio_coding/main/acm2/codec_owner.h" | 
|  18 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedef
    s.h" |  18 #include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.
    h" | 
|  19 #include "webrtc/common_types.h" |  19 #include "webrtc/common_types.h" | 
|  20  |  20  | 
|  21 namespace webrtc { |  21 namespace webrtc { | 
|  22  |  22  | 
|  23 class AudioDecoder; |  23 class AudioDecoder; | 
|  24 class AudioEncoder; |  24 class AudioEncoder; | 
|  25  |  25  | 
|  26 namespace acm2 { |  26 namespace acm2 { | 
|  27  |  27  | 
|  28 class CodecManager final { |  28 class CodecManager final { | 
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  81   bool codec_fec_enabled_; |  81   bool codec_fec_enabled_; | 
|  82   CodecOwner codec_owner_; |  82   CodecOwner codec_owner_; | 
|  83   bool encoder_is_opus_; |  83   bool encoder_is_opus_; | 
|  84  |  84  | 
|  85   RTC_DISALLOW_COPY_AND_ASSIGN(CodecManager); |  85   RTC_DISALLOW_COPY_AND_ASSIGN(CodecManager); | 
|  86 }; |  86 }; | 
|  87  |  87  | 
|  88 }  // namespace acm2 |  88 }  // namespace acm2 | 
|  89 }  // namespace webrtc |  89 }  // namespace webrtc | 
|  90 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_ |  90 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_ | 
| OLD | NEW |