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

Side by Side Diff: media/capture/video/android/photo_capabilities.cc

Issue 2482983002: MediaSettingsRange: s/long/double/ in MediaSettingsRange.idl and PhotoCapabilities.idl (Closed)
Patch Set: s/float/double/ in fake_video_capture_device.* 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "media/capture/video/android/photo_capabilities.h" 5 #include "media/capture/video/android/photo_capabilities.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "jni/PhotoCapabilities_jni.h" 10 #include "jni/PhotoCapabilities_jni.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 int PhotoCapabilities::getCurrentWidth() const { 73 int PhotoCapabilities::getCurrentWidth() const {
74 DCHECK(!object_.is_null()); 74 DCHECK(!object_.is_null());
75 return Java_PhotoCapabilities_getCurrentWidth(AttachCurrentThread(), object_); 75 return Java_PhotoCapabilities_getCurrentWidth(AttachCurrentThread(), object_);
76 } 76 }
77 77
78 int PhotoCapabilities::getStepWidth() const { 78 int PhotoCapabilities::getStepWidth() const {
79 DCHECK(!object_.is_null()); 79 DCHECK(!object_.is_null());
80 return Java_PhotoCapabilities_getStepWidth(AttachCurrentThread(), object_); 80 return Java_PhotoCapabilities_getStepWidth(AttachCurrentThread(), object_);
81 } 81 }
82 82
83 int PhotoCapabilities::getMinZoom() const { 83 double PhotoCapabilities::getMinZoom() const {
84 DCHECK(!object_.is_null()); 84 DCHECK(!object_.is_null());
85 return Java_PhotoCapabilities_getMinZoom(AttachCurrentThread(), object_); 85 return Java_PhotoCapabilities_getMinZoom(AttachCurrentThread(), object_);
86 } 86 }
87 87
88 int PhotoCapabilities::getMaxZoom() const { 88 double PhotoCapabilities::getMaxZoom() const {
89 DCHECK(!object_.is_null()); 89 DCHECK(!object_.is_null());
90 return Java_PhotoCapabilities_getMaxZoom(AttachCurrentThread(), object_); 90 return Java_PhotoCapabilities_getMaxZoom(AttachCurrentThread(), object_);
91 } 91 }
92 92
93 int PhotoCapabilities::getCurrentZoom() const { 93 double PhotoCapabilities::getCurrentZoom() const {
94 DCHECK(!object_.is_null()); 94 DCHECK(!object_.is_null());
95 return Java_PhotoCapabilities_getCurrentZoom(AttachCurrentThread(), object_); 95 return Java_PhotoCapabilities_getCurrentZoom(AttachCurrentThread(), object_);
96 } 96 }
97 97
98 int PhotoCapabilities::getStepZoom() const { 98 double PhotoCapabilities::getStepZoom() const {
99 DCHECK(!object_.is_null()); 99 DCHECK(!object_.is_null());
100 return Java_PhotoCapabilities_getStepZoom(AttachCurrentThread(), object_); 100 return Java_PhotoCapabilities_getStepZoom(AttachCurrentThread(), object_);
101 } 101 }
102 102
103 PhotoCapabilities::AndroidMeteringMode PhotoCapabilities::getFocusMode() const { 103 PhotoCapabilities::AndroidMeteringMode PhotoCapabilities::getFocusMode() const {
104 DCHECK(!object_.is_null()); 104 DCHECK(!object_.is_null());
105 return static_cast<AndroidMeteringMode>( 105 return static_cast<AndroidMeteringMode>(
106 Java_PhotoCapabilities_getFocusMode(AttachCurrentThread(), object_)); 106 Java_PhotoCapabilities_getFocusMode(AttachCurrentThread(), object_));
107 } 107 }
108 108
109 PhotoCapabilities::AndroidMeteringMode PhotoCapabilities::getExposureMode() 109 PhotoCapabilities::AndroidMeteringMode PhotoCapabilities::getExposureMode()
110 const { 110 const {
111 DCHECK(!object_.is_null()); 111 DCHECK(!object_.is_null());
112 return static_cast<AndroidMeteringMode>( 112 return static_cast<AndroidMeteringMode>(
113 Java_PhotoCapabilities_getExposureMode(AttachCurrentThread(), object_)); 113 Java_PhotoCapabilities_getExposureMode(AttachCurrentThread(), object_));
114 } 114 }
115 115
116 int PhotoCapabilities::getMinExposureCompensation() const { 116 double PhotoCapabilities::getMinExposureCompensation() const {
117 DCHECK(!object_.is_null()); 117 DCHECK(!object_.is_null());
118 return Java_PhotoCapabilities_getMinExposureCompensation( 118 return Java_PhotoCapabilities_getMinExposureCompensation(
119 AttachCurrentThread(), object_); 119 AttachCurrentThread(), object_);
120 } 120 }
121 121
122 int PhotoCapabilities::getMaxExposureCompensation() const { 122 double PhotoCapabilities::getMaxExposureCompensation() const {
123 DCHECK(!object_.is_null()); 123 DCHECK(!object_.is_null());
124 return Java_PhotoCapabilities_getMaxExposureCompensation( 124 return Java_PhotoCapabilities_getMaxExposureCompensation(
125 AttachCurrentThread(), object_); 125 AttachCurrentThread(), object_);
126 } 126 }
127 127
128 int PhotoCapabilities::getCurrentExposureCompensation() const { 128 double PhotoCapabilities::getCurrentExposureCompensation() const {
129 DCHECK(!object_.is_null()); 129 DCHECK(!object_.is_null());
130 return Java_PhotoCapabilities_getCurrentExposureCompensation( 130 return Java_PhotoCapabilities_getCurrentExposureCompensation(
131 AttachCurrentThread(), object_); 131 AttachCurrentThread(), object_);
132 } 132 }
133 133
134 int PhotoCapabilities::getStepExposureCompensation() const { 134 double PhotoCapabilities::getStepExposureCompensation() const {
135 DCHECK(!object_.is_null()); 135 DCHECK(!object_.is_null());
136 return Java_PhotoCapabilities_getStepExposureCompensation( 136 return Java_PhotoCapabilities_getStepExposureCompensation(
137 AttachCurrentThread(), object_); 137 AttachCurrentThread(), object_);
138 } 138 }
139 139
140 PhotoCapabilities::AndroidMeteringMode PhotoCapabilities::getWhiteBalanceMode() 140 PhotoCapabilities::AndroidMeteringMode PhotoCapabilities::getWhiteBalanceMode()
141 const { 141 const {
142 DCHECK(!object_.is_null()); 142 DCHECK(!object_.is_null());
143 return static_cast<AndroidMeteringMode>( 143 return static_cast<AndroidMeteringMode>(
144 Java_PhotoCapabilities_getWhiteBalanceMode(AttachCurrentThread(), 144 Java_PhotoCapabilities_getWhiteBalanceMode(AttachCurrentThread(),
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 AttachCurrentThread(), object_); 176 AttachCurrentThread(), object_);
177 } 177 }
178 178
179 int PhotoCapabilities::getStepColorTemperature() const { 179 int PhotoCapabilities::getStepColorTemperature() const {
180 DCHECK(!object_.is_null()); 180 DCHECK(!object_.is_null());
181 return Java_PhotoCapabilities_getStepColorTemperature(AttachCurrentThread(), 181 return Java_PhotoCapabilities_getStepColorTemperature(AttachCurrentThread(),
182 object_); 182 object_);
183 } 183 }
184 184
185 } // namespace media 185 } // namespace media
OLDNEW
« no previous file with comments | « media/capture/video/android/photo_capabilities.h ('k') | media/capture/video/android/video_capture_device_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698