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

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

Issue 2859223003: WebRtcVideoEncoderFactory cleanup (Closed)
Patch Set: Created 3 years, 7 months 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 | « webrtc/media/BUILD.gn ('k') | webrtc/media/engine/internalencoderfactory.h » ('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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 rtc::CritScope lock(&crit_); 240 rtc::CritScope lock(&crit_);
241 return num_created_encoders_; 241 return num_created_encoders_;
242 } 242 }
243 243
244 const std::vector<FakeWebRtcVideoEncoder*> encoders() { 244 const std::vector<FakeWebRtcVideoEncoder*> encoders() {
245 rtc::CritScope lock(&crit_); 245 rtc::CritScope lock(&crit_);
246 return encoders_; 246 return encoders_;
247 } 247 }
248 248
249 private: 249 private:
250 // Disable overloaded virtual function warning. TODO(magjed): Remove once
251 // http://crbug/webrtc/6402 is fixed.
252 using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder;
253
254 rtc::CriticalSection crit_; 250 rtc::CriticalSection crit_;
255 rtc::Event created_video_encoder_event_; 251 rtc::Event created_video_encoder_event_;
256 std::vector<cricket::VideoCodec> codecs_; 252 std::vector<cricket::VideoCodec> codecs_;
257 std::vector<FakeWebRtcVideoEncoder*> encoders_ GUARDED_BY(crit_); 253 std::vector<FakeWebRtcVideoEncoder*> encoders_ GUARDED_BY(crit_);
258 int num_created_encoders_ GUARDED_BY(crit_); 254 int num_created_encoders_ GUARDED_BY(crit_);
259 bool encoders_have_internal_sources_; 255 bool encoders_have_internal_sources_;
260 }; 256 };
261 257
262 } // namespace cricket 258 } // namespace cricket
263 259
264 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ 260 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/BUILD.gn ('k') | webrtc/media/engine/internalencoderfactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698