admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete GetRenderer method, used only by the tests.

Browse Source 
BUG=webrtc:5426

Review URL: https://codereview.webrtc.org/1602283003

Cr-Commit-Position: refs/heads/master@{#11328}
This commit is contained in:
nisse 2016-01-20 23:26:37 -08:00 committed by Commit bot
parent 057ecf01e4
commit d26fadb454
4 changed files with 0 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
talk/media/base/videoengine_unittest.h
View File

@ -760,96 +760,6 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_EQ(789u, ssrc); EXPECT_EQ(789u, ssrc);
} }
// Tests setting up and configuring multiple incoming streams.
void AddRemoveRecvStreams() {
cricket::FakeVideoRenderer renderer1, renderer2;
cricket::VideoSendParameters parameters;
parameters.codecs.push_back(DefaultCodec());
EXPECT_TRUE(channel_->SetSendParameters(parameters));
// Ensure we can't set the renderer on a non-existent stream.
EXPECT_FALSE(channel_->SetRenderer(1, &renderer1));
EXPECT_FALSE(channel_->SetRenderer(2, &renderer2));
cricket::VideoRenderer* renderer;
EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
// Ensure we can add streams.
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(1)));
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(2)));
EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
EXPECT_TRUE(renderer == NULL);
EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
EXPECT_TRUE(NULL == renderer);
// Ensure we can now set the renderers.
EXPECT_TRUE(channel_->SetRenderer(1, &renderer1));
EXPECT_TRUE(channel_->SetRenderer(2, &renderer2));
EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
EXPECT_TRUE(&renderer1 == renderer);
EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
EXPECT_TRUE(&renderer2 == renderer);
// Ensure we can change the renderers if needed.
EXPECT_TRUE(channel_->SetRenderer(1, &renderer2));
EXPECT_TRUE(channel_->SetRenderer(2, &renderer1));
EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
EXPECT_TRUE(&renderer2 == renderer);
EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
EXPECT_TRUE(&renderer1 == renderer);
EXPECT_TRUE(channel_->RemoveRecvStream(2));
EXPECT_TRUE(channel_->RemoveRecvStream(1));
EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
}
// Tests setting up and configuring multiple incoming streams in a
// non-conference call.
void AddRemoveRecvStreamsNoConference() {
cricket::FakeVideoRenderer renderer1, renderer2;
// Ensure we can't set the renderer on a non-existent stream.
EXPECT_FALSE(channel_->SetRenderer(1, &renderer1));
EXPECT_FALSE(channel_->SetRenderer(2, &renderer2));
cricket::VideoRenderer* renderer;
EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
// Ensure we can add streams.
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(1)));
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(2)));
EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
// Verify the first AddRecvStream hook up to the default renderer.
EXPECT_TRUE(renderer == NULL);
EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
EXPECT_TRUE(NULL == renderer);
// Ensure we can now set the renderers.
EXPECT_TRUE(channel_->SetRenderer(1, &renderer1));
EXPECT_TRUE(channel_->SetRenderer(2, &renderer2));
EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
EXPECT_TRUE(&renderer1 == renderer);
EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
EXPECT_TRUE(&renderer2 == renderer);
// Ensure we can change the renderers if needed.
EXPECT_TRUE(channel_->SetRenderer(1, &renderer2));
EXPECT_TRUE(channel_->SetRenderer(2, &renderer1));
EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
EXPECT_TRUE(&renderer2 == renderer);
EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
EXPECT_TRUE(&renderer1 == renderer);
EXPECT_TRUE(channel_->RemoveRecvStream(2));
EXPECT_TRUE(channel_->RemoveRecvStream(1));
EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
}
// Test that no frames are rendered after the receive stream have been // Test that no frames are rendered after the receive stream have been
// removed. // removed.
void AddRemoveRecvStreamAndRender() { void AddRemoveRecvStreamAndRender() {

23
talk/media/webrtc/webrtcvideoengine2.cc
View File

@ -1184,22 +1184,6 @@ bool WebRtcVideoChannel2::SetRenderer(uint32_t ssrc, VideoRenderer* renderer) {
return true; return true;
} }
bool WebRtcVideoChannel2::GetRenderer(uint32_t ssrc, VideoRenderer** renderer) {
if (ssrc == 0) {
*renderer = default_unsignalled_ssrc_handler_.GetDefaultRenderer();
return *renderer != NULL;
}
rtc::CritScope stream_lock(&stream_crit_);
std::map<uint32_t, WebRtcVideoReceiveStream*>::iterator it =
receive_streams_.find(ssrc);
if (it == receive_streams_.end()) {
return false;
}
*renderer = it->second->GetRenderer();
return true;
}
bool WebRtcVideoChannel2::GetStats(VideoMediaInfo* info) { bool WebRtcVideoChannel2::GetStats(VideoMediaInfo* info) {
info->Clear(); info->Clear();
FillSenderStats(info); FillSenderStats(info);
@ -2480,13 +2464,6 @@ void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetRenderer(
renderer_ = renderer; renderer_ = renderer;
} }
VideoRenderer* WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetRenderer() {
// TODO(pbos): Remove GetRenderer and all uses of it, it's thread-unsafe by
// design.
rtc::CritScope crit(&renderer_lock_);
return renderer_;
}
std::string std::string
WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetCodecNameFromPayloadType( WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetCodecNameFromPayloadType(
int payload_type) { int payload_type) {

2
talk/media/webrtc/webrtcvideoengine2.h
View File

@ -193,7 +193,6 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
// Implemented for VideoMediaChannelTest. // Implemented for VideoMediaChannelTest.
bool sending() const { return sending_; } bool sending() const { return sending_; }
uint32_t GetDefaultSendChannelSsrc() { return default_send_ssrc_; } uint32_t GetDefaultSendChannelSsrc() { return default_send_ssrc_; }
bool GetRenderer(uint32_t ssrc, VideoRenderer** renderer);
private: private:
bool MuteStream(uint32_t ssrc, bool mute); bool MuteStream(uint32_t ssrc, bool mute);
@ -415,7 +414,6 @@ class WebRtcVideoChannel2 : public rtc::MessageHandler,
bool IsDefaultStream() const; bool IsDefaultStream() const;
void SetRenderer(cricket::VideoRenderer* renderer); void SetRenderer(cricket::VideoRenderer* renderer);
cricket::VideoRenderer* GetRenderer();
VideoReceiverInfo GetVideoReceiverInfo(); VideoReceiverInfo GetVideoReceiverInfo();

3
talk/media/webrtc/webrtcvideoengine2_unittest.cc
View File

@ -803,12 +803,9 @@ WEBRTC_BASE_TEST(SetSendSsrc);
WEBRTC_BASE_TEST(SetSendSsrcAfterSetCodecs); WEBRTC_BASE_TEST(SetSendSsrcAfterSetCodecs);
WEBRTC_BASE_TEST(SetRenderer); WEBRTC_BASE_TEST(SetRenderer);
WEBRTC_BASE_TEST(AddRemoveRecvStreams);
WEBRTC_DISABLED_BASE_TEST(AddRemoveRecvStreamAndRender); WEBRTC_DISABLED_BASE_TEST(AddRemoveRecvStreamAndRender);
WEBRTC_BASE_TEST(AddRemoveRecvStreamsNoConference);
WEBRTC_BASE_TEST(AddRemoveSendStreams); WEBRTC_BASE_TEST(AddRemoveSendStreams);
WEBRTC_BASE_TEST(SimulateConference); WEBRTC_BASE_TEST(SimulateConference);