9b8102cf0e
This test has been failing every now and then. This is likely due to the random input that was used. With this change, the input is now read from an audio file, making it identical on each run. The encoding is moved to inside the main test loop, so that new data is added with each packet. (Before this change, the same payload was added over and over again; only the RTP header was updated.) BUG=3715 R=turaj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/19079004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6948 4adac7df-926f-26a2-2b94-8c16560cd09d
106 lines
2.8 KiB
C
106 lines
2.8 KiB
C
/*
|
|
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#include "pcm16b.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "typedefs.h"
|
|
|
|
#ifdef WEBRTC_ARCH_BIG_ENDIAN
|
|
#include "signal_processing_library.h"
|
|
#endif
|
|
|
|
#define HIGHEND 0xFF00
|
|
#define LOWEND 0xFF
|
|
|
|
|
|
|
|
/* Encoder with int16_t Output */
|
|
int16_t WebRtcPcm16b_EncodeW16(const int16_t* speechIn16b,
|
|
int16_t len,
|
|
int16_t* speechOut16b)
|
|
{
|
|
#ifdef WEBRTC_ARCH_BIG_ENDIAN
|
|
WEBRTC_SPL_MEMCPY_W16(speechOut16b, speechIn16b, len);
|
|
#else
|
|
int i;
|
|
for (i=0;i<len;i++) {
|
|
speechOut16b[i]=(((uint16_t)speechIn16b[i])>>8)|((((uint16_t)speechIn16b[i])<<8)&0xFF00);
|
|
}
|
|
#endif
|
|
return(len<<1);
|
|
}
|
|
|
|
|
|
/* Encoder with char Output (old version) */
|
|
int16_t WebRtcPcm16b_Encode(int16_t *speech16b,
|
|
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);
|
|
}
|
|
|
|
|
|
/* Decoder with int16_t Input instead of char when the int16_t Encoder is used */
|
|
int16_t WebRtcPcm16b_DecodeW16(void *inst,
|
|
int16_t *speechIn16b,
|
|
int16_t len,
|
|
int16_t *speechOut16b,
|
|
int16_t* speechType)
|
|
{
|
|
#ifdef WEBRTC_ARCH_BIG_ENDIAN
|
|
WEBRTC_SPL_MEMCPY_W8(speechOut16b, speechIn16b, ((len*sizeof(int16_t)+1)>>1));
|
|
#else
|
|
int i;
|
|
int samples=len>>1;
|
|
|
|
for (i=0;i<samples;i++) {
|
|
speechOut16b[i]=(((uint16_t)speechIn16b[i])>>8)|(((uint16_t)(speechIn16b[i]&0xFF))<<8);
|
|
}
|
|
#endif
|
|
|
|
*speechType=1;
|
|
|
|
// Avoid warning.
|
|
(void)(inst = NULL);
|
|
|
|
return(len>>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 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);
|
|
}
|