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
Committed: https://code.google.com/p/webrtc/source/detail?r=7266
Review URL: https://webrtc-codereview.appspot.com/19229004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7285 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
index 93b366b..92bccee 100644
--- a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
+++ b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
@@ -1632,9 +1632,13 @@
cdlen=0;
while (cdlen<=0) {
#ifdef CODEC_ISAC /* floating point */
- cdlen=WebRtcIsac_Encode(ISAC_inst[k],&indata[noOfCalls*160],(int16_t*)encoded);
+ cdlen = WebRtcIsac_Encode(ISAC_inst[k],
+ &indata[noOfCalls * 160],
+ encoded);
#else /* fixed point */
- cdlen=WebRtcIsacfix_Encode(ISAC_inst[k],&indata[noOfCalls*160],(int16_t*)encoded);
+ cdlen = WebRtcIsacfix_Encode(ISAC_inst[k],
+ &indata[noOfCalls * 160],
+ encoded);
#endif
noOfCalls++;
}
@@ -1645,7 +1649,9 @@
int noOfCalls=0;
cdlen=0;
while (cdlen<=0) {
- cdlen=WebRtcIsac_Encode(ISACSWB_inst[k],&indata[noOfCalls*320],(int16_t*)encoded);
+ cdlen = WebRtcIsac_Encode(ISACSWB_inst[k],
+ &indata[noOfCalls * 320],
+ encoded);
noOfCalls++;
}
}
diff --git a/webrtc/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc b/webrtc/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc
index 6b0f482..b672a0c 100644
--- a/webrtc/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc
+++ b/webrtc/modules/audio_coding/neteq/test/neteq_isac_quality_test.cc
@@ -138,8 +138,7 @@
// The Isac encoder does not perform encoding (and returns 0) until it
// receives a sequence of sub-blocks that amount to the frame duration.
EXPECT_EQ(0, value);
- value = WebRtcIsacfix_Encode(isac_encoder_, &in_data[pointer],
- reinterpret_cast<int16_t*>(payload));
+ value = WebRtcIsacfix_Encode(isac_encoder_, &in_data[pointer], payload);
}
EXPECT_GT(value, 0);
return value;