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

Suppress WebRtcVideoEncoderFactory overloaded virtual function warning

Browse Source 
Suppress WebRtcVideoEncoderFactory overloaded virtual function warning
in WebRtcSimulcastEncoderFactory and FakeWebRtcVideoEncoderFactory.

This warning is triggered by the change in this CL:
https://codereview.webrtc.org/2449993003/.

BUG=webrtc:6402, webrtc:6337

Review-Url: https://codereview.webrtc.org/2468253002
Cr-Commit-Position: refs/heads/master@{#14901}
This commit is contained in:
magjed 2016-11-02 11:08:29 -07:00 committed by Commit bot
parent 44e0efe0e6
commit d2fce1744f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/media/engine/fakewebrtcvideoengine.h
View File

@ -248,6 +248,10 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory {
}
private:
// Disable overloaded virtual function warning. TODO(magjed): Remove once
// http://crbug/webrtc/6402 is fixed.
using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder;
rtc::CriticalSection crit_;
rtc::Event created_video_encoder_event_;
std::vector<cricket::VideoCodec> codecs_;

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

@ -149,6 +149,10 @@ class WebRtcSimulcastEncoderFactory
}
private:
// Disable overloaded virtual function warning. TODO(magjed): Remove once
// http://crbug/webrtc/6402 is fixed.
using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder;
cricket::WebRtcVideoEncoderFactory* factory_;
// A list of encoders that were created without being wrapped in a
// SimulcastEncoderAdapter.