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

Side by Side Diff: media/capture/video/android/video_capture_device_factory_android.h

Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build errors Created 4 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 5 #ifndef MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
6 #define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 6 #define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
7 7
8 #include "media/capture/video/video_capture_device_factory.h" 8 #include "media/capture/video/video_capture_device_factory.h"
9 9
10 #include <jni.h> 10 #include <jni.h>
(...skipping 10 matching lines...) Expand all
21 : public VideoCaptureDeviceFactory { 21 : public VideoCaptureDeviceFactory {
22 public: 22 public:
23 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env); 23 static bool RegisterVideoCaptureDeviceFactory(JNIEnv* env);
24 static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid( 24 static base::android::ScopedJavaLocalRef<jobject> createVideoCaptureAndroid(
25 int id, 25 int id,
26 jlong nativeVideoCaptureDeviceAndroid); 26 jlong nativeVideoCaptureDeviceAndroid);
27 27
28 VideoCaptureDeviceFactoryAndroid() {} 28 VideoCaptureDeviceFactoryAndroid() {}
29 ~VideoCaptureDeviceFactoryAndroid() override {} 29 ~VideoCaptureDeviceFactoryAndroid() override {}
30 30
31 std::unique_ptr<VideoCaptureDevice> Create( 31 std::unique_ptr<VideoCaptureDevice> CreateDevice(
32 const VideoCaptureDevice::Name& device_name) override; 32 const VideoCaptureDeviceDescriptor& device_descriptor) override;
33 void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; 33 void GetDeviceDescriptors(
34 void GetDeviceSupportedFormats( 34 VideoCaptureDeviceDescriptors* device_descriptors) override;
35 const VideoCaptureDevice::Name& device, 35 void GetSupportedFormats(const VideoCaptureDeviceDescriptor& device,
36 VideoCaptureFormats* supported_formats) override; 36 VideoCaptureFormats* supported_formats) override;
37 37
38 private: 38 private:
39 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid); 39 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);
40 }; 40 };
41 } // namespace media 41 } // namespace media
42 42
43 #endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_ 43 #endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_FACTORY_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698