diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc index 9b77ca4c03..d1e0a76138 100644 --- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc @@ -217,7 +217,6 @@ FakeCall::FakeCall(const webrtc::Call::Config& config) network_state_(kNetworkUp), num_created_send_streams_(0), num_created_receive_streams_(0) { - SetVideoCodecs(GetDefaultVideoCodecs()); } FakeCall::~FakeCall() { @@ -225,10 +224,6 @@ FakeCall::~FakeCall() { EXPECT_EQ(0u, video_receive_streams_.size()); } -void FakeCall::SetVideoCodecs(const std::vector codecs) { - codecs_ = codecs; -} - webrtc::Call::Config FakeCall::GetConfig() const { return config_; } @@ -241,48 +236,6 @@ std::vector FakeCall::GetVideoReceiveStreams() { return video_receive_streams_; } -webrtc::VideoCodec FakeCall::GetEmptyVideoCodec() { - webrtc::VideoCodec codec; - codec.minBitrate = 300; - codec.startBitrate = 800; - codec.maxBitrate = 1500; - codec.maxFramerate = 10; - codec.width = 640; - codec.height = 480; - codec.qpMax = 56; - - return codec; -} - -webrtc::VideoCodec FakeCall::GetVideoCodecVp8() { - webrtc::VideoCodec vp8_codec = GetEmptyVideoCodec(); - vp8_codec.codecType = webrtc::kVideoCodecVP8; - rtc::strcpyn( - vp8_codec.plName, ARRAY_SIZE(vp8_codec.plName), kVp8Codec.name.c_str()); - vp8_codec.plType = kVp8Codec.id; - - return vp8_codec; -} - -webrtc::VideoCodec FakeCall::GetVideoCodecVp9() { - webrtc::VideoCodec vp9_codec = GetEmptyVideoCodec(); - // TODO(pbos): Add a correct codecType when webrtc has one. - vp9_codec.codecType = webrtc::kVideoCodecVP8; - rtc::strcpyn( - vp9_codec.plName, ARRAY_SIZE(vp9_codec.plName), kVp9Codec.name.c_str()); - vp9_codec.plType = kVp9Codec.id; - - return vp9_codec; -} - -std::vector FakeCall::GetDefaultVideoCodecs() { - std::vector codecs; - codecs.push_back(GetVideoCodecVp8()); - // codecs.push_back(GetVideoCodecVp9()); - - return codecs; -} - webrtc::Call::NetworkState FakeCall::GetNetworkState() const { return network_state_; } diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.h b/talk/media/webrtc/webrtcvideoengine2_unittest.h index 0b598014aa..bbfad53ce1 100644 --- a/talk/media/webrtc/webrtcvideoengine2_unittest.h +++ b/talk/media/webrtc/webrtcvideoengine2_unittest.h @@ -104,19 +104,10 @@ class FakeCall : public webrtc::Call, public webrtc::PacketReceiver { FakeCall(const webrtc::Call::Config& config); ~FakeCall(); - void SetVideoCodecs(const std::vector codecs); - webrtc::Call::Config GetConfig() const; std::vector GetVideoSendStreams(); std::vector GetVideoReceiveStreams(); - webrtc::VideoCodec GetEmptyVideoCodec(); - - webrtc::VideoCodec GetVideoCodecVp8(); - webrtc::VideoCodec GetVideoCodecVp9(); - - std::vector GetDefaultVideoCodecs(); - webrtc::Call::NetworkState GetNetworkState() const; int GetNumCreatedSendStreams() const; int GetNumCreatedReceiveStreams() const; @@ -146,7 +137,6 @@ class FakeCall : public webrtc::Call, public webrtc::PacketReceiver { webrtc::Call::Config config_; webrtc::Call::NetworkState network_state_; webrtc::Call::Stats stats_; - std::vector codecs_; std::vector video_send_streams_; std::vector video_receive_streams_;