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

Revert 7266 "WebRtcIsac_Encode and WebRtcIsacfix_Encode: Type en..."

Browse Source 
This was causing apparently legitimate failures on the following bots:
http://chromegw/i/client.webrtc/builders/Linux64%20Release%20%5Blarge%20tests%5D/builds/2599
http://chromegw/i/client.webrtc/builders/Android%20Tests%20%28KK%20Nexus5%29%28dbg%29/builds/2023
http://chromegw/i/client.webrtc/builders/Android%20Tests%20%28JB%20Nexus7.2%29%28dbg%29/builds/1825
http://chromegw/i/client.webrtc/builders/Android%20Tests%20%28KK%20Nexus5%29/builds/2013
http://chromegw/i/client.webrtc/builders/Android%20Tests%20%28JB%20Nexus7.2%29/builds/1795

> WebRtcIsac_Encode and WebRtcIsacfix_Encode: Type encoded stream as uint8_t
> 
> We have to fix both at once, since there's a macro that calls one of
> them or the other.
> 
> BUG=909
> R=andrew@webrtc.org, bjornv@webrtc.org, henrik.lundin@webrtc.org, minyue@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/19229004

TBR=kwiberg@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7267 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2014-09-23 01:32:57 +00:00
parent 8c5740b485
commit a3c4d4dd2c
15 changed files with 68 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
View File

@ -71,7 +71,7 @@ float IsacSpeedTest::EncodeABlock(int16_t* in_data, uint8_t* bit_stream,
size_t pointer = 0;
for (int idx = 0; idx < subblocks; idx++, pointer += subblock_length) {
value = WebRtcIsacfix_Encode(ISACFIX_main_inst_, &in_data[pointer],
bit_stream);
reinterpret_cast<int16_t*>(bit_stream));
}
clocks = clock() - clocks;
EXPECT_GT(value, 0);

2
webrtc/modules/audio_coding/codecs/isac/fix/test/kenny.cc
View File

@ -565,7 +565,7 @@ int main(int argc, char* argv[])
/* Encode */
stream_len = WebRtcIsacfix_Encode(ISAC_main_inst,
shortdata,
(uint8_t*)streamdata);
(int16_t*)streamdata);
/* If packet is ready, and CE testing, call the different API
functions from the internal API. */

9
webrtc/modules/audio_coding/codecs/isac/fix/test/test_iSACfixfloat.c
View File

@ -439,9 +439,7 @@ int main(int argc, char* argv[])
/* iSAC encoding */
if (mode==0 || mode ==1) {
stream_len = WebRtcIsac_Encode(ISAC_main_inst,
shortdata,
(uint8_t*)streamdata);
stream_len = WebRtcIsac_Encode(ISAC_main_inst, shortdata, streamdata);
if (stream_len < 0) {
/* exit if returned with error */
errtype=WebRtcIsac_GetErrorCode(ISAC_main_inst);
@ -451,10 +449,7 @@ int main(int argc, char* argv[])
} else if (mode==2 || mode==3) {
/* iSAC encoding */
if (nbTest != 1)
stream_len = WebRtcIsacfix_Encode(
ISACFIX_main_inst,
shortdata,
(uint8_t*)streamdata);
stream_len = WebRtcIsacfix_Encode(ISACFIX_main_inst, shortdata, streamdata);
else
stream_len = WebRtcIsacfix_EncodeNb(ISACFIX_main_inst, shortdata, streamdata);