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

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

Issue 2385833002: Image Capture Android: wire color temperature set/get (Closed)
Patch Set: reillyg@s comments Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/capture/video/android/java/src/org/chromium/media/VideoCapture.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java
diff --git a/media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java b/media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java
index 29d71f7358f1d746252f1d57b4187ce0e1bb00f4..157c5cf1bf6e96c2e8a26f1fd1e511f48f7776d3 100644
--- a/media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java
+++ b/media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java
@@ -32,13 +32,17 @@ class PhotoCapabilities {
public final int whiteBalanceMode;
public final int fillLightMode;
public final boolean redEyeReduction;
+ public final int maxColorTemperature;
+ public final int minColorTemperature;
+ public final int currentColorTemperature;
PhotoCapabilities(int maxIso, int minIso, int currentIso, int maxHeight, int minHeight,
int currentHeight, int maxWidth, int minWidth, int currentWidth, int maxZoom,
int minZoom, int currentZoom, int focusMode, int exposureMode,
int maxExposureCompensation, int minExposureCompensation,
int currentExposureCompensation, int whiteBalanceMode, int fillLightMode,
- boolean redEyeReduction) {
+ boolean redEyeReduction, int maxColorTemperature, int minColorTemperature,
+ int currentColorTemperature) {
this.maxIso = maxIso;
this.minIso = minIso;
this.currentIso = currentIso;
@@ -59,6 +63,9 @@ class PhotoCapabilities {
this.whiteBalanceMode = whiteBalanceMode;
this.fillLightMode = fillLightMode;
this.redEyeReduction = redEyeReduction;
+ this.maxColorTemperature = maxColorTemperature;
+ this.minColorTemperature = minColorTemperature;
+ this.currentColorTemperature = currentColorTemperature;
}
@CalledByNative
@@ -161,6 +168,21 @@ class PhotoCapabilities {
return redEyeReduction;
}
+ @CalledByNative
+ public int getMinColorTemperature() {
+ return minColorTemperature;
+ }
+
+ @CalledByNative
+ public int getMaxColorTemperature() {
+ return maxColorTemperature;
+ }
+
+ @CalledByNative
+ public int getCurrentColorTemperature() {
+ return currentColorTemperature;
+ }
+
public static class Builder {
public int maxIso;
public int minIso;
@@ -182,6 +204,9 @@ class PhotoCapabilities {
public int whiteBalanceMode;
public int fillLightMode;
public boolean redEyeReduction;
+ public int maxColorTemperature;
+ public int minColorTemperature;
+ public int currentColorTemperature;
public Builder() {}
@@ -285,11 +310,27 @@ class PhotoCapabilities {
return this;
}
+ public Builder setMaxColorTemperature(int maxColorTemperature) {
+ this.maxColorTemperature = maxColorTemperature;
+ return this;
+ }
+
+ public Builder setMinColorTemperature(int minColorTemperature) {
+ this.minColorTemperature = minColorTemperature;
+ return this;
+ }
+
+ public Builder setCurrentColorTemperature(int currentColorTemperature) {
+ this.currentColorTemperature = currentColorTemperature;
+ return this;
+ }
+
public PhotoCapabilities build() {
return new PhotoCapabilities(maxIso, minIso, currentIso, maxHeight, minHeight,
currentHeight, maxWidth, minWidth, currentWidth, maxZoom, minZoom, currentZoom,
focusMode, exposureMode, maxExposureCompensation, minExposureCompensation,
- currentExposureCompensation, whiteBalanceMode, fillLightMode, redEyeReduction);
+ currentExposureCompensation, whiteBalanceMode, fillLightMode, redEyeReduction,
+ maxColorTemperature, minColorTemperature, currentColorTemperature);
}
}
}
« no previous file with comments | « no previous file | media/capture/video/android/java/src/org/chromium/media/VideoCapture.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698