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

48 kHz extension to iSAC.

Browse Source 
Test:
-manual test with voe_cmd_test.
-manual test with RTPEncode & NetEqRTPPlay.
-manual test with simpleKenny.
-Bit-exact test of iSAC-swb and iSAC-wb with head revision of trunk. The bit-exactness is confirmed on all files generated by running webrtc/modules/audio_coding/codecs/isac/main/test/QA/runiSACLongtest.txt
Review URL: https://webrtc-codereview.appspot.com/937025

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3226 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
turaj@webrtc.org
2012-12-03 17:43:52 +00:00
parent 0bacb635cb
commit b0dff12d2b
27 changed files with 340 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/modules/audio_coding/main/source/acm_codec_database.cc
View File

@ -107,10 +107,10 @@ namespace webrtc {
// codecs. Note! There are a limited number of payload types. If more codecs
// are defined they will receive reserved fixed payload types (values 69-95).
const int kDynamicPayloadtypes[ACMCodecDB::kMaxNumCodecs] = {
105, 107, 108, 109, 111, 112, 113, 114, 115, 116, 117, 92,
107, 108, 109, 111, 112, 113, 114, 115, 116, 117, 92,
91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80,
79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68,
67, 66
67, 66, 65
};
// Creates database with all supported codecs at compile time.
@ -129,6 +129,7 @@ const CodecInst ACMCodecDB::database_[] = {
{103, "ISAC", 16000, kIsacPacSize480, 1, kIsacWbDefaultRate},
# if (defined(WEBRTC_CODEC_ISAC))
{104, "ISAC", 32000, kIsacPacSize960, 1, kIsacSwbDefaultRate},
{105, "ISAC", 48000, kIsacPacSize1440, 1, kIsacSwbDefaultRate},
# endif
#endif
#ifdef WEBRTC_CODEC_PCM16
@ -221,6 +222,7 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
{2, {kIsacPacSize480, kIsacPacSize960}, 0, 1},
# if (defined(WEBRTC_CODEC_ISAC))
{1, {kIsacPacSize960}, 0, 1},
{1, {kIsacPacSize1440}, 0, 1},
# endif
#endif
#ifdef WEBRTC_CODEC_PCM16
@ -311,6 +313,7 @@ const WebRtcNetEQDecoder ACMCodecDB::neteq_decoders_[] = {
kDecoderISAC,
# if (defined(WEBRTC_CODEC_ISAC))
kDecoderISACswb,
kDecoderISACfb,
# endif
#endif
#ifdef WEBRTC_CODEC_PCM16

2
webrtc/modules/audio_coding/main/source/acm_codec_database.h
View File

@ -33,6 +33,7 @@ class ACMCodecDB {
, kISAC
# if (defined(WEBRTC_CODEC_ISAC))
, kISACSWB
, kISACFB
# endif
#endif
#ifdef WEBRTC_CODEC_PCM16
@ -115,6 +116,7 @@ class ACMCodecDB {
// Set unsupported codecs to -1
#ifndef WEBRTC_CODEC_ISAC
enum {kISACSWB = -1};
enum {kISACFB = -1};
# ifndef WEBRTC_CODEC_ISACFX
enum {kISAC = -1};
# endif

1
webrtc/modules/audio_coding/main/source/acm_common_defs.h
View File

@ -54,6 +54,7 @@ const int kIsacWbDefaultRate = 32000;
const int kIsacSwbDefaultRate = 56000;
const int kIsacPacSize480 = 480;
const int kIsacPacSize960 = 960;
const int kIsacPacSize1440 = 1440;
// An encoded bit-stream is labeled by one of the following enumerators.
//

61
webrtc/modules/audio_coding/main/source/acm_isac.cc
View File

@ -465,7 +465,8 @@ WebRtc_Word16 ACMISAC::InternalInitDecoder(WebRtcACMCodecParams* codecParams) {
}
// set decoder sampling frequency.
if (codecParams->codecInstant.plfreq == 32000) {
if (codecParams->codecInstant.plfreq == 32000 ||
codecParams->codecInstant.plfreq == 48000) {
UpdateDecoderSampFreq(ACMCodecDB::kISACSWB);
} else {
UpdateDecoderSampFreq(ACMCodecDB::kISAC);
@ -556,9 +557,17 @@ WebRtc_Word32 ACMISAC::CodecDef(WebRtcNetEQ_CodecDef& codecDef,
#endif
} else {
#ifdef WEBRTC_CODEC_ISAC
SET_CODEC_PAR((codecDef), kDecoderISACswb, codecInst.pltype,
_codecInstPtr->inst, 32000);
SET_ISACSWB_FUNCTIONS((codecDef));
// Decoder is either @ 16 kHz or 32 kHz. Even if encoder is set @ 48 kHz
// decoding is @ 32 kHz.
if (codecInst.plfreq == 32000) {
SET_CODEC_PAR((codecDef), kDecoderISACswb, codecInst.pltype,
_codecInstPtr->inst, 32000);
SET_ISACSWB_FUNCTIONS((codecDef));
} else {
SET_CODEC_PAR((codecDef), kDecoderISACfb, codecInst.pltype,
_codecInstPtr->inst, 32000);
SET_ISACFB_FUNCTIONS((codecDef));
}
#else
return -1;
#endif
@ -659,7 +668,7 @@ WebRtc_Word16 ACMISAC::SetBitRateSafe(WebRtc_Word32 bitRate) {
WebRtc_Word32 ACMISAC::GetEstimatedBandwidthSafe() {
WebRtc_Word16 bandwidthIndex = 0;
WebRtc_Word16 delayIndex = 0;
IsacSamplingRate sampRate;
int sampRate;
// Get bandwidth information
ACM_ISAC_GETSENDBWE(_codecInstPtr->inst, &bandwidthIndex, &delayIndex);
@ -671,7 +680,7 @@ WebRtc_Word32 ACMISAC::GetEstimatedBandwidthSafe() {
// Check sample frequency
sampRate = ACM_ISAC_GETDECSAMPRATE(_codecInstPtr->inst);
if (sampRate == kIsacWideband) {
if (sampRate == 16000) {
return isacRatesWB[bandwidthIndex];
} else {
return isacRatesSWB[bandwidthIndex];
@ -680,13 +689,13 @@ WebRtc_Word32 ACMISAC::GetEstimatedBandwidthSafe() {
WebRtc_Word32 ACMISAC::SetEstimatedBandwidthSafe(
WebRtc_Word32 estimatedBandwidth) {
IsacSamplingRate sampRate;
int sampRate;
WebRtc_Word16 bandwidthIndex;
// Check sample frequency and choose appropriate table
sampRate = ACM_ISAC_GETENCSAMPRATE(_codecInstPtr->inst);
if (sampRate == kIsacWideband) {
if (sampRate == 16000) {
// Search through the WB rate table to find the index
bandwidthIndex = NR_ISAC_BANDWIDTHS / 2 - 1;
for (int i = 0; i < (NR_ISAC_BANDWIDTHS / 2); i++) {
@ -738,10 +747,12 @@ WebRtc_Word32 ACMISAC::GetRedPayloadSafe(
WebRtc_Word16 ACMISAC::UpdateDecoderSampFreq(
#ifdef WEBRTC_CODEC_ISAC
WebRtc_Word16 codecId) {
// The decoder supports only wideband and super-wideband.
if (ACMCodecDB::kISAC == codecId) {
return WebRtcIsac_SetDecSampRate(_codecInstPtr->inst, kIsacWideband);
} else if (ACMCodecDB::kISACSWB == codecId) {
return WebRtcIsac_SetDecSampRate(_codecInstPtr->inst, kIsacSuperWideband);
return WebRtcIsac_SetDecSampRate(_codecInstPtr->inst, 16000);
} else if (ACMCodecDB::kISACSWB == codecId ||
ACMCodecDB::kISACFB == codecId) {
return WebRtcIsac_SetDecSampRate(_codecInstPtr->inst, 32000);
} else {
return -1;
}
@ -758,24 +769,18 @@ WebRtc_Word16 ACMISAC::UpdateEncoderSampFreq(
EncoderSampFreq(currentSampRateHz);
if (currentSampRateHz != encoderSampFreqHz) {
if ((encoderSampFreqHz != 16000) && (encoderSampFreqHz != 32000)) {
if ((encoderSampFreqHz != 16000) && (encoderSampFreqHz != 32000) &&
(encoderSampFreqHz != 48000)) {
return -1;
} else {
_inAudioIxRead = 0;
_inAudioIxWrite = 0;
_inTimestampIxWrite = 0;
if (encoderSampFreqHz == 16000) {
if (WebRtcIsac_SetEncSampRate(_codecInstPtr->inst, kIsacWideband) < 0) {
return -1;
}
_samplesIn10MsAudio = 160;
} else {
if (WebRtcIsac_SetEncSampRate(_codecInstPtr->inst, kIsacSuperWideband)
< 0) {
return -1;
}
_samplesIn10MsAudio = 320;
if (WebRtcIsac_SetEncSampRate(_codecInstPtr->inst,
encoderSampFreqHz) < 0) {
return -1;
}
_samplesIn10MsAudio = encoderSampFreqHz / 100;
_frameLenSmpl = ACM_ISAC_GETNEWFRAMELEN(_codecInstPtr->inst);
_encoderParams.codecInstant.pacsize = _frameLenSmpl;
_encoderParams.codecInstant.plfreq = encoderSampFreqHz;
@ -789,13 +794,7 @@ WebRtc_Word16 ACMISAC::UpdateEncoderSampFreq(
}
WebRtc_Word16 ACMISAC::EncoderSampFreq(WebRtc_UWord16& sampFreqHz) {
IsacSamplingRate sampRate;
sampRate = ACM_ISAC_GETENCSAMPRATE(_codecInstPtr->inst);
if (sampRate == kIsacSuperWideband) {
sampFreqHz = 32000;
} else {
sampFreqHz = 16000;
}
sampFreqHz = ACM_ISAC_GETENCSAMPRATE(_codecInstPtr->inst);
return 0;
}
@ -809,7 +808,7 @@ WebRtc_Word32 ACMISAC::ConfigISACBandwidthEstimator(
// TODO(turajs): at 32kHz we hardcode calling with 30ms and enforce
// the frame-size otherwise we might get error. Revise if
// control-bwe is changed.
if (sampFreqHz == 32000) {
if (sampFreqHz == 32000 || sampFreqHz == 48000) {
status = ACM_ISAC_CONTROL_BWE(_codecInstPtr->inst, initRateBitPerSec, 30,
1);
} else {