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

Remove unused voice channel argument from cricket::VideoChannel ctor and corresponding field in class.

Browse Source 
BUG=4574
R=tommi@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#9056}
This commit is contained in:
Fredrik Solenberg 2015-04-22 15:30:51 +02:00
parent 96d1d89c3e
commit 7fb711f683
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
talk/app/webrtc/statscollector_unittest.cc
View File

@ -790,7 +790,7 @@ TEST_F(StatsCollectorTest, BytesCounterHandles64Bits) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, NULL, kVideoChannelName, false, NULL); media_engine_, media_channel, NULL, kVideoChannelName, false);
StatsReports reports; // returned values. StatsReports reports; // returned values.
cricket::VideoSenderInfo video_sender_info; cricket::VideoSenderInfo video_sender_info;
cricket::VideoMediaInfo stats_read; cricket::VideoMediaInfo stats_read;
@ -833,7 +833,7 @@ TEST_F(StatsCollectorTest, BandwidthEstimationInfoIsReported) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, NULL, kVideoChannelName, false, NULL); media_engine_, media_channel, NULL, kVideoChannelName, false);
StatsReports reports; // returned values. StatsReports reports; // returned values.
cricket::VideoSenderInfo video_sender_info; cricket::VideoSenderInfo video_sender_info;
@ -912,7 +912,7 @@ TEST_F(StatsCollectorTest, TrackObjectExistsWithoutUpdateStats) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, NULL, "video", false, NULL); media_engine_, media_channel, NULL, "video", false);
AddOutgoingVideoTrackStats(); AddOutgoingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -944,7 +944,7 @@ TEST_F(StatsCollectorTest, TrackAndSsrcObjectExistAfterUpdateSsrcStats) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, NULL, kVideoChannelName, false, NULL); media_engine_, media_channel, NULL, kVideoChannelName, false);
AddOutgoingVideoTrackStats(); AddOutgoingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -1005,7 +1005,7 @@ TEST_F(StatsCollectorTest, TransportObjectLinkedFromSsrcObject) {
// The content_name known by the video channel. // The content_name known by the video channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, NULL, kVcName, false, NULL); media_engine_, media_channel, NULL, kVcName, false);
AddOutgoingVideoTrackStats(); AddOutgoingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -1063,7 +1063,7 @@ TEST_F(StatsCollectorTest, RemoteSsrcInfoIsAbsent) {
// The content_name known by the video channel. // The content_name known by the video channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, NULL, kVcName, false, NULL); media_engine_, media_channel, NULL, kVcName, false);
AddOutgoingVideoTrackStats(); AddOutgoingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -1090,7 +1090,7 @@ TEST_F(StatsCollectorTest, RemoteSsrcInfoIsPresent) {
// The content_name known by the video channel. // The content_name known by the video channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, NULL, kVcName, false, NULL); media_engine_, media_channel, NULL, kVcName, false);
AddOutgoingVideoTrackStats(); AddOutgoingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -1142,7 +1142,7 @@ TEST_F(StatsCollectorTest, ReportsFromRemoteTrack) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, NULL, kVideoChannelName, false, NULL); media_engine_, media_channel, NULL, kVideoChannelName, false);
AddIncomingVideoTrackStats(); AddIncomingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);

4
talk/session/media/channel.cc
View File

@ -1724,11 +1724,9 @@ VideoChannel::VideoChannel(rtc::Thread* thread,
VideoMediaChannel* media_channel, VideoMediaChannel* media_channel,
BaseSession* session, BaseSession* session,
const std::string& content_name, const std::string& content_name,
bool rtcp, bool rtcp)
VoiceChannel* voice_channel)
: BaseChannel(thread, media_engine, media_channel, session, content_name, : BaseChannel(thread, media_engine, media_channel, session, content_name,
rtcp), rtcp),
voice_channel_(voice_channel),
renderer_(NULL), renderer_(NULL),
previous_we_(rtc::WE_CLOSE) { previous_we_(rtc::WE_CLOSE) {
} }

4
talk/session/media/channel.h
View File

@ -522,8 +522,7 @@ class VideoChannel : public BaseChannel {
public: public:
VideoChannel(rtc::Thread* thread, MediaEngineInterface* media_engine, VideoChannel(rtc::Thread* thread, MediaEngineInterface* media_engine,
VideoMediaChannel* channel, BaseSession* session, VideoMediaChannel* channel, BaseSession* session,
const std::string& content_name, bool rtcp, const std::string& content_name, bool rtcp);
VoiceChannel* voice_channel);
~VideoChannel(); ~VideoChannel();
bool Init(); bool Init();
@ -602,7 +601,6 @@ class VideoChannel : public BaseChannel {
void OnVideoChannelError(uint32 ssrc, VideoMediaChannel::Error error); void OnVideoChannelError(uint32 ssrc, VideoMediaChannel::Error error);
void OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode, SrtpFilter::Error error); void OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode, SrtpFilter::Error error);
VoiceChannel* voice_channel_;
VideoRenderer* renderer_; VideoRenderer* renderer_;
ScreencastMap screencast_capturers_; ScreencastMap screencast_capturers_;
rtc::scoped_ptr<VideoMediaMonitor> media_monitor_; rtc::scoped_ptr<VideoMediaMonitor> media_monitor_;

2
talk/session/media/channel_unittest.cc
View File

@ -1911,7 +1911,7 @@ cricket::VideoChannel* ChannelTest<VideoTraits>::CreateChannel(
cricket::FakeVideoMediaChannel* ch, cricket::BaseSession* session, cricket::FakeVideoMediaChannel* ch, cricket::BaseSession* session,
bool rtcp) { bool rtcp) {
cricket::VideoChannel* channel = new cricket::VideoChannel( cricket::VideoChannel* channel = new cricket::VideoChannel(
thread, engine, ch, session, cricket::CN_VIDEO, rtcp, NULL); thread, engine, ch, session, cricket::CN_VIDEO, rtcp);
if (!channel->Init()) { if (!channel->Init()) {
delete channel; delete channel;
channel = NULL; channel = NULL;

2
talk/session/media/channelmanager.cc
View File

@ -424,7 +424,7 @@ VideoChannel* ChannelManager::CreateVideoChannel_w(
VideoChannel* video_channel = new VideoChannel( VideoChannel* video_channel = new VideoChannel(
worker_thread_, media_engine_.get(), media_channel, worker_thread_, media_engine_.get(), media_channel,
session, content_name, rtcp, voice_channel); session, content_name, rtcp);
if (!video_channel->Init()) { if (!video_channel->Init()) {
delete video_channel; delete video_channel;
return NULL; return NULL;

2
talk/session/media/mediarecorder_unittest.cc
View File

@ -347,7 +347,7 @@ TEST(MediaRecorderTest, TestMediaRecorderVideoChannel) {
FakeMediaEngine media_engine; FakeMediaEngine media_engine;
FakeVideoMediaChannel* media_channel = new FakeVideoMediaChannel(NULL); FakeVideoMediaChannel* media_channel = new FakeVideoMediaChannel(NULL);
VideoChannel channel(rtc::Thread::Current(), &media_engine, VideoChannel channel(rtc::Thread::Current(), &media_engine,
media_channel, NULL, "", false, NULL); media_channel, NULL, "", false);
TestMediaRecorder(&channel, media_channel, PF_RTPPACKET); TestMediaRecorder(&channel, media_channel, PF_RTPPACKET);
TestMediaRecorder(&channel, media_channel, PF_RTPHEADER); TestMediaRecorder(&channel, media_channel, PF_RTPHEADER);
TestRecordHeaderAndMedia(&channel, media_channel); TestRecordHeaderAndMedia(&channel, media_channel);