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

pcm16b: Make input arrays const and use uint8_t[] for byte arrays

Browse Source 
There were both uint8 and uint16 versions of the pcm16b encode and
decode functions; this patch removes the latter.

BUG=909
R=henrik.lundin@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8309}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8309 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kwiberg@webrtc.org
2015-02-10 09:18:28 +00:00
parent 948d61724c
commit 648f5d6dc7
8 changed files with 40 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
View File

@ -20,63 +20,24 @@
extern "C" {
#endif
/****************************************************************************
* WebRtcPcm16b_EncodeW16(...)
*
* "Encode" a sample vector to 16 bit linear (Encoded standard is big endian)
*
* Input:
* - speechIn16b : Input speech vector
* - length_samples : Number of samples in speech vector
*
* Output:
* - speechOut16b : Encoded data vector (big endian 16 bit)
*
* Returned value : Size in bytes of speechOut16b
*/
int16_t WebRtcPcm16b_EncodeW16(const int16_t* speechIn16b,
int16_t length_samples,
int16_t* speechOut16b);
/****************************************************************************
* WebRtcPcm16b_Encode(...)
*
* "Encode" a sample vector to 16 bit linear (Encoded standard is big endian)
*
* Input:
* - speech16b : Input speech vector
* - len : Number of samples in speech vector
* - speech : Input speech vector
* - len : Number of samples in speech vector
*
* Output:
* - speech8b : Encoded data vector (big endian 16 bit)
* - encoded : Encoded data vector (big endian 16 bit)
*
* Returned value : Size in bytes of speech8b
* Returned value : Size in bytes of encoded
*/
int16_t WebRtcPcm16b_Encode(const int16_t* speech16b,
int16_t WebRtcPcm16b_Encode(const int16_t* speech,
int16_t len,
unsigned char* speech8b);
/****************************************************************************
* WebRtcPcm16b_DecodeW16(...)
*
* "Decode" a vector to 16 bit linear (Encoded standard is big endian)
*
* Input:
* - speechIn16b : Encoded data vector (big endian 16 bit)
* - length_bytes : Number of bytes in speechIn16b
*
* Output:
* - speechOut16b : Decoded speech vector
*
* Returned value : Samples in speechOut16b
*/
int16_t WebRtcPcm16b_DecodeW16(int16_t *speechIn16b,
int16_t length_bytes,
int16_t *speechOut16b,
int16_t* speechType);
uint8_t* encoded);
/****************************************************************************
* WebRtcPcm16b_Decode(...)
@ -84,19 +45,18 @@ int16_t WebRtcPcm16b_DecodeW16(int16_t *speechIn16b,
* "Decode" a vector to 16 bit linear (Encoded standard is big endian)
*
* Input:
* - speech8b : Encoded data vector (big endian 16 bit)
* - len : Number of bytes in speech8b
* - encoded : Encoded data vector (big endian 16 bit)
* - len : Number of bytes in encoded
*
* Output:
* - speech16b : Decoded speech vector
* - speech : Decoded speech vector
*
* Returned value : Samples in speech16b
* Returned value : Samples in speech
*/
int16_t WebRtcPcm16b_Decode(unsigned char *speech8b,
int16_t WebRtcPcm16b_Decode(const uint8_t* encoded,
int16_t len,
int16_t *speech16b);
int16_t* speech);
#ifdef __cplusplus
}

96
webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c
View File

@ -8,93 +8,27 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "pcm16b.h"
#include <stdlib.h>
#ifdef WEBRTC_ARCH_BIG_ENDIAN
#include <string.h>
#endif
#include "webrtc/typedefs.h"
#define HIGHEND 0xFF00
#define LOWEND 0xFF
/* Encoder with int16_t Output */
int16_t WebRtcPcm16b_EncodeW16(const int16_t* speechIn16b,
int16_t length_samples,
int16_t* speechOut16b)
{
#ifdef WEBRTC_ARCH_BIG_ENDIAN
memcpy(speechOut16b, speechIn16b, length_samples * sizeof(int16_t));
#else
int i;
for (i = 0; i < length_samples; i++) {
speechOut16b[i]=(((uint16_t)speechIn16b[i])>>8)|((((uint16_t)speechIn16b[i])<<8)&0xFF00);
}
#endif
return length_samples << 1;
}
/* Encoder with char Output (old version) */
int16_t WebRtcPcm16b_Encode(const int16_t *speech16b,
int16_t WebRtcPcm16b_Encode(const int16_t* speech,
int16_t len,
unsigned char *speech8b)
{
int16_t samples=len*2;
int16_t pos;
int16_t short1;
int16_t short2;
for (pos=0;pos<len;pos++) {
short1=HIGHEND & speech16b[pos];
short2=LOWEND & speech16b[pos];
short1=short1>>8;
speech8b[pos*2]=(unsigned char) short1;
speech8b[pos*2+1]=(unsigned char) short2;
}
return(samples);
uint8_t* encoded) {
int i;
for (i = 0; i < len; ++i) {
uint16_t s = speech[i];
encoded[2 * i] = s >> 8;
encoded[2 * i + 1] = s;
}
return 2 * len;
}
/* Decoder with int16_t Input instead of char when the int16_t Encoder is used */
int16_t WebRtcPcm16b_DecodeW16(int16_t *speechIn16b,
int16_t length_bytes,
int16_t *speechOut16b,
int16_t* speechType)
{
#ifdef WEBRTC_ARCH_BIG_ENDIAN
memcpy(speechOut16b, speechIn16b, length_bytes);
#else
int i;
int samples = length_bytes >> 1;
for (i=0;i<samples;i++) {
speechOut16b[i]=(((uint16_t)speechIn16b[i])>>8)|(((uint16_t)(speechIn16b[i]&0xFF))<<8);
}
#endif
*speechType=1;
return length_bytes >> 1;
}
/* "old" version of the decoder that uses char as input (not used in NetEq any more) */
int16_t WebRtcPcm16b_Decode(unsigned char *speech8b,
int16_t WebRtcPcm16b_Decode(const uint8_t* encoded,
int16_t len,
int16_t *speech16b)
{
int16_t samples=len>>1;
int16_t pos;
int16_t shortval;
for (pos=0;pos<samples;pos++) {
shortval=((unsigned short) speech8b[pos*2]);
shortval=(shortval<<8)&HIGHEND;
shortval=shortval|(((unsigned short) speech8b[pos*2+1])&LOWEND);
speech16b[pos]=shortval;
}
return(samples);
int16_t* speech) {
int i;
for (i = 0; i < len / 2; ++i)
speech[i] = encoded[2 * i] << 8 | encoded[2 * i + 1];
return len / 2;
}