Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Side by Side Diff: webrtc/media/engine/fakewebrtcvideoengine.h

Issue 2468253002: Suppress WebRtcVideoEncoderFactory overloaded virtual function warning (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 rtc::CritScope lock(&crit_); 241 rtc::CritScope lock(&crit_);
242 return num_created_encoders_; 242 return num_created_encoders_;
243 } 243 }
244 244
245 const std::vector<FakeWebRtcVideoEncoder*> encoders() { 245 const std::vector<FakeWebRtcVideoEncoder*> encoders() {
246 rtc::CritScope lock(&crit_); 246 rtc::CritScope lock(&crit_);
247 return encoders_; 247 return encoders_;
248 } 248 }
249 249
250 private: 250 private:
251 // Disable overloaded virtual function warning. TODO(magjed): Remove once
252 // http://crbug/webrtc/6402 is fixed.
253 using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder;
254
251 rtc::CriticalSection crit_; 255 rtc::CriticalSection crit_;
252 rtc::Event created_video_encoder_event_; 256 rtc::Event created_video_encoder_event_;
253 std::vector<cricket::VideoCodec> codecs_; 257 std::vector<cricket::VideoCodec> codecs_;
254 std::vector<FakeWebRtcVideoEncoder*> encoders_ GUARDED_BY(crit_); 258 std::vector<FakeWebRtcVideoEncoder*> encoders_ GUARDED_BY(crit_);
255 int num_created_encoders_ GUARDED_BY(crit_); 259 int num_created_encoders_ GUARDED_BY(crit_);
256 bool encoders_have_internal_sources_; 260 bool encoders_have_internal_sources_;
257 }; 261 };
258 262
259 } // namespace cricket 263 } // namespace cricket
260 264
261 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ 265 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698