Reverts changes to auto test.
Review URL: https://webrtc-codereview.appspot.com/724006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2593 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
ba853c9970
commit
268a24fa56
@ -455,7 +455,6 @@ void ViEAutoTest::ViECodecAPITest() {
|
|||||||
for (int i = 0; i < number_of_codecs; i++) {
|
for (int i = 0; i < number_of_codecs; i++) {
|
||||||
EXPECT_EQ(0, codec->GetCodec(i, video_codec));
|
EXPECT_EQ(0, codec->GetCodec(i, video_codec));
|
||||||
if (video_codec.codecType == webrtc::kVideoCodecVP8) {
|
if (video_codec.codecType == webrtc::kVideoCodecVP8) {
|
||||||
video_codec.codecSpecific.VP8.automaticResizeOn = true;
|
|
||||||
EXPECT_EQ(0, codec->SetSendCodec(video_channel, video_codec));
|
EXPECT_EQ(0, codec->SetSendCodec(video_channel, video_codec));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -463,12 +462,10 @@ void ViEAutoTest::ViECodecAPITest() {
|
|||||||
memset(&video_codec, 0, sizeof(video_codec));
|
memset(&video_codec, 0, sizeof(video_codec));
|
||||||
EXPECT_EQ(0, codec->GetSendCodec(video_channel, video_codec));
|
EXPECT_EQ(0, codec->GetSendCodec(video_channel, video_codec));
|
||||||
EXPECT_EQ(webrtc::kVideoCodecVP8, video_codec.codecType);
|
EXPECT_EQ(webrtc::kVideoCodecVP8, video_codec.codecType);
|
||||||
EXPECT_TRUE(video_codec.codecSpecific.VP8.automaticResizeOn);
|
|
||||||
|
|
||||||
for (int i = 0; i < number_of_codecs; i++) {
|
for (int i = 0; i < number_of_codecs; i++) {
|
||||||
EXPECT_EQ(0, codec->GetCodec(i, video_codec));
|
EXPECT_EQ(0, codec->GetCodec(i, video_codec));
|
||||||
if (video_codec.codecType == webrtc::kVideoCodecI420) {
|
if (video_codec.codecType == webrtc::kVideoCodecI420) {
|
||||||
video_codec.codecSpecific.VP8.automaticResizeOn = false;
|
|
||||||
EXPECT_EQ(0, codec->SetSendCodec(video_channel, video_codec));
|
EXPECT_EQ(0, codec->SetSendCodec(video_channel, video_codec));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -476,7 +473,6 @@ void ViEAutoTest::ViECodecAPITest() {
|
|||||||
memset(&video_codec, 0, sizeof(video_codec));
|
memset(&video_codec, 0, sizeof(video_codec));
|
||||||
EXPECT_EQ(0, codec->GetSendCodec(video_channel, video_codec));
|
EXPECT_EQ(0, codec->GetSendCodec(video_channel, video_codec));
|
||||||
EXPECT_EQ(webrtc::kVideoCodecI420, video_codec.codecType);
|
EXPECT_EQ(webrtc::kVideoCodecI420, video_codec.codecType);
|
||||||
EXPECT_FALSE(video_codec.codecSpecific.VP8.automaticResizeOn);
|
|
||||||
|
|
||||||
EXPECT_EQ(0, base->DeleteChannel(video_channel));
|
EXPECT_EQ(0, base->DeleteChannel(video_channel));
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user