Add larger sensor resoltuion for EmulatedFakeCamera3
New CTS requires sensor resolution > 2M. So add 1920x1080.
Also fix the compiler warning.
Bug: 130430161
Test: run CameraCTS tests
Change-Id: I51e587cb8cce624ffcd544ba04e9d954135c0f52
diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index 625a0f1..4d42e22 100644
--- a/camera/EmulatedFakeCamera3.cpp
+++ b/camera/EmulatedFakeCamera3.cpp
@@ -66,13 +66,13 @@
HAL_PIXEL_FORMAT_Y16
};
-const uint32_t EmulatedFakeCamera3::kAvailableRawSizes[4] = {
+const uint32_t EmulatedFakeCamera3::kAvailableRawSizes[6] = {
640, 480,
- 1280, 720
+ 1280, 720,
+ 1920, 1080
// mSensorWidth, mSensorHeight
};
-
/**
* 3A constants
*/
@@ -1364,22 +1364,18 @@
const std::vector<int32_t> availableStreamConfigurationsBasic = {
HAL_PIXEL_FORMAT_BLOB, width, height, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
+ HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1280, 720, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
+ HAL_PIXEL_FORMAT_YCbCr_420_888, 1280, 720, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
+ HAL_PIXEL_FORMAT_BLOB, 1280, 720, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
+ HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 640, 480, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
+ HAL_PIXEL_FORMAT_YCbCr_420_888, 640, 480, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
+ HAL_PIXEL_FORMAT_BLOB, 640, 480, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 320, 240, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
HAL_PIXEL_FORMAT_YCbCr_420_888, 320, 240, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
HAL_PIXEL_FORMAT_BLOB, 320, 240, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 176, 144, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
HAL_PIXEL_FORMAT_YCbCr_420_888, 176, 144, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
HAL_PIXEL_FORMAT_BLOB, 176, 144, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
- HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1280, 720, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
- HAL_PIXEL_FORMAT_YCbCr_420_888, 1280, 720, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
- HAL_PIXEL_FORMAT_BLOB, 1280, 720, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
- };
-
- // Always need to include 640x480 in basic formats
- const std::vector<int32_t> availableStreamConfigurationsBasic640 = {
- HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 640, 480, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
- HAL_PIXEL_FORMAT_YCbCr_420_888, 640, 480, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT,
- HAL_PIXEL_FORMAT_BLOB, 640, 480, ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT
};
const std::vector<int32_t> availableStreamConfigurationsRaw = {
@@ -1398,11 +1394,6 @@
availableStreamConfigurations.insert(availableStreamConfigurations.end(),
availableStreamConfigurationsBasic.begin(),
availableStreamConfigurationsBasic.end());
- if (width > 640) {
- availableStreamConfigurations.insert(availableStreamConfigurations.end(),
- availableStreamConfigurationsBasic640.begin(),
- availableStreamConfigurationsBasic640.end());
- }
}
if (hasCapability(RAW)) {
availableStreamConfigurations.insert(availableStreamConfigurations.end(),
@@ -1423,22 +1414,18 @@
const std::vector<int64_t> availableMinFrameDurationsBasic = {
HAL_PIXEL_FORMAT_BLOB, width, height, Sensor::kFrameDurationRange[0],
+ HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1280, 720, Sensor::kFrameDurationRange[0],
+ HAL_PIXEL_FORMAT_YCbCr_420_888, 1280, 720, Sensor::kFrameDurationRange[0],
+ HAL_PIXEL_FORMAT_BLOB, 1280, 720, Sensor::kFrameDurationRange[0],
+ HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 640, 480, Sensor::kFrameDurationRange[0],
+ HAL_PIXEL_FORMAT_YCbCr_420_888, 640, 480, Sensor::kFrameDurationRange[0],
+ HAL_PIXEL_FORMAT_BLOB, 640, 480, Sensor::kFrameDurationRange[0],
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 320, 240, Sensor::kFrameDurationRange[0],
HAL_PIXEL_FORMAT_YCbCr_420_888, 320, 240, Sensor::kFrameDurationRange[0],
HAL_PIXEL_FORMAT_BLOB, 320, 240, Sensor::kFrameDurationRange[0],
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 176, 144, Sensor::kFrameDurationRange[0],
HAL_PIXEL_FORMAT_YCbCr_420_888, 176, 144, Sensor::kFrameDurationRange[0],
HAL_PIXEL_FORMAT_BLOB, 176, 144, Sensor::kFrameDurationRange[0],
- HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1280, 720, Sensor::kFrameDurationRange[0],
- HAL_PIXEL_FORMAT_YCbCr_420_888, 1280, 720, Sensor::kFrameDurationRange[0],
- HAL_PIXEL_FORMAT_BLOB, 1280, 720, Sensor::kFrameDurationRange[0],
- };
-
- // Always need to include 640x480 in basic formats
- const std::vector<int64_t> availableMinFrameDurationsBasic640 = {
- HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 640, 480, Sensor::kFrameDurationRange[0],
- HAL_PIXEL_FORMAT_YCbCr_420_888, 640, 480, Sensor::kFrameDurationRange[0],
- HAL_PIXEL_FORMAT_BLOB, 640, 480, Sensor::kFrameDurationRange[0]
};
const std::vector<int64_t> availableMinFrameDurationsRaw = {
@@ -1457,11 +1444,6 @@
availableMinFrameDurations.insert(availableMinFrameDurations.end(),
availableMinFrameDurationsBasic.begin(),
availableMinFrameDurationsBasic.end());
- if (width > 640) {
- availableMinFrameDurations.insert(availableMinFrameDurations.end(),
- availableMinFrameDurationsBasic640.begin(),
- availableMinFrameDurationsBasic640.end());
- }
}
if (hasCapability(RAW)) {
availableMinFrameDurations.insert(availableMinFrameDurations.end(),
@@ -1482,31 +1464,27 @@
const std::vector<int64_t> availableStallDurationsBasic = {
HAL_PIXEL_FORMAT_BLOB, width, height, Sensor::kFrameDurationRange[0],
+ HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1280, 720, 0,
+ HAL_PIXEL_FORMAT_YCbCr_420_888, 1280, 720, 0,
+ HAL_PIXEL_FORMAT_BLOB, 1280, 720, Sensor::kFrameDurationRange[0],
+ HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 640, 480, 0,
+ HAL_PIXEL_FORMAT_YCbCr_420_888, 640, 480, 0,
+ HAL_PIXEL_FORMAT_BLOB, 640, 480, Sensor::kFrameDurationRange[0],
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 320, 240, 0,
HAL_PIXEL_FORMAT_YCbCr_420_888, 320, 240, 0,
HAL_PIXEL_FORMAT_RGBA_8888, 320, 240, 0,
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 176, 144, 0,
HAL_PIXEL_FORMAT_YCbCr_420_888, 176, 144, 0,
HAL_PIXEL_FORMAT_RGBA_8888, 176, 144, 0,
- HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1280, 720, 0,
- HAL_PIXEL_FORMAT_YCbCr_420_888, 1280, 720, 0,
- HAL_PIXEL_FORMAT_RGBA_8888, 1280, 720, 0,
- };
-
- // Always need to include 640x480 in basic formats
- const std::vector<int64_t> availableStallDurationsBasic640 = {
- HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 640, 480, 0,
- HAL_PIXEL_FORMAT_YCbCr_420_888, 640, 480, 0,
- HAL_PIXEL_FORMAT_BLOB, 640, 480, Sensor::kFrameDurationRange[0]
};
const std::vector<int64_t> availableStallDurationsRaw = {
- HAL_PIXEL_FORMAT_RAW16, 640, 480, Sensor::kFrameDurationRange[0]
+ HAL_PIXEL_FORMAT_RAW16, width, height, Sensor::kFrameDurationRange[0]
};
const std::vector<int64_t> availableStallDurationsBurst = {
- HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 640, 480, 0,
- HAL_PIXEL_FORMAT_YCbCr_420_888, 640, 480, 0,
- HAL_PIXEL_FORMAT_RGBA_8888, 640, 480, 0
+ HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, width, height, 0,
+ HAL_PIXEL_FORMAT_YCbCr_420_888, width, height, 0,
+ HAL_PIXEL_FORMAT_RGBA_8888, width, height, 0
};
std::vector<int64_t> availableStallDurations;
@@ -1515,11 +1493,6 @@
availableStallDurations.insert(availableStallDurations.end(),
availableStallDurationsBasic.begin(),
availableStallDurationsBasic.end());
- if (width > 640) {
- availableStallDurations.insert(availableStallDurations.end(),
- availableStallDurationsBasic640.begin(),
- availableStallDurationsBasic640.end());
- }
}
if (hasCapability(RAW)) {
availableStallDurations.insert(availableStallDurations.end(),
diff --git a/camera/EmulatedQemuCamera.h b/camera/EmulatedQemuCamera.h
index 1b826c7..83397ef 100755
--- a/camera/EmulatedQemuCamera.h
+++ b/camera/EmulatedQemuCamera.h
@@ -66,6 +66,9 @@
/* Supported frame dimensions reported by the camera device. */
String8 mFrameDims;
+
+private:
+ using EmulatedCamera::Initialize;
};
}; /* namespace android */
diff --git a/camera/EmulatedQemuCamera3.h b/camera/EmulatedQemuCamera3.h
index c26f037..5656f53 100644
--- a/camera/EmulatedQemuCamera3.h
+++ b/camera/EmulatedQemuCamera3.h
@@ -120,6 +120,7 @@
* Handle interrupt events from the sensor.
*/
void onQemuSensorEvent(uint32_t frameNumber, Event e, nsecs_t timestamp);
+ using EmulatedCamera3::Initialize;
private:
/**************************************************************************
diff --git a/camera/EmulatedQemuCameraDevice.h b/camera/EmulatedQemuCameraDevice.h
index 1cabd6f..2b2dfc9 100755
--- a/camera/EmulatedQemuCameraDevice.h
+++ b/camera/EmulatedQemuCameraDevice.h
@@ -132,7 +132,7 @@
* pair. */
using FrameBufferPair = std::pair<uint8_t*, uint32_t*>;
FrameBufferPair mFrameBufferPairs[2];
-
+ using EmulatedCameraDevice::Initialize;
};
}; /* namespace android */
diff --git a/camera/fake-pipeline2/JpegCompressor.h b/camera/fake-pipeline2/JpegCompressor.h
index 493e4a6..7a78ef7 100644
--- a/camera/fake-pipeline2/JpegCompressor.h
+++ b/camera/fake-pipeline2/JpegCompressor.h
@@ -77,7 +77,7 @@
status_t reserve();
// TODO: Measure this
- static const size_t kMaxJpegSize = 300000;
+ static const size_t kMaxJpegSize = 675000;
private:
Mutex mBusyMutex;
