diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-05-02 21:17:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-02 21:17:44 +0000 |
| commit | a69f3213d122b09d04fb890efd6dbe87a8df4ecc (patch) | |
| tree | 5bf4a7ddca2f38ccb136950d35b8b1d2cff85f01 /services/camera/libcameraservice/camera2/Parameters.h | |
| parent | 09f842b03d8f9c0ab5e4541937f8061a7d1bf53d (diff) | |
| parent | 1f1872f1e1f3705e235ce784ce6d79102d26c117 (diff) | |
| download | frameworks_av-a69f3213d122b09d04fb890efd6dbe87a8df4ecc.zip frameworks_av-a69f3213d122b09d04fb890efd6dbe87a8df4ecc.tar.gz frameworks_av-a69f3213d122b09d04fb890efd6dbe87a8df4ecc.tar.bz2 | |
Merge "Camera2/3: Fix still image FOV reporting." into jb-mr2-dev
Diffstat (limited to 'services/camera/libcameraservice/camera2/Parameters.h')
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.h b/services/camera/libcameraservice/camera2/Parameters.h index 696ee2f..6d85037 100644 --- a/services/camera/libcameraservice/camera2/Parameters.h +++ b/services/camera/libcameraservice/camera2/Parameters.h @@ -183,6 +183,7 @@ struct Parameters { } }; DefaultKeyedVector<uint8_t, OverrideModes> sceneModeOverrides; + float minFocalLength; } fastInfo; // Quirks information; these are short-lived flags to enable workarounds for @@ -243,6 +244,9 @@ struct Parameters { }; CropRegion calculateCropRegion(CropRegion::Outputs outputs) const; + // Calculate the field of view of the high-resolution JPEG capture + status_t calculatePictureFovs(float *horizFov, float *vertFov) const; + // Static methods for debugging and converting between camera1 and camera2 // parameters |