generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the useless dummy state parameter to WebRtcPcm16b_DecodeW16

Browse Source 
R=henrik.lundin@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7610 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kwiberg@webrtc.org 2014-11-04 13:29:24 +00:00
parent c78cf97ecb
commit 6de75ca3ed
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,7 @@ int16_t WebRtcPcm16b_Encode(int16_t *speech16b,
* Returned value : Samples in speechOut16b
*/
int16_t WebRtcPcm16b_DecodeW16(void *inst,
int16_t *speechIn16b,
int16_t WebRtcPcm16b_DecodeW16(int16_t *speechIn16b,
int16_t length_bytes,
int16_t *speechOut16b,
int16_t* speechType);

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

@ -61,8 +61,7 @@ int16_t WebRtcPcm16b_Encode(int16_t *speech16b,
/* 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 WebRtcPcm16b_DecodeW16(int16_t *speechIn16b,
int16_t length_bytes,
int16_t *speechOut16b,
int16_t* speechType)
@ -80,9 +79,6 @@ int16_t WebRtcPcm16b_DecodeW16(void *inst,
*speechType=1;
// Avoid warning.
(void)(inst = NULL);
return length_bytes >> 1;
}

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

@ -82,7 +82,7 @@ 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(
state_, reinterpret_cast<int16_t*>(const_cast<uint8_t*>(encoded)),
reinterpret_cast<int16_t*>(const_cast<uint8_t*>(encoded)),
static_cast<int16_t>(encoded_len), decoded, &temp_type);
*speech_type = ConvertSpeechType(temp_type);
return ret;

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

@ -33,7 +33,7 @@ class ExternalPcm16B : public AudioDecoder {
int16_t* decoded, SpeechType* speech_type) {
int16_t temp_type;
int16_t ret = WebRtcPcm16b_DecodeW16(
state_, reinterpret_cast<int16_t*>(const_cast<uint8_t*>(encoded)),
reinterpret_cast<int16_t*>(const_cast<uint8_t*>(encoded)),
static_cast<int16_t>(encoded_len), decoded, &temp_type);
*speech_type = ConvertSpeechType(temp_type);
return ret;