Using pcm16b for pcm little endian codec.

Add pcm 48khz stereo payload type.

Signed-off-by: jdai12 <[email protected]>
Change-Id: I12d95f6a8fabbef740e8ab4719a941c49d4a283b
Reviewed-on: https://git-ccr-1.devtools.intel.com/gerrit/56489
Reviewed-by: Duan, Xiande <[email protected]>
Tested-by: Duan, Xiande <[email protected]>

Author: daijh

webrtc/modules/audio_coding/acm2/acm_codec_database.cc

@@ -57,7 +57,7 @@ bool IsOpusRateValid(int rate) {
 }  // namespace
 
 // Not yet used payload-types.
-// 83,  82,  81, 80, 79,  78,  77,  76,  75,  74,  73,  72,  71,  70,  69, 68,
+// 82,  81, 80, 79,  78,  77,  76,  75,  74,  73,  72,  71,  70,  69, 68,
 // 67, 66, 65
 
 const CodecInst ACMCodecDB::database_[] = {
@@ -75,6 +75,7 @@ const CodecInst ACMCodecDB::database_[] = {
   {111, "L16", 8000, 80, 2, 128000},
   {112, "L16", 16000, 160, 2, 256000},
   {113, "L16", 32000, 320, 2, 512000},
+  {83, "L16", 48000, 480, 2, 768000},
   // G.711, PCM mu-law and A-law.
   // Mono
   {0, "PCMU", 8000, 160, 1, 64000},
@@ -133,6 +134,7 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
     {4, {80, 160, 240, 320}, 0, 2},
     {4, {160, 320, 480, 640}, 0, 2},
     {2, {320, 640}, 0, 2},
+    {2, {480, 960}, 0, 2},
     // G.711, PCM mu-law and A-law.
     // Mono
     {6, {80, 160, 240, 320, 400, 480}, 0, 2},
@@ -191,7 +193,7 @@ const NetEqDecoder ACMCodecDB::neteq_decoders_[] = {
     NetEqDecoder::kDecoderPCM16Bswb32kHz,
     // Stereo
     NetEqDecoder::kDecoderPCM16B_2ch, NetEqDecoder::kDecoderPCM16Bwb_2ch,
-    NetEqDecoder::kDecoderPCM16Bswb32kHz_2ch,
+    NetEqDecoder::kDecoderPCM16Bswb32kHz_2ch, NetEqDecoder::kDecoderPCM16Bswb48kHz_2ch,
     // G.711, PCM mu-las and A-law.
     // Mono
     NetEqDecoder::kDecoderPCMu, NetEqDecoder::kDecoderPCMa,

webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c

@@ -7,6 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
+#include <string.h>
 
 #include "pcm16b.h"
 
@@ -15,20 +16,28 @@
 size_t WebRtcPcm16b_Encode(const int16_t* speech,
                            size_t len,
                            uint8_t* encoded) {
+#if 0 // woogeen pcm16 littel endian
   size_t i;
   for (i = 0; i < len; ++i) {
     uint16_t s = speech[i];
     encoded[2 * i] = s >> 8;
     encoded[2 * i + 1] = s;
   }
+#else
+  memcpy(encoded, speech, 2 * len);
+#endif
   return 2 * len;
 }
 
 size_t WebRtcPcm16b_Decode(const uint8_t* encoded,
                            size_t len,
                            int16_t* speech) {
+#if 0 // woogeen pcm16 littel endian
   size_t i;
   for (i = 0; i < len / 2; ++i)
     speech[i] = encoded[2 * i] << 8 | encoded[2 * i + 1];
+#else
+  memcpy(speech, encoded, len);
+#endif
   return len / 2;
 }