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

Minor lint-fixes in MediaChannel and VideoEngine2.

Browse Source 
Review-Url: https://codereview.webrtc.org/2020243005
Cr-Commit-Position: refs/heads/master@{#12996}
This commit is contained in:
terelius 2016-06-01 11:18:56 -07:00 committed by Commit bot
parent b787d87504
commit 54f9171b3f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/media/base/mediachannel.h
View File

@ -11,6 +11,7 @@
#ifndef WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
#define WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
#include <algorithm>
#include <memory>
#include <string>
#include <vector>
@ -352,7 +353,7 @@ class MediaChannel : public sigslot::has_slots<> {
virtual ~NetworkInterface() {}
};
MediaChannel(const MediaConfig& config)
explicit MediaChannel(const MediaConfig& config)
: enable_dscp_(config.enable_dscp), network_interface_(NULL) {}
MediaChannel() : enable_dscp_(false), network_interface_(NULL) {}
virtual ~MediaChannel() {}
@ -886,7 +887,8 @@ class VoiceMediaChannel : public MediaChannel {
};
VoiceMediaChannel() {}
VoiceMediaChannel(const MediaConfig& config) : MediaChannel(config) {}
explicit VoiceMediaChannel(const MediaConfig& config)
: MediaChannel(config) {}
virtual ~VoiceMediaChannel() {}
virtual bool SetSendParameters(const AudioSendParameters& params) = 0;
virtual bool SetRecvParameters(const AudioRecvParameters& params) = 0;
@ -970,7 +972,8 @@ class VideoMediaChannel : public MediaChannel {
};
VideoMediaChannel() {}
VideoMediaChannel(const MediaConfig& config) : MediaChannel(config) {}
explicit VideoMediaChannel(const MediaConfig& config)
: MediaChannel(config) {}
virtual ~VideoMediaChannel() {}
virtual bool SetSendParameters(const VideoSendParameters& params) = 0;

2
webrtc/media/engine/webrtcvideoengine2.cc
View File

@ -1667,8 +1667,6 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::SetSource(
stream_->Input()->IncomingCapturedFrame(
CreateBlackFrame(last_dimensions_.width, last_dimensions_.height,
last_frame_timestamp_ms_, last_rotation_));
}
}
}