Removing warnings in all NetEQ test targets
Now all targets in neteq.gypi builds again. Also added payload type to the log produced by RTPanalyze. Review URL: http://webrtc-codereview.appspot.com/148001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@598 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
df587b220d
commit
29fd9a5f30
@ -40,7 +40,7 @@ int main(int argc, char* argv[])
|
|||||||
printf("Output file: %s\n\n",argv[2]);
|
printf("Output file: %s\n\n",argv[2]);
|
||||||
|
|
||||||
// print file header
|
// print file header
|
||||||
fprintf(outFile, "SeqNo TimeStamp SendTime Size\n");
|
fprintf(outFile, "SeqNo TimeStamp SendTime Size PT\n");
|
||||||
|
|
||||||
|
|
||||||
// read file header
|
// read file header
|
||||||
@ -53,8 +53,9 @@ int main(int argc, char* argv[])
|
|||||||
while (packet.readFromFile(inFile) >= 0)
|
while (packet.readFromFile(inFile) >= 0)
|
||||||
{
|
{
|
||||||
// write packet data to file
|
// write packet data to file
|
||||||
fprintf(outFile, "%5hu %10lu %10lu %5hi\n",
|
fprintf(outFile, "%5u %10u %10u %5i %5i\n",
|
||||||
packet.sequenceNumber(), packet.timeStamp(), packet.time(), packet.dataLen());
|
packet.sequenceNumber(), packet.timeStamp(), packet.time(),
|
||||||
|
packet.dataLen(), packet.payloadType());
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(inFile);
|
fclose(inFile);
|
||||||
|
@ -65,7 +65,7 @@ int main(int argc, char* argv[])
|
|||||||
WebRtc_UWord32 ts;
|
WebRtc_UWord32 ts;
|
||||||
WebRtc_UWord32 sendTime;
|
WebRtc_UWord32 sendTime;
|
||||||
|
|
||||||
while(fscanf(statFile, "%u %u %u %*i\n", &seqNo, &ts, &sendTime) == 3)
|
while(fscanf(statFile, "%hu %u %u %*i %*i\n", &seqNo, &ts, &sendTime) == 3)
|
||||||
{
|
{
|
||||||
std::pair<WebRtc_UWord16, WebRtc_UWord32> tempPair =
|
std::pair<WebRtc_UWord16, WebRtc_UWord32> tempPair =
|
||||||
std::pair<WebRtc_UWord16, WebRtc_UWord32>(seqNo, ts);
|
std::pair<WebRtc_UWord16, WebRtc_UWord32>(seqNo, ts);
|
||||||
@ -83,7 +83,6 @@ int main(int argc, char* argv[])
|
|||||||
fwrite(firstline, 4+4+4+2+2, 1, outFile);
|
fwrite(firstline, 4+4+4+2+2, 1, outFile);
|
||||||
|
|
||||||
std::vector<NETEQTEST_RTPpacket *> packetVec;
|
std::vector<NETEQTEST_RTPpacket *> packetVec;
|
||||||
int i = 0;
|
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
|
@ -1610,7 +1610,7 @@ int NetEQTest_encode(int coder, WebRtc_Word16 *indata, int frameLen, unsigned ch
|
|||||||
int * vad, int useVAD, int bitrate, int numChannels){
|
int * vad, int useVAD, int bitrate, int numChannels){
|
||||||
|
|
||||||
short cdlen;
|
short cdlen;
|
||||||
WebRtc_Word16 size_in_bytes, *tempdata;
|
WebRtc_Word16 *tempdata;
|
||||||
static int first_cng=1;
|
static int first_cng=1;
|
||||||
WebRtc_Word16 tempLen;
|
WebRtc_Word16 tempLen;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user