generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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;
}

8
webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc
View File

@ -75,11 +75,9 @@ AudioDecoderPcm16B::AudioDecoderPcm16B() {}
int AudioDecoderPcm16B::Decode(const uint8_t* encoded, size_t encoded_len,
int16_t* decoded, SpeechType* speech_type) {
int16_t temp_type = 1; // Default is speech.
int16_t ret = WebRtcPcm16b_DecodeW16(
reinterpret_cast<int16_t*>(const_cast<uint8_t*>(encoded)),
static_cast<int16_t>(encoded_len), decoded, &temp_type);
*speech_type = ConvertSpeechType(temp_type);
int16_t ret =
WebRtcPcm16b_Decode(encoded, static_cast<int16_t>(encoded_len), decoded);
*speech_type = ConvertSpeechType(1);
return ret;
}

8
webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
View File

@ -31,11 +31,9 @@ class ExternalPcm16B : public AudioDecoder {
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
int16_t* decoded, SpeechType* speech_type) {
int16_t temp_type;
int16_t ret = WebRtcPcm16b_DecodeW16(
reinterpret_cast<int16_t*>(const_cast<uint8_t*>(encoded)),
static_cast<int16_t>(encoded_len), decoded, &temp_type);
*speech_type = ConvertSpeechType(temp_type);
int16_t ret = WebRtcPcm16b_Decode(
encoded, static_cast<int16_t>(encoded_len), decoded);
*speech_type = ConvertSpeechType(1);
return ret;
}

6
webrtc/modules/audio_coding/neteq/neteq_unittest.cc
View File

@ -912,10 +912,8 @@ class NetEqBgnTest : public NetEqDecodingTest {
uint32_t receive_timestamp = 0;
for (int n = 0; n < 10; ++n) { // Insert few packets and get audio.
int16_t enc_len_bytes =
WebRtcPcm16b_EncodeW16(input.GetNextBlock(),
expected_samples_per_channel,
reinterpret_cast<int16_t*>(payload));
int16_t enc_len_bytes = WebRtcPcm16b_Encode(
input.GetNextBlock(), expected_samples_per_channel, payload);
ASSERT_EQ(enc_len_bytes, expected_samples_per_channel * 2);
number_channels = 0;

2
webrtc/modules/audio_coding/neteq/test/RTPencode.cc
View File

@ -1569,7 +1569,7 @@ int NetEQTest_encode(int coder, int16_t *indata, int frameLen, unsigned char * e
#ifdef CODEC_PCM16B
else if ((coder==webrtc::kDecoderPCM16B)||(coder==webrtc::kDecoderPCM16Bwb)||
(coder==webrtc::kDecoderPCM16Bswb32kHz)||(coder==webrtc::kDecoderPCM16Bswb48kHz)) { /*pcm16b (8kHz, 16kHz, 32kHz or 48kHz) */
cdlen = WebRtcPcm16b_EncodeW16(indata, frameLen, (int16_t*) encoded);
cdlen = WebRtcPcm16b_Encode(indata, frameLen, encoded);
}
#endif
#ifdef CODEC_G722

7
webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.cc
View File

@ -31,7 +31,7 @@ ConstantPcmPacketSource::ConstantPcmPacketSource(size_t payload_len_samples,
seq_number_(0),
timestamp_(0),
payload_ssrc_(0xABCD1234) {
int encoded_len = WebRtcPcm16b_EncodeW16(&sample_value, 1, &encoded_sample_);
int encoded_len = WebRtcPcm16b_Encode(&sample_value, 1, encoded_sample_);
CHECK_EQ(encoded_len, 2);
}
@ -39,9 +39,8 @@ Packet* ConstantPcmPacketSource::NextPacket() {
CHECK_GT(packet_len_bytes_, kHeaderLenBytes);
uint8_t* packet_memory = new uint8_t[packet_len_bytes_];
// Fill the payload part of the packet memory with the pre-encoded value.
std::fill_n(reinterpret_cast<int16_t*>(packet_memory + kHeaderLenBytes),
payload_len_samples_,
encoded_sample_);
for (unsigned i = 0; i < 2 * payload_len_samples_; ++i)
packet_memory[kHeaderLenBytes + i] = encoded_sample_[i % 2];
WriteHeader(packet_memory);
// |packet| assumes ownership of |packet_memory|.
Packet* packet =

2
webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h
View File

@ -41,7 +41,7 @@ class ConstantPcmPacketSource : public PacketSource {
const size_t kHeaderLenBytes = 12;
const size_t payload_len_samples_;
const size_t packet_len_bytes_;
int16_t encoded_sample_;
uint8_t encoded_sample_[2];
const int samples_per_ms_;
double next_arrival_time_ms_;
const int payload_type_;