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

WebRtc_Word32 => int32_t etc. in audio_coding/

Browse Source 
BUG=314

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3789 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-04-09 00:28:06 +00:00
parent 6faf71d27b
commit 0946a56023
382 changed files with 8469 additions and 8488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
webrtc/modules/audio_coding/codecs/ilbc/pack_bits.c
View File

@ -23,24 +23,24 @@
*---------------------------------------------------------------*/
void WebRtcIlbcfix_PackBits(
WebRtc_UWord16 *bitstream, /* (o) The packetized bitstream */
uint16_t *bitstream, /* (o) The packetized bitstream */
iLBC_bits *enc_bits, /* (i) Encoded bits */
WebRtc_Word16 mode /* (i) Codec mode (20 or 30) */
int16_t mode /* (i) Codec mode (20 or 30) */
){
WebRtc_UWord16 *bitstreamPtr;
uint16_t *bitstreamPtr;
int i, k;
WebRtc_Word16 *tmpPtr;
int16_t *tmpPtr;
bitstreamPtr=bitstream;
/* Class 1 bits of ULP */
/* First WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)enc_bits->lsf[0])<<10; /* Bit 0..5 */
/* First int16_t */
(*bitstreamPtr) = ((uint16_t)enc_bits->lsf[0])<<10; /* Bit 0..5 */
(*bitstreamPtr) |= (enc_bits->lsf[1])<<3; /* Bit 6..12 */
(*bitstreamPtr) |= (enc_bits->lsf[2]&0x70)>>4; /* Bit 13..15 */
bitstreamPtr++;
/* Second WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)enc_bits->lsf[2]&0xF)<<12; /* Bit 0..3 */
/* Second int16_t */
(*bitstreamPtr) = ((uint16_t)enc_bits->lsf[2]&0xF)<<12; /* Bit 0..3 */
if (mode==20) {
(*bitstreamPtr) |= (enc_bits->startIdx)<<10; /* Bit 4..5 */
@ -48,7 +48,7 @@ void WebRtcIlbcfix_PackBits(
(*bitstreamPtr) |= (enc_bits->idxForMax)<<3; /* Bit 7..12 */
(*bitstreamPtr) |= ((enc_bits->cb_index[0])&0x70)>>4; /* Bit 13..15 */
bitstreamPtr++;
/* Third WebRtc_Word16 */
/* Third int16_t */
(*bitstreamPtr) = ((enc_bits->cb_index[0])&0xE)<<12; /* Bit 0..2 */
(*bitstreamPtr) |= ((enc_bits->gain_index[0])&0x18)<<8; /* Bit 3..4 */
(*bitstreamPtr) |= ((enc_bits->gain_index[1])&0x8)<<7; /* Bit 5 */
@ -60,15 +60,15 @@ void WebRtcIlbcfix_PackBits(
(*bitstreamPtr) |= (enc_bits->lsf[3])<<6; /* Bit 4..9 */
(*bitstreamPtr) |= (enc_bits->lsf[4]&0x7E)>>1; /* Bit 10..15 */
bitstreamPtr++;
/* Third WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)enc_bits->lsf[4]&0x1)<<15; /* Bit 0 */
/* Third int16_t */
(*bitstreamPtr) = ((uint16_t)enc_bits->lsf[4]&0x1)<<15; /* Bit 0 */
(*bitstreamPtr) |= (enc_bits->lsf[5])<<8; /* Bit 1..7 */
(*bitstreamPtr) |= (enc_bits->startIdx)<<5; /* Bit 8..10 */
(*bitstreamPtr) |= (enc_bits->state_first)<<4; /* Bit 11 */
(*bitstreamPtr) |= ((enc_bits->idxForMax)&0x3C)>>2; /* Bit 12..15 */
bitstreamPtr++;
/* 4:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)enc_bits->idxForMax&0x3)<<14; /* Bit 0..1 */
/* 4:th int16_t */
(*bitstreamPtr) = ((uint16_t)enc_bits->idxForMax&0x3)<<14; /* Bit 0..1 */
(*bitstreamPtr) |= (enc_bits->cb_index[0]&0x78)<<7; /* Bit 2..5 */
(*bitstreamPtr) |= (enc_bits->gain_index[0]&0x10)<<5; /* Bit 6 */
(*bitstreamPtr) |= (enc_bits->gain_index[1]&0x8)<<5; /* Bit 7 */
@ -77,14 +77,14 @@ void WebRtcIlbcfix_PackBits(
(*bitstreamPtr) |= (enc_bits->gain_index[4]&0x8)>>3; /* Bit 15 */
}
/* Class 2 bits of ULP */
/* 4:th to 6:th WebRtc_Word16 for 20 ms case
5:th to 7:th WebRtc_Word16 for 30 ms case */
/* 4:th to 6:th int16_t for 20 ms case
5:th to 7:th int16_t for 30 ms case */
bitstreamPtr++;
tmpPtr=enc_bits->idxVec;
for (k=0; k<3; k++) {
(*bitstreamPtr) = 0;
for (i=15; i>=0; i--) {
(*bitstreamPtr) |= ((WebRtc_UWord16)((*tmpPtr)&0x4)>>2)<<i;
(*bitstreamPtr) |= ((uint16_t)((*tmpPtr)&0x4)>>2)<<i;
/* Bit 15-i */
tmpPtr++;
}
@ -92,10 +92,10 @@ void WebRtcIlbcfix_PackBits(
}
if (mode==20) {
/* 7:th WebRtc_Word16 */
/* 7:th int16_t */
(*bitstreamPtr) = 0;
for (i=15; i>6; i--) {
(*bitstreamPtr) |= ((WebRtc_UWord16)((*tmpPtr)&0x4)>>2)<<i;
(*bitstreamPtr) |= ((uint16_t)((*tmpPtr)&0x4)>>2)<<i;
/* Bit 15-i */
tmpPtr++;
}
@ -106,10 +106,10 @@ void WebRtcIlbcfix_PackBits(
(*bitstreamPtr) |= (enc_bits->gain_index[7]&0xC)>>2; /* Bit 14..15 */
} else { /* mode==30 */
/* 8:th WebRtc_Word16 */
/* 8:th int16_t */
(*bitstreamPtr) = 0;
for (i=15; i>5; i--) {
(*bitstreamPtr) |= ((WebRtc_UWord16)((*tmpPtr)&0x4)>>2)<<i;
(*bitstreamPtr) |= ((uint16_t)((*tmpPtr)&0x4)>>2)<<i;
/* Bit 15-i */
tmpPtr++;
}
@ -119,13 +119,13 @@ void WebRtcIlbcfix_PackBits(
(*bitstreamPtr) |= (enc_bits->cb_index[3]&0x2); /* Bit 14 */
(*bitstreamPtr) |= (enc_bits->cb_index[6]&0x80)>>7; /* Bit 15 */
bitstreamPtr++;
/* 9:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)enc_bits->cb_index[6]&0x7E)<<9;/* Bit 0..5 */
/* 9:th int16_t */
(*bitstreamPtr) = ((uint16_t)enc_bits->cb_index[6]&0x7E)<<9;/* Bit 0..5 */
(*bitstreamPtr) |= (enc_bits->cb_index[9]&0xFE)<<2; /* Bit 6..12 */
(*bitstreamPtr) |= (enc_bits->cb_index[12]&0xE0)>>5; /* Bit 13..15 */
bitstreamPtr++;
/* 10:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)enc_bits->cb_index[12]&0x1E)<<11;/* Bit 0..3 */
/* 10:th int16_t */
(*bitstreamPtr) = ((uint16_t)enc_bits->cb_index[12]&0x1E)<<11;/* Bit 0..3 */
(*bitstreamPtr) |= (enc_bits->gain_index[3]&0xC)<<8; /* Bit 4..5 */
(*bitstreamPtr) |= (enc_bits->gain_index[4]&0x6)<<7; /* Bit 6..7 */
(*bitstreamPtr) |= (enc_bits->gain_index[6]&0x18)<<3; /* Bit 8..9 */
@ -137,27 +137,27 @@ void WebRtcIlbcfix_PackBits(
}
bitstreamPtr++;
/* Class 3 bits of ULP */
/* 8:th to 14:th WebRtc_Word16 for 20 ms case
11:th to 17:th WebRtc_Word16 for 30 ms case */
/* 8:th to 14:th int16_t for 20 ms case
11:th to 17:th int16_t for 30 ms case */
tmpPtr=enc_bits->idxVec;
for (k=0; k<7; k++) {
(*bitstreamPtr) = 0;
for (i=14; i>=0; i-=2) {
(*bitstreamPtr) |= ((WebRtc_UWord16)((*tmpPtr)&0x3))<<i; /* Bit 15-i..14-i*/
(*bitstreamPtr) |= ((uint16_t)((*tmpPtr)&0x3))<<i; /* Bit 15-i..14-i*/
tmpPtr++;
}
bitstreamPtr++;
}
if (mode==20) {
/* 15:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)((enc_bits->idxVec[56])&0x3))<<14;/* Bit 0..1 */
/* 15:th int16_t */
(*bitstreamPtr) = ((uint16_t)((enc_bits->idxVec[56])&0x3))<<14;/* Bit 0..1 */
(*bitstreamPtr) |= (((enc_bits->cb_index[0])&1))<<13; /* Bit 2 */
(*bitstreamPtr) |= ((enc_bits->cb_index[1]))<<6; /* Bit 3..9 */
(*bitstreamPtr) |= ((enc_bits->cb_index[2])&0x7E)>>1; /* Bit 10..15 */
bitstreamPtr++;
/* 16:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)((enc_bits->cb_index[2])&0x1))<<15;
/* 16:th int16_t */
(*bitstreamPtr) = ((uint16_t)((enc_bits->cb_index[2])&0x1))<<15;
/* Bit 0 */
(*bitstreamPtr) |= ((enc_bits->gain_index[0])&0x7)<<12; /* Bit 1..3 */
(*bitstreamPtr) |= ((enc_bits->gain_index[1])&0x3)<<10; /* Bit 4..5 */
@ -165,18 +165,18 @@ void WebRtcIlbcfix_PackBits(
(*bitstreamPtr) |= ((enc_bits->cb_index[3])&0x1)<<6; /* Bit 9 */
(*bitstreamPtr) |= ((enc_bits->cb_index[4])&0x7E)>>1; /* Bit 10..15 */
bitstreamPtr++;
/* 17:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)((enc_bits->cb_index[4])&0x1))<<15;
/* 17:th int16_t */
(*bitstreamPtr) = ((uint16_t)((enc_bits->cb_index[4])&0x1))<<15;
/* Bit 0 */
(*bitstreamPtr) |= (enc_bits->cb_index[5])<<8; /* Bit 1..7 */
(*bitstreamPtr) |= (enc_bits->cb_index[6]); /* Bit 8..15 */
bitstreamPtr++;
/* 18:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)(enc_bits->cb_index[7]))<<8; /* Bit 0..7 */
/* 18:th int16_t */
(*bitstreamPtr) = ((uint16_t)(enc_bits->cb_index[7]))<<8; /* Bit 0..7 */
(*bitstreamPtr) |= (enc_bits->cb_index[8]); /* Bit 8..15 */
bitstreamPtr++;
/* 19:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)((enc_bits->gain_index[3])&0x3))<<14;
/* 19:th int16_t */
(*bitstreamPtr) = ((uint16_t)((enc_bits->gain_index[3])&0x3))<<14;
/* Bit 0..1 */
(*bitstreamPtr) |= ((enc_bits->gain_index[4])&0x3)<<12; /* Bit 2..3 */
(*bitstreamPtr) |= ((enc_bits->gain_index[5]))<<9; /* Bit 4..6 */
@ -184,15 +184,15 @@ void WebRtcIlbcfix_PackBits(
(*bitstreamPtr) |= ((enc_bits->gain_index[7])&0x3)<<4; /* Bit 10..11 */
(*bitstreamPtr) |= (enc_bits->gain_index[8])<<1; /* Bit 12..14 */
} else { /* mode==30 */
/* 18:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)((enc_bits->idxVec[56])&0x3))<<14;/* Bit 0..1 */
/* 18:th int16_t */
(*bitstreamPtr) = ((uint16_t)((enc_bits->idxVec[56])&0x3))<<14;/* Bit 0..1 */
(*bitstreamPtr) |= (((enc_bits->idxVec[57])&0x3))<<12; /* Bit 2..3 */
(*bitstreamPtr) |= (((enc_bits->cb_index[0])&1))<<11; /* Bit 4 */
(*bitstreamPtr) |= ((enc_bits->cb_index[1]))<<4; /* Bit 5..11 */
(*bitstreamPtr) |= ((enc_bits->cb_index[2])&0x78)>>3; /* Bit 12..15 */
bitstreamPtr++;
/* 19:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)(enc_bits->cb_index[2])&0x7)<<13;
/* 19:th int16_t */
(*bitstreamPtr) = ((uint16_t)(enc_bits->cb_index[2])&0x7)<<13;
/* Bit 0..2 */
(*bitstreamPtr) |= ((enc_bits->gain_index[0])&0x7)<<10; /* Bit 3..5 */
(*bitstreamPtr) |= ((enc_bits->gain_index[1])&0x3)<<8; /* Bit 6..7 */
@ -200,36 +200,36 @@ void WebRtcIlbcfix_PackBits(
(*bitstreamPtr) |= ((enc_bits->cb_index[3])&0x1)<<4; /* Bit 11 */
(*bitstreamPtr) |= ((enc_bits->cb_index[4])&0x78)>>3; /* Bit 12..15 */
bitstreamPtr++;
/* 20:th WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)(enc_bits->cb_index[4])&0x7)<<13;
/* 20:th int16_t */
(*bitstreamPtr) = ((uint16_t)(enc_bits->cb_index[4])&0x7)<<13;
/* Bit 0..2 */
(*bitstreamPtr) |= ((enc_bits->cb_index[5]))<<6; /* Bit 3..9 */
(*bitstreamPtr) |= ((enc_bits->cb_index[6])&0x1)<<5; /* Bit 10 */
(*bitstreamPtr) |= ((enc_bits->cb_index[7])&0xF8)>>3; /* Bit 11..15 */
bitstreamPtr++;
/* 21:st WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)(enc_bits->cb_index[7])&0x7)<<13;
/* 21:st int16_t */
(*bitstreamPtr) = ((uint16_t)(enc_bits->cb_index[7])&0x7)<<13;
/* Bit 0..2 */
(*bitstreamPtr) |= ((enc_bits->cb_index[8]))<<5; /* Bit 3..10 */
(*bitstreamPtr) |= ((enc_bits->cb_index[9])&0x1)<<4; /* Bit 11 */
(*bitstreamPtr) |= ((enc_bits->cb_index[10])&0xF0)>>4; /* Bit 12..15 */
bitstreamPtr++;
/* 22:nd WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)(enc_bits->cb_index[10])&0xF)<<12;
/* 22:nd int16_t */
(*bitstreamPtr) = ((uint16_t)(enc_bits->cb_index[10])&0xF)<<12;
/* Bit 0..3 */
(*bitstreamPtr) |= ((enc_bits->cb_index[11]))<<4; /* Bit 4..11 */
(*bitstreamPtr) |= ((enc_bits->cb_index[12])&0x1)<<3; /* Bit 12 */
(*bitstreamPtr) |= ((enc_bits->cb_index[13])&0xE0)>>5; /* Bit 13..15 */
bitstreamPtr++;
/* 23:rd WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)(enc_bits->cb_index[13])&0x1F)<<11;
/* 23:rd int16_t */
(*bitstreamPtr) = ((uint16_t)(enc_bits->cb_index[13])&0x1F)<<11;
/* Bit 0..4 */
(*bitstreamPtr) |= ((enc_bits->cb_index[14]))<<3; /* Bit 5..12 */
(*bitstreamPtr) |= ((enc_bits->gain_index[3])&0x3)<<1; /* Bit 13..14 */
(*bitstreamPtr) |= ((enc_bits->gain_index[4])&0x1); /* Bit 15 */
bitstreamPtr++;
/* 24:rd WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)(enc_bits->gain_index[5]))<<13;
/* 24:rd int16_t */
(*bitstreamPtr) = ((uint16_t)(enc_bits->gain_index[5]))<<13;
/* Bit 0..2 */
(*bitstreamPtr) |= ((enc_bits->gain_index[6])&0x7)<<10; /* Bit 3..5 */
(*bitstreamPtr) |= ((enc_bits->gain_index[7])&0x3)<<8; /* Bit 6..7 */
@ -237,8 +237,8 @@ void WebRtcIlbcfix_PackBits(
(*bitstreamPtr) |= ((enc_bits->gain_index[9])&0xF)<<1; /* Bit 11..14 */
(*bitstreamPtr) |= ((enc_bits->gain_index[10])&0x4)>>2; /* Bit 15 */
bitstreamPtr++;
/* 25:rd WebRtc_Word16 */
(*bitstreamPtr) = ((WebRtc_UWord16)(enc_bits->gain_index[10])&0x3)<<14;
/* 25:rd int16_t */
(*bitstreamPtr) = ((uint16_t)(enc_bits->gain_index[10])&0x3)<<14;
/* Bit 0..1 */
(*bitstreamPtr) |= ((enc_bits->gain_index[11]))<<11; /* Bit 2..4 */
(*bitstreamPtr) |= ((enc_bits->gain_index[12])&0xF)<<7; /* Bit 5..8 */