Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable mute test pattern for external cameras

Browse Source 
Add ANDROID_SENSOR_TEST_PATTERN_MODE_SOLID_COLOR as an available
 test pattern for ExternalCameraDevice (v3.4).

Bug: 182204067
Test: Connect an USB camera.
 Enable camera privacy toggle.
 Apps using the camera should get a black preview
Change-Id: Ie0d4d5b3f555eb9e1b1fc255b612668736daeaa4
This commit is contained in:
Valentin Iftime
2021-08-04 18:36:27 +02:00
parent 3e771216b7
commit bf33bcb35c
3 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
camera/device/3.4/default/ExternalCameraDevice.cpp
View File

@@ -413,8 +413,8 @@ status_t ExternalCameraDevice::initDefaultCharsKeys(
const uint8_t croppingType = ANDROID_SCALER_CROPPING_TYPE_CENTER_ONLY;
UPDATE(ANDROID_SCALER_CROPPING_TYPE, &croppingType, 1);
const int32_t testPatternModes[] = {
ANDROID_SENSOR_TEST_PATTERN_MODE_OFF};
const int32_t testPatternModes[] = {ANDROID_SENSOR_TEST_PATTERN_MODE_OFF,
ANDROID_SENSOR_TEST_PATTERN_MODE_SOLID_COLOR};
UPDATE(ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES, testPatternModes,
ARRAY_SIZE(testPatternModes));

50
camera/device/3.4/default/ExternalCameraDeviceSession.cpp
View File

@@ -1462,14 +1462,50 @@ bool ExternalCameraDeviceSession::OutputThread::threadLoop() {
return onDeviceError("%s: V4L2 buffer map failed", __FUNCTION__);
}
// Process camera mute state
auto testPatternMode = req->setting.find(ANDROID_SENSOR_TEST_PATTERN_MODE);
if (testPatternMode.count == 1) {
if (mCameraMuted != (testPatternMode.data.u8[0] != ANDROID_SENSOR_TEST_PATTERN_MODE_OFF)) {
mCameraMuted = !mCameraMuted;
// Get solid color for test pattern, if any was set
if (testPatternMode.data.u8[0] == ANDROID_SENSOR_TEST_PATTERN_MODE_SOLID_COLOR) {
auto entry = req->setting.find(ANDROID_SENSOR_TEST_PATTERN_DATA);
if (entry.count == 4) {
// Update the mute frame if the pattern color has changed
if (memcmp(entry.data.i32, mTestPatternData, sizeof(mTestPatternData)) != 0) {
memcpy(mTestPatternData, entry.data.i32, sizeof(mTestPatternData));
// Fill the mute frame with the solid color, use only 8 MSB of RGGB as RGB
for (int i = 0; i < mMuteTestPatternFrame.size(); i += 3) {
mMuteTestPatternFrame[i] = entry.data.i32[0] >> 24;
mMuteTestPatternFrame[i + 1] = entry.data.i32[1] >> 24;
mMuteTestPatternFrame[i + 2] = entry.data.i32[3] >> 24;
}
}
}
}
}
}
// TODO: in some special case maybe we can decode jpg directly to gralloc output?
if (req->frameIn->mFourcc == V4L2_PIX_FMT_MJPEG) {
ATRACE_BEGIN("MJPGtoI420");
int res = libyuv::MJPGToI420(
inData, inDataSize, static_cast<uint8_t*>(mYu12FrameLayout.y), mYu12FrameLayout.yStride,
static_cast<uint8_t*>(mYu12FrameLayout.cb), mYu12FrameLayout.cStride,
static_cast<uint8_t*>(mYu12FrameLayout.cr), mYu12FrameLayout.cStride,
mYu12Frame->mWidth, mYu12Frame->mHeight, mYu12Frame->mWidth, mYu12Frame->mHeight);
int res = 0;
if (mCameraMuted) {
res = libyuv::ConvertToI420(
mMuteTestPatternFrame.data(), mMuteTestPatternFrame.size(),
static_cast<uint8_t*>(mYu12FrameLayout.y), mYu12FrameLayout.yStride,
static_cast<uint8_t*>(mYu12FrameLayout.cb), mYu12FrameLayout.cStride,
static_cast<uint8_t*>(mYu12FrameLayout.cr), mYu12FrameLayout.cStride, 0, 0,
mYu12Frame->mWidth, mYu12Frame->mHeight, mYu12Frame->mWidth,
mYu12Frame->mHeight, libyuv::kRotate0, libyuv::FOURCC_RAW);
} else {
res = libyuv::MJPGToI420(
inData, inDataSize, static_cast<uint8_t*>(mYu12FrameLayout.y),
mYu12FrameLayout.yStride, static_cast<uint8_t*>(mYu12FrameLayout.cb),
mYu12FrameLayout.cStride, static_cast<uint8_t*>(mYu12FrameLayout.cr),
mYu12FrameLayout.cStride, mYu12Frame->mWidth, mYu12Frame->mHeight,
mYu12Frame->mWidth, mYu12Frame->mHeight);
}
ATRACE_END();
if (res != 0) {
@@ -1670,6 +1706,9 @@ Status ExternalCameraDeviceSession::OutputThread::allocateIntermediateBuffers(
}
}
// Allocate mute test pattern frame
mMuteTestPatternFrame.resize(mYu12Frame->mWidth * mYu12Frame->mHeight * 3);
mBlobBufferSize = blobBufferSize;
return Status::OK;
}
@@ -1679,6 +1718,7 @@ void ExternalCameraDeviceSession::OutputThread::clearIntermediateBuffers() {
mYu12Frame.clear();
mYu12ThumbFrame.clear();
mIntermediateBuffers.clear();
mMuteTestPatternFrame.clear();
mBlobBufferSize = 0;
}

3
camera/device/3.4/default/include/ext_device_v3_4_impl/ExternalCameraDeviceSession.h
View File

@@ -181,6 +181,9 @@ struct ExternalCameraDeviceSession : public virtual RefBase,
std::unordered_map<Size, sp<AllocatedFrame>, SizeHasher> mScaledYu12Frames;
YCbCrLayout mYu12FrameLayout;
YCbCrLayout mYu12ThumbFrameLayout;
std::vector<uint8_t> mMuteTestPatternFrame;
uint32_t mTestPatternData[4] = {0, 0, 0, 0};
bool mCameraMuted = false;
uint32_t mBlobBufferSize = 0; // 0 -> HAL derive buffer size, else: use given size
std::string mExifMake;