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

Enable -Wunused-private-field warning for talk/

Browse Source 
BUG=4242
R=pbos@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#9069}
This commit is contained in:
Henrik Kjellander 2015-04-23 14:51:18 +02:00
parent d3e8eda839
commit 24d4485614
3 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
talk/build/common.gypi
View File

@ -91,6 +91,9 @@
'-Wno-address-of-array-temporary',
'-Wthread-safety',
],
'cflags_cc': [
'-Wunused-private-field',
],
}],
],
}],

8
talk/media/webrtc/webrtcpassthroughrender.cc
View File

@ -37,10 +37,7 @@ namespace cricket {
class PassthroughStream: public webrtc::VideoRenderCallback {
public:
explicit PassthroughStream(const uint32_t stream_id)
: stream_id_(stream_id),
running_(false) {
}
PassthroughStream() : running_(false) {}
virtual ~PassthroughStream() {
}
virtual int32_t RenderFrame(const uint32_t stream_id,
@ -71,7 +68,6 @@ class PassthroughStream: public webrtc::VideoRenderCallback {
}
private:
uint32_t stream_id_;
VideoRenderCallback* renderer_;
rtc::CriticalSection stream_critical_;
bool running_;
@ -102,7 +98,7 @@ webrtc::VideoRenderCallback* WebRtcPassthroughRender::AddIncomingRenderStream(
return NULL;
}
PassthroughStream* stream = new PassthroughStream(stream_id);
PassthroughStream* stream = new PassthroughStream();
// Store the stream
stream_render_map_[stream_id] = stream;
return stream;

41
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -464,18 +464,16 @@ class WebRtcRenderAdapter : public webrtc::ExternalRenderer {
class WebRtcDecoderObserver : public webrtc::ViEDecoderObserver {
public:
explicit WebRtcDecoderObserver(int video_channel_id)
: video_channel_id_(video_channel_id),
framerate_(0),
bitrate_(0),
decode_ms_(0),
max_decode_ms_(0),
current_delay_ms_(0),
target_delay_ms_(0),
jitter_buffer_ms_(0),
min_playout_delay_ms_(0),
render_delay_ms_(0) {
}
explicit WebRtcDecoderObserver()
: framerate_(0),
bitrate_(0),
decode_ms_(0),
max_decode_ms_(0),
current_delay_ms_(0),
target_delay_ms_(0),
jitter_buffer_ms_(0),
min_playout_delay_ms_(0),
render_delay_ms_(0) {}
// virtual functions from VieDecoderObserver.
virtual void IncomingCodecChanged(const int video_channel_id,
@ -484,7 +482,6 @@ class WebRtcDecoderObserver : public webrtc::ViEDecoderObserver {
const unsigned int framerate,
const unsigned int bitrate) {
rtc::CritScope cs(&crit_);
ASSERT(video_channel_id_ == video_channel_id);
framerate_ = framerate;
bitrate_ = bitrate;
}
@ -523,7 +520,6 @@ class WebRtcDecoderObserver : public webrtc::ViEDecoderObserver {
private:
mutable rtc::CriticalSection crit_;
int video_channel_id_;
int framerate_;
int bitrate_;
int decode_ms_;
@ -537,26 +533,20 @@ class WebRtcDecoderObserver : public webrtc::ViEDecoderObserver {
class WebRtcEncoderObserver : public webrtc::ViEEncoderObserver {
public:
explicit WebRtcEncoderObserver(int video_channel_id)
: video_channel_id_(video_channel_id),
framerate_(0),
bitrate_(0),
suspended_(false) {
}
explicit WebRtcEncoderObserver()
: framerate_(0), bitrate_(0), suspended_(false) {}
// virtual functions from VieEncoderObserver.
virtual void OutgoingRate(const int video_channel_id,
const unsigned int framerate,
const unsigned int bitrate) {
rtc::CritScope cs(&crit_);
ASSERT(video_channel_id_ == video_channel_id);
framerate_ = framerate;
bitrate_ = bitrate;
}
virtual void SuspendChange(int video_channel_id, bool is_suspended) {
rtc::CritScope cs(&crit_);
ASSERT(video_channel_id_ == video_channel_id);
suspended_ = is_suspended;
}
@ -575,7 +565,6 @@ class WebRtcEncoderObserver : public webrtc::ViEEncoderObserver {
private:
mutable rtc::CriticalSection crit_;
int video_channel_id_;
int framerate_;
int bitrate_;
bool suspended_;
@ -642,10 +631,7 @@ class WebRtcVideoChannelRecvInfo {
public:
typedef std::map<int, webrtc::VideoDecoder*> DecoderMap; // Key: payload type
explicit WebRtcVideoChannelRecvInfo(int channel_id)
: channel_id_(channel_id),
render_adapter_(NULL, channel_id),
decoder_observer_(channel_id) {
}
: channel_id_(channel_id), render_adapter_(NULL, channel_id) {}
int channel_id() { return channel_id_; }
void SetRenderer(VideoRenderer* renderer) {
render_adapter_.SetRenderer(renderer);
@ -737,7 +723,6 @@ class WebRtcVideoChannelSendInfo : public sigslot::has_slots<> {
sending_(false),
muted_(false),
video_capturer_(NULL),
encoder_observer_(channel_id),
external_capture_(external_capture),
cpu_monitor_(cpu_monitor),
old_adaptation_changes_(0),