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

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

Issue 1817953005: Use rtc::scoped_refptr for WebRtcVideoCapturer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove incorrect early return Created 4 years, 9 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 | « no previous file | webrtc/media/engine/fakewebrtcvideocapturemodule.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) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 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
11 #ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ 11 #ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
12 #define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ 12 #define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/media/engine/fakewebrtcdeviceinfo.h" 16 #include "webrtc/media/engine/fakewebrtcdeviceinfo.h"
17 #include "webrtc/media/engine/fakewebrtcvideocapturemodule.h" 17 #include "webrtc/media/engine/fakewebrtcvideocapturemodule.h"
18 #include "webrtc/media/engine/webrtcvideocapturer.h" 18 #include "webrtc/media/engine/webrtcvideocapturer.h"
19 19
20 // Factory class to allow the fakes above to be injected into 20 // Factory class to allow the fakes above to be injected into
21 // WebRtcVideoCapturer. 21 // WebRtcVideoCapturer.
22 class FakeWebRtcVcmFactory : public cricket::WebRtcVcmFactoryInterface { 22 class FakeWebRtcVcmFactory : public cricket::WebRtcVcmFactoryInterface {
23 public: 23 public:
24 virtual webrtc::VideoCaptureModule* Create(int module_id, 24 virtual rtc::scoped_refptr<webrtc::VideoCaptureModule> Create(
25 const char* device_id) { 25 int module_id,
26 const char* device_id) {
26 if (!device_info.GetDeviceById(device_id)) return NULL; 27 if (!device_info.GetDeviceById(device_id)) return NULL;
27 FakeWebRtcVideoCaptureModule* module = 28 rtc::scoped_refptr<FakeWebRtcVideoCaptureModule> module(
28 new FakeWebRtcVideoCaptureModule(this, module_id); 29 new rtc::RefCountedObject<FakeWebRtcVideoCaptureModule>(this,
30 module_id));
29 modules.push_back(module); 31 modules.push_back(module);
30 return module; 32 return module;
31 } 33 }
32 virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo(int id) { 34 virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo(int id) {
33 return &device_info; 35 return &device_info;
34 } 36 }
35 virtual void DestroyDeviceInfo(webrtc::VideoCaptureModule::DeviceInfo* info) { 37 virtual void DestroyDeviceInfo(webrtc::VideoCaptureModule::DeviceInfo* info) {
36 } 38 }
37 void OnDestroyed(webrtc::VideoCaptureModule* module) { 39 void OnDestroyed(webrtc::VideoCaptureModule* module) {
38 std::remove(modules.begin(), modules.end(), module); 40 std::remove(modules.begin(), modules.end(), module);
39 } 41 }
40 FakeWebRtcDeviceInfo device_info; 42 FakeWebRtcDeviceInfo device_info;
41 std::vector<FakeWebRtcVideoCaptureModule*> modules; 43 std::vector<rtc::scoped_refptr<FakeWebRtcVideoCaptureModule>> modules;
42 }; 44 };
43 45
44 FakeWebRtcVideoCaptureModule::~FakeWebRtcVideoCaptureModule() { 46 FakeWebRtcVideoCaptureModule::~FakeWebRtcVideoCaptureModule() {
45 if (factory_) 47 if (factory_)
46 factory_->OnDestroyed(this); 48 factory_->OnDestroyed(this);
47 } 49 }
48 50
49 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ 51 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/fakewebrtcvideocapturemodule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698