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

Side by Side Diff: media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java

Issue 2301053004: Image Capture: adding fillLightMode getting/setting (Closed)
Patch Set: Created 4 years, 3 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 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 package org.chromium.media; 5 package org.chromium.media;
6 6
7 import org.chromium.base.annotations.CalledByNative; 7 import org.chromium.base.annotations.CalledByNative;
8 import org.chromium.base.annotations.JNINamespace; 8 import org.chromium.base.annotations.JNINamespace;
9 9
10 /** 10 /**
(...skipping 12 matching lines...) Expand all
23 public final int currentWidth; 23 public final int currentWidth;
24 public final int maxZoom; 24 public final int maxZoom;
25 public final int minZoom; 25 public final int minZoom;
26 public final int currentZoom; 26 public final int currentZoom;
27 public final int focusMode; 27 public final int focusMode;
28 public final int exposureMode; 28 public final int exposureMode;
29 public final int maxExposureCompensation; 29 public final int maxExposureCompensation;
30 public final int minExposureCompensation; 30 public final int minExposureCompensation;
31 public final int currentExposureCompensation; 31 public final int currentExposureCompensation;
32 public final int whiteBalanceMode; 32 public final int whiteBalanceMode;
33 public final int fillLightMode;
33 34
34 PhotoCapabilities(int maxIso, int minIso, int currentIso, int maxHeight, int minHeight, 35 PhotoCapabilities(int maxIso, int minIso, int currentIso, int maxHeight, int minHeight,
35 int currentHeight, int maxWidth, int minWidth, int currentWidth, int maxZoom, 36 int currentHeight, int maxWidth, int minWidth, int currentWidth, int maxZoom,
36 int minZoom, int currentZoom, int focusMode, int exposureMode, 37 int minZoom, int currentZoom, int focusMode, int exposureMode,
37 int maxExposureCompensation, int minExposureCompensation, 38 int maxExposureCompensation, int minExposureCompensation,
38 int currentExposureCompensation, int whiteBalanceMode) { 39 int currentExposureCompensation, int whiteBalanceMode, int fillLight Mode) {
39 this.maxIso = maxIso; 40 this.maxIso = maxIso;
40 this.minIso = minIso; 41 this.minIso = minIso;
41 this.currentIso = currentIso; 42 this.currentIso = currentIso;
42 this.maxHeight = maxHeight; 43 this.maxHeight = maxHeight;
43 this.minHeight = minHeight; 44 this.minHeight = minHeight;
44 this.currentHeight = currentHeight; 45 this.currentHeight = currentHeight;
45 this.maxWidth = maxWidth; 46 this.maxWidth = maxWidth;
46 this.minWidth = minWidth; 47 this.minWidth = minWidth;
47 this.currentWidth = currentWidth; 48 this.currentWidth = currentWidth;
48 this.maxZoom = maxZoom; 49 this.maxZoom = maxZoom;
49 this.minZoom = minZoom; 50 this.minZoom = minZoom;
50 this.currentZoom = currentZoom; 51 this.currentZoom = currentZoom;
51 this.focusMode = focusMode; 52 this.focusMode = focusMode;
52 this.exposureMode = exposureMode; 53 this.exposureMode = exposureMode;
53 this.maxExposureCompensation = maxExposureCompensation; 54 this.maxExposureCompensation = maxExposureCompensation;
54 this.minExposureCompensation = minExposureCompensation; 55 this.minExposureCompensation = minExposureCompensation;
55 this.currentExposureCompensation = currentExposureCompensation; 56 this.currentExposureCompensation = currentExposureCompensation;
56 this.whiteBalanceMode = whiteBalanceMode; 57 this.whiteBalanceMode = whiteBalanceMode;
58 this.fillLightMode = fillLightMode;
57 } 59 }
58 60
59 @CalledByNative 61 @CalledByNative
60 public int getMinIso() { 62 public int getMinIso() {
61 return minIso; 63 return minIso;
62 } 64 }
63 65
64 @CalledByNative 66 @CalledByNative
65 public int getMaxIso() { 67 public int getMaxIso() {
66 return maxIso; 68 return maxIso;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 @CalledByNative 141 @CalledByNative
140 public int getCurrentExposureCompensation() { 142 public int getCurrentExposureCompensation() {
141 return currentExposureCompensation; 143 return currentExposureCompensation;
142 } 144 }
143 145
144 @CalledByNative 146 @CalledByNative
145 public int getWhiteBalanceMode() { 147 public int getWhiteBalanceMode() {
146 return whiteBalanceMode; 148 return whiteBalanceMode;
147 } 149 }
148 150
151 @CalledByNative
152 public int getFillLightMode() {
153 return fillLightMode;
154 }
155
149 public static class Builder { 156 public static class Builder {
150 public int maxIso; 157 public int maxIso;
151 public int minIso; 158 public int minIso;
152 public int currentIso; 159 public int currentIso;
153 public int maxHeight; 160 public int maxHeight;
154 public int minHeight; 161 public int minHeight;
155 public int currentHeight; 162 public int currentHeight;
156 public int maxWidth; 163 public int maxWidth;
157 public int minWidth; 164 public int minWidth;
158 public int currentWidth; 165 public int currentWidth;
159 public int maxZoom; 166 public int maxZoom;
160 public int minZoom; 167 public int minZoom;
161 public int currentZoom; 168 public int currentZoom;
162 public int focusMode; 169 public int focusMode;
163 public int exposureMode; 170 public int exposureMode;
164 public int maxExposureCompensation; 171 public int maxExposureCompensation;
165 public int minExposureCompensation; 172 public int minExposureCompensation;
166 public int currentExposureCompensation; 173 public int currentExposureCompensation;
167 public int whiteBalanceMode; 174 public int whiteBalanceMode;
175 public int fillLightMode;
168 176
169 public Builder() {} 177 public Builder() {}
170 178
171 public Builder setMaxIso(int maxIso) { 179 public Builder setMaxIso(int maxIso) {
172 this.maxIso = maxIso; 180 this.maxIso = maxIso;
173 return this; 181 return this;
174 } 182 }
175 183
176 public Builder setMinIso(int minIso) { 184 public Builder setMinIso(int minIso) {
177 this.minIso = minIso; 185 this.minIso = minIso;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 public Builder setCurrentExposureCompensation(int currentExposureCompens ation) { 259 public Builder setCurrentExposureCompensation(int currentExposureCompens ation) {
252 this.currentExposureCompensation = currentExposureCompensation; 260 this.currentExposureCompensation = currentExposureCompensation;
253 return this; 261 return this;
254 } 262 }
255 263
256 public Builder setWhiteBalanceMode(int whiteBalanceMode) { 264 public Builder setWhiteBalanceMode(int whiteBalanceMode) {
257 this.whiteBalanceMode = whiteBalanceMode; 265 this.whiteBalanceMode = whiteBalanceMode;
258 return this; 266 return this;
259 } 267 }
260 268
269 public Builder setFillLightMode(int fillLightMode) {
270 this.fillLightMode = fillLightMode;
271 return this;
272 }
273
261 public PhotoCapabilities build() { 274 public PhotoCapabilities build() {
262 return new PhotoCapabilities(maxIso, minIso, currentIso, maxHeight, minHeight, 275 return new PhotoCapabilities(maxIso, minIso, currentIso, maxHeight, minHeight,
263 currentHeight, maxWidth, minWidth, currentWidth, maxZoom, mi nZoom, currentZoom, 276 currentHeight, maxWidth, minWidth, currentWidth, maxZoom, mi nZoom, currentZoom,
264 focusMode, exposureMode, maxExposureCompensation, minExposur eCompensation, 277 focusMode, exposureMode, maxExposureCompensation, minExposur eCompensation,
265 currentExposureCompensation, whiteBalanceMode); 278 currentExposureCompensation, whiteBalanceMode, fillLightMode );
266 } 279 }
267 } 280 }
268 } 281 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698