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

Fixes build bot breakage. Resizing was enabled which some tests assumed wouldn't be the case. Changed the default so that it is now disabled.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/731006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2595 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2012-08-10 19:31:24 +00:00
parent b18261ce5f
commit 7742479428
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/video_coding/main/source/codec_database.cc
View File

@ -175,7 +175,7 @@ VCMCodecDataBase::Codec(WebRtc_UWord8 listId, VideoCodec *settings)
settings->codecSpecific.VP8.numberOfTemporalLayers = 1;
settings->codecSpecific.VP8.denoisingOn = true;
settings->codecSpecific.VP8.errorConcealmentOn = false;
settings->codecSpecific.VP8.automaticResizeOn = true;
settings->codecSpecific.VP8.automaticResizeOn = false;
break;
}
#endif

4
src/video_engine/test/auto_test/source/vie_autotest_codec.cc
View File

@ -455,6 +455,7 @@ void ViEAutoTest::ViECodecAPITest() {
for (int i = 0; i < number_of_codecs; i++) {
EXPECT_EQ(0, codec->GetCodec(i, video_codec));
if (video_codec.codecType == webrtc::kVideoCodecVP8) {
video_codec.codecSpecific.VP8.automaticResizeOn = true;
EXPECT_EQ(0, codec->SetSendCodec(video_channel, video_codec));
break;
}
@ -462,10 +463,12 @@ void ViEAutoTest::ViECodecAPITest() {
memset(&video_codec, 0, sizeof(video_codec));
EXPECT_EQ(0, codec->GetSendCodec(video_channel, video_codec));
EXPECT_EQ(webrtc::kVideoCodecVP8, video_codec.codecType);
EXPECT_TRUE(video_codec.codecSpecific.VP8.automaticResizeOn);
for (int i = 0; i < number_of_codecs; i++) {
EXPECT_EQ(0, codec->GetCodec(i, video_codec));
if (video_codec.codecType == webrtc::kVideoCodecI420) {
video_codec.codecSpecific.VP8.automaticResizeOn = false;
EXPECT_EQ(0, codec->SetSendCodec(video_channel, video_codec));
break;
}
@ -473,6 +476,7 @@ void ViEAutoTest::ViECodecAPITest() {
memset(&video_codec, 0, sizeof(video_codec));
EXPECT_EQ(0, codec->GetSendCodec(video_channel, video_codec));
EXPECT_EQ(webrtc::kVideoCodecI420, video_codec.codecType);
EXPECT_FALSE(video_codec.codecSpecific.VP8.automaticResizeOn);
EXPECT_EQ(0, base->DeleteChannel(video_channel));