532f3dc548
First patch set is the same as patch set 3 of http://review.webrtc.org/2237004/ -Make ACM1 to depend on ACM2. -Remove APIs to set and get background noise mode. There is no VoE call to these APIs. -Remove APIs to set and get receive side VAD mode. There is no VoE call to these APIs, and NetEq 4, doesn't support them. -Remove callback for in-band DTMF detection. ACM doesn't support in-band DTMF detection. -Use acm_common_defs.h everywhere required. -Complete ACM factory method. -Update ACMCodecDatabase of ACM2. CNG full-band need to be define-guarded. Remove dynamic payload-type assignment. BUG= R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2249004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4785 4adac7df-926f-26a2-2b94-8c16560cd09d
151 lines
4.2 KiB
C++
151 lines
4.2 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/modules/audio_coding/main/source/acm_cng.h"
|
|
|
|
#include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
|
|
#include "webrtc/modules/audio_coding/main/source/acm_codec_database.h"
|
|
#include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h"
|
|
#include "webrtc/modules/audio_coding/main/source/acm_neteq.h"
|
|
#include "webrtc/modules/audio_coding/neteq/interface/webrtc_neteq.h"
|
|
#include "webrtc/modules/audio_coding/neteq/interface/webrtc_neteq_help_macros.h"
|
|
#include "webrtc/system_wrappers/interface/trace.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace acm1 {
|
|
|
|
ACMCNG::ACMCNG(int16_t codec_id) {
|
|
encoder_inst_ptr_ = NULL;
|
|
decoder_inst_ptr_ = NULL;
|
|
codec_id_ = codec_id;
|
|
samp_freq_hz_ = ACMCodecDB::CodecFreq(codec_id_);
|
|
return;
|
|
}
|
|
|
|
ACMCNG::~ACMCNG() {
|
|
if (encoder_inst_ptr_ != NULL) {
|
|
WebRtcCng_FreeEnc(encoder_inst_ptr_);
|
|
encoder_inst_ptr_ = NULL;
|
|
}
|
|
if (decoder_inst_ptr_ != NULL) {
|
|
WebRtcCng_FreeDec(decoder_inst_ptr_);
|
|
decoder_inst_ptr_ = NULL;
|
|
}
|
|
return;
|
|
}
|
|
|
|
// CNG is not like a regular encoder, this function
|
|
// should not be called normally
|
|
// instead the following function is called from inside
|
|
// ACMGenericCodec::ProcessFrameVADDTX
|
|
int16_t ACMCNG::InternalEncode(uint8_t* /* bitstream */,
|
|
int16_t* /* bitstream_len_byte */) {
|
|
return -1;
|
|
}
|
|
|
|
int16_t ACMCNG::DecodeSafe(uint8_t* /* bitstream */,
|
|
int16_t /* bitstream_len_byte */,
|
|
int16_t* /* audio */,
|
|
int16_t* /* audio_samples */,
|
|
int8_t* /* speech_type */) {
|
|
return 0;
|
|
}
|
|
|
|
// CNG is not like a regular encoder,
|
|
// this function should not be called normally
|
|
// instead the following function is called from inside
|
|
// ACMGenericCodec::ProcessFrameVADDTX
|
|
int16_t ACMCNG::InternalInitEncoder(
|
|
WebRtcACMCodecParams* /* codec_params */) {
|
|
return -1;
|
|
}
|
|
|
|
int16_t ACMCNG::InternalInitDecoder(
|
|
WebRtcACMCodecParams* /* codec_params */) {
|
|
return WebRtcCng_InitDec(decoder_inst_ptr_);
|
|
}
|
|
|
|
int32_t ACMCNG::CodecDef(WebRtcNetEQ_CodecDef& codec_def,
|
|
const CodecInst& codec_inst) {
|
|
if (!decoder_initialized_) {
|
|
// TODO(tlegrand): log error
|
|
return -1;
|
|
}
|
|
// Fill up the structure by calling
|
|
// "SET_CODEC_PAR" & "SET_CNG_FUNCTION."
|
|
// Then return the structure back to NetEQ to add the codec to it's
|
|
// database.
|
|
|
|
if (samp_freq_hz_ == 8000 || samp_freq_hz_ == 16000 ||
|
|
samp_freq_hz_ == 32000 || samp_freq_hz_ == 48000) {
|
|
SET_CODEC_PAR((codec_def), kDecoderCNG, codec_inst.pltype,
|
|
decoder_inst_ptr_, samp_freq_hz_);
|
|
SET_CNG_FUNCTIONS((codec_def));
|
|
return 0;
|
|
} else {
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
ACMGenericCodec* ACMCNG::CreateInstance(void) {
|
|
return NULL;
|
|
}
|
|
|
|
int16_t ACMCNG::InternalCreateEncoder() {
|
|
if (WebRtcCng_CreateEnc(&encoder_inst_ptr_) < 0) {
|
|
encoder_inst_ptr_ = NULL;
|
|
return -1;
|
|
} else {
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
void ACMCNG::DestructEncoderSafe() {
|
|
if (encoder_inst_ptr_ != NULL) {
|
|
WebRtcCng_FreeEnc(encoder_inst_ptr_);
|
|
encoder_inst_ptr_ = NULL;
|
|
}
|
|
encoder_exist_ = false;
|
|
encoder_initialized_ = false;
|
|
}
|
|
|
|
int16_t ACMCNG::InternalCreateDecoder() {
|
|
if (WebRtcCng_CreateDec(&decoder_inst_ptr_) < 0) {
|
|
decoder_inst_ptr_ = NULL;
|
|
return -1;
|
|
} else {
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
void ACMCNG::DestructDecoderSafe() {
|
|
if (decoder_inst_ptr_ != NULL) {
|
|
WebRtcCng_FreeDec(decoder_inst_ptr_);
|
|
decoder_inst_ptr_ = NULL;
|
|
}
|
|
decoder_exist_ = false;
|
|
decoder_initialized_ = false;
|
|
}
|
|
|
|
void ACMCNG::InternalDestructEncoderInst(void* ptr_inst) {
|
|
if (ptr_inst != NULL) {
|
|
WebRtcCng_FreeEnc(static_cast<CNG_enc_inst*>(ptr_inst));
|
|
}
|
|
return;
|
|
}
|
|
|
|
int16_t ACMCNG::EnableDTX() { return -1; }
|
|
int16_t ACMCNG::DisableDTX() { return -1; }
|
|
|
|
} // namespace acm1
|
|
|
|
} // namespace webrtc
|