zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ACMCodecDB private to RentACodec

Browse Source 
BUG=webrtc:5028

Review URL: https://codereview.webrtc.org/1414203010

Cr-Commit-Position: refs/heads/master@{#10549}
This commit is contained in:
kwiberg
2015-11-06 16:22:47 -08:00
committed by Commit bot
parent 566ef247b9
commit 39d8bee397
7 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_coding/main/acm2/acm_codec_database.h
View File

@ -27,7 +27,7 @@ namespace acm2 {
// TODO(tlegrand): replace class ACMCodecDB with a namespace. // TODO(tlegrand): replace class ACMCodecDB with a namespace.
class ACMCodecDB { class ACMCodecDB {
private: public:
// kMaxNumCodecs - Maximum number of codecs that can be activated in one // kMaxNumCodecs - Maximum number of codecs that can be activated in one
// build. // build.
// kMaxNumPacketSize - Maximum number of allowed packet sizes for one codec. // kMaxNumPacketSize - Maximum number of allowed packet sizes for one codec.
@ -74,8 +74,6 @@ class ACMCodecDB {
static const CodecInst database_[kMaxNumCodecs]; static const CodecInst database_[kMaxNumCodecs];
static const CodecSettings codec_settings_[kMaxNumCodecs]; static const CodecSettings codec_settings_[kMaxNumCodecs];
static const NetEqDecoder neteq_decoders_[kMaxNumCodecs]; static const NetEqDecoder neteq_decoders_[kMaxNumCodecs];
friend class RentACodec;
}; };
} // namespace acm2 } // namespace acm2

1
webrtc/modules/audio_coding/main/acm2/acm_receiver.h
View File

@ -19,7 +19,6 @@
#include "webrtc/common_audio/vad/include/webrtc_vad.h" #include "webrtc/common_audio/vad/include/webrtc_vad.h"
#include "webrtc/engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/main/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h" #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h"
#include "webrtc/modules/audio_coding/main/acm2/call_statistics.h" #include "webrtc/modules/audio_coding/main/acm2/call_statistics.h"
#include "webrtc/modules/audio_coding/main/acm2/initial_delay_manager.h" #include "webrtc/modules/audio_coding/main/acm2/initial_delay_manager.h"

1
webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc
View File

@ -16,7 +16,6 @@
#include "webrtc/base/scoped_ptr.h" #include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/audio_coding/main/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/include/audio_coding_module.h"
#include "webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h" #include "webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
#include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/test/test_suite.h" #include "webrtc/test/test_suite.h"

1
webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h
View File

@ -18,7 +18,6 @@
#include "webrtc/base/thread_annotations.h" #include "webrtc/base/thread_annotations.h"
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_receiver.h" #include "webrtc/modules/audio_coding/main/acm2/acm_receiver.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h" #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h"
#include "webrtc/modules/audio_coding/main/acm2/codec_manager.h" #include "webrtc/modules/audio_coding/main/acm2/codec_manager.h"

2
webrtc/modules/audio_coding/main/acm2/codec_manager.cc
View File

@ -12,7 +12,7 @@
#include "webrtc/base/checks.h" #include "webrtc/base/checks.h"
#include "webrtc/engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" #include "webrtc/modules/audio_coding/main/acm2/rent_a_codec.h"
#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/system_wrappers/include/trace.h"
namespace webrtc { namespace webrtc {

1
webrtc/modules/audio_coding/main/include/audio_coding_module.h
View File

@ -15,7 +15,6 @@
#include "webrtc/base/maybe.h" #include "webrtc/base/maybe.h"
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
#include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.h"
#include "webrtc/modules/audio_coding/neteq/include/neteq.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
#include "webrtc/modules/include/module.h" #include "webrtc/modules/include/module.h"

1
webrtc/modules/audio_coding/main/test/opus_test.cc
View File

@ -19,7 +19,6 @@
#include "webrtc/engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/codecs/opus/include/opus_interface.h" #include "webrtc/modules/audio_coding/codecs/opus/include/opus_interface.h"
#include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
#include "webrtc/modules/audio_coding/main/test/TestStereo.h" #include "webrtc/modules/audio_coding/main/test/TestStereo.h"
#include "webrtc/modules/audio_coding/main/test/utility.h" #include "webrtc/modules/audio_coding/main/test/utility.h"
#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/system_wrappers/include/trace.h"