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

Remove more dependencies on openssl, add dependency on boringssl. Continues on r6798

Browse Source 
R=andrew@webrtc.org, fbarchard@chromium.org, kjellander@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6867 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-08-11 21:06:30 +00:00
parent 820f8e9ca7
commit 6ac22e6b47
27 changed files with 92 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/modules/video_coding/main/test/codec_database_test.cc
View File

@ -129,8 +129,7 @@ CodecDataBaseTest::Perform(CmdArgs& args)
sourceFrame.set_timestamp(_timeStamp);
// Encoder registration
TEST (VideoCodingModule::NumberOfCodecs() > 0);
TEST(VideoCodingModule::Codec(-1, &sendCodec) < 0);
TEST(VideoCodingModule::Codec(VideoCodingModule::NumberOfCodecs() + 1,
TEST(VideoCodingModule::Codec(VideoCodingModule::NumberOfCodecs() + 1u,
&sendCodec) < 0);
VideoCodingModule::Codec(1, &sendCodec);
sendCodec.plType = 0; // random value

5
webrtc/modules/video_coding/main/test/generic_codec_test.cc
View File

@ -126,7 +126,6 @@ GenericCodecTest::Perform(CmdArgs& args)
I420VideoFrame sourceFrame;
_vcm->InitializeSender();
TEST(_vcm->Codec(kVideoCodecVP8, &sendCodec) == 0);
TEST(_vcm->RegisterSendCodec(&sendCodec, -1, 1440) < 0); // bad number of cores
sendCodec.maxBitrate = 8000;
_vcm->RegisterSendCodec(&sendCodec, 1, 1440);
_vcm->InitializeSender();
@ -134,8 +133,6 @@ GenericCodecTest::Perform(CmdArgs& args)
sendCodec.height = 0;
TEST(_vcm->RegisterSendCodec(&sendCodec, 1, 1440) < 0); // bad height
_vcm->Codec(kVideoCodecVP8, &sendCodec);
sendCodec.startBitrate = -2;
TEST(_vcm->RegisterSendCodec(&sendCodec, 1, 1440) < 0); // bad bit rate
_vcm->Codec(kVideoCodecVP8, &sendCodec);
_vcm->InitializeSender();
// Setting rate when encoder uninitialized.
@ -282,7 +279,7 @@ GenericCodecTest::Perform(CmdArgs& args)
const float nBitrates = sizeof(bitRate)/sizeof(*bitRate);
float _bitRate = 0;
int _frameCnt = 0;
float totalBytesOneSec;//, totalBytesTenSec;
float totalBytesOneSec = 0;//, totalBytesTenSec;
float totalBytes, actualBitrate;
VCMFrameCount frameCount; // testing frame type counters
// start test

5
webrtc/modules/video_coding/main/test/rtp_player.cc
View File

@ -348,8 +348,9 @@ class RtpPlayerImpl : public RtpPlayerInterface {
virtual int NextPacket(int64_t time_now) {
// Send any packets ready to be resent.
RawRtpPacket* packet;
while ((packet = lost_packets_.NextPacketToResend(time_now))) {
for (RawRtpPacket* packet = lost_packets_.NextPacketToResend(time_now);
packet != NULL;
packet = lost_packets_.NextPacketToResend(time_now)) {
int ret = SendPacket(packet->data(), packet->length());
if (ret > 0) {
printf("Resend: %08x:%u\n", packet->ssrc(), packet->seq_num());