Index: media/capture/video/android/photo_capabilities.h |
diff --git a/media/capture/video/android/photo_capabilities.h b/media/capture/video/android/photo_capabilities.h |
index d89d715c6907f509a24147be3fdc81190f481183..c933322ce24311f7d0f088a3d79d370fd1be5c6e 100644 |
--- a/media/capture/video/android/photo_capabilities.h |
+++ b/media/capture/video/android/photo_capabilities.h |
@@ -14,18 +14,31 @@ namespace media { |
class PhotoCapabilities { |
public: |
- // Focus modes from Java side, equivalent to media.mojom::MeteringMode, except |
- // NOT_SET, which is used to signify absence of setting configuration. |
+ // Metering modes from Java side, equivalent to media.mojom::MeteringMode, |
+ // except NOT_SET, which is used to signify absence of setting configuration. |
// A Java counterpart will be generated for this enum. |
// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media |
enum class AndroidMeteringMode { |
NOT_SET, |
- UNAVAILABLE, |
+ NONE, |
FIXED, |
SINGLE_SHOT, |
CONTINUOUS, |
}; |
+ // Fill light modes from Java side, equivalent to media.mojom::FillLightMode, |
+ // except NOT_SET, which is used to signify absence of setting configuration. |
+ // A Java counterpart will be generated for this enum. |
+ // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media |
+ enum class AndroidFillLightMode { |
+ NOT_SET, |
+ NONE, // Only meaningful for getting capabilities, meaning "no flash unit". |
+ OFF, |
+ AUTO, |
+ FLASH, |
+ TORCH, |
+ }; |
+ |
explicit PhotoCapabilities(base::android::ScopedJavaLocalRef<jobject> object); |
~PhotoCapabilities(); |
@@ -47,6 +60,7 @@ class PhotoCapabilities { |
int getMaxExposureCompensation() const; |
int getCurrentExposureCompensation() const; |
AndroidMeteringMode getWhiteBalanceMode() const; |
+ AndroidFillLightMode getFillLightMode() const; |
private: |
const base::android::ScopedJavaLocalRef<jobject> object_; |