commit 8d1856e4e93bad06e84eb82ada1539cc4a2110be
author Roman Kiryanov <rkir@google.com> Wed Aug 02 19:51:05 2023 -0700
committer Roman Kiryanov <rkir@google.com> Fri Aug 04 11:35:23 2023 -0700
tree fc8c10157f9db1c0122cacfc048f6138a5e11126
parent c3b98eede33499562cf86981075cf2774e76b5fc

Update getAvailableFocalLength on FakeRotatingCamera

2.8 (which is its actual focal length) was missing there.

Bug: 294310471
Test: atest CtsCameraTestCases:StillCaptureTest#testJpegExif
Change-Id: Ie20d8d05d56b703c0d164a6b5d1e184a772579b9
Merged-In: Ie20d8d05d56b703c0d164a6b5d1e184a772579b9
Signed-off-by: Roman Kiryanov <rkir@google.com>

camera/FakeRotatingCamera.cpp

diff --git a/camera/FakeRotatingCamera.cpp b/camera/FakeRotatingCamera.cpp
index 078a80f..f67b8ad 100644
--- a/camera/FakeRotatingCamera.cpp
+++ b/camera/FakeRotatingCamera.cpp
@@ -61,6 +61,8 @@
 constexpr int kMaxFPS = 30;
 constexpr int64_t kOneSecondNs = 1000000000;
 
+constexpr float kDefaultFocalLength = 2.8;
+
 constexpr int64_t kMinFrameDurationNs = kOneSecondNs / kMaxFPS;
 constexpr int64_t kMaxFrameDurationNs = kOneSecondNs / kMinFPS;
 constexpr int64_t kDefaultFrameDurationNs = kOneSecondNs / kMedFPS;
@@ -908,6 +910,14 @@
     return mIsBackFacing;
 }
 
+Span<const float> FakeRotatingCamera::getAvailableFocalLength() const {
+    static const float availableFocalLengths[] = {
+        kDefaultFocalLength
+    };
+
+    return availableFocalLengths;
+}
+
 std::tuple<int32_t, int32_t, int32_t> FakeRotatingCamera::getMaxNumOutputStreams() const {
     return {
         0,  // raw
@@ -978,7 +988,7 @@
 }
 
 float FakeRotatingCamera::getDefaultFocalLength() const {
-    return 2.8;
+    return kDefaultFocalLength;
 }
 
 }  // namespace hw

camera/FakeRotatingCamera.h

diff --git a/camera/FakeRotatingCamera.h b/camera/FakeRotatingCamera.h
index 16c6d78..01b9745 100644
--- a/camera/FakeRotatingCamera.h
+++ b/camera/FakeRotatingCamera.h
@@ -52,6 +52,7 @@
     Span<const std::pair<int32_t, int32_t>> getTargetFpsRanges() const override;
     Span<const Rect<uint16_t>> getAvailableThumbnailSizes() const override;
     bool isBackFacing() const override;
+    Span<const float> getAvailableFocalLength() const override;
     std::tuple<int32_t, int32_t, int32_t> getMaxNumOutputStreams() const override;
     Span<const PixelFormat> getSupportedPixelFormats() const override;
     Span<const Rect<uint16_t>> getSupportedResolutions() const override;