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

Create ACM2 instance when calling AudioCodingModule::Create

Browse Source 
BUG=2996
R=turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12079005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5952 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2014-04-22 08:18:42 +00:00
parent 0a035c8924
commit 0c1444c748
6 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/audio_coding/main/acm2/acm_receiver.cc
View File

@ -23,6 +23,7 @@
#include "webrtc/modules/audio_coding/main/acm2/nack.h"
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
#include "webrtc/modules/audio_coding/neteq4/interface/neteq.h"
#include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/logging.h"
#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
@ -116,7 +117,7 @@ bool IsCng(int codec_id) {
} // namespace
AcmReceiver::AcmReceiver()
AcmReceiver::AcmReceiver(Clock* clock)
: id_(0),
neteq_config_(),
neteq_(NetEq::Create(neteq_config_)),
@ -128,6 +129,7 @@ AcmReceiver::AcmReceiver()
current_sample_rate_hz_(neteq_config_.sample_rate_hz),
nack_(),
nack_enabled_(false),
clock_(clock),
av_sync_(false),
initial_delay_manager_(),
missing_packets_sync_stream_(),
@ -817,7 +819,7 @@ uint32_t AcmReceiver::NowInTimestamp(int decoder_sampling_rate) const {
// We masked 6 most significant bits of 32-bit so there is no overflow in
// the conversion from milliseconds to timestamp.
const uint32_t now_in_ms = static_cast<uint32_t>(
TickTime::MillisecondTimestamp() & 0x03ffffff);
clock_->TimeInMilliseconds() & 0x03ffffff);
return static_cast<uint32_t>(
(decoder_sampling_rate / 1000) * now_in_ms);
}