generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to using AudioEncoderG722 instead of ACMG722

Browse Source 
This change switches from the old codec wrapper ACMG722 to the new
AudioEncodeG722 wrapped in an ACMGenericCodecWrapper.

BUG=4228
COAUTHOR=kwiberg@webrtc.org
R=tina.legrand@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8330}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8330 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2015-02-11 13:28:20 +00:00
parent 83bc721c7e
commit fddeaf5daa
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
View File

@@ -601,11 +601,9 @@ ACMGenericCodec* ACMCodecDB::CreateCodecInstance(const CodecInst& codec_inst,
#endif #endif
} else if (!STR_CASE_CMP(codec_inst.plname, "G722")) { } else if (!STR_CASE_CMP(codec_inst.plname, "G722")) {
#ifdef WEBRTC_CODEC_G722 #ifdef WEBRTC_CODEC_G722
if (codec_inst.channels == 1) { return new ACMGenericCodecWrapper(codec_inst, cng_pt_nb, cng_pt_wb,
return new ACMG722(kG722, enable_red); cng_pt_swb, cng_pt_fb, enable_red,
} else { red_payload_type);
return new ACMG722(kG722_2ch, enable_red);
}
#endif #endif
} else if (!STR_CASE_CMP(codec_inst.plname, "G7221")) { } else if (!STR_CASE_CMP(codec_inst.plname, "G7221")) {
switch (codec_inst.plfreq) { switch (codec_inst.plfreq) {