Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab7b1f3e authored by Austin Borger's avatar Austin Borger
Browse files

cameraservice_test: Add ZoomRatioTest to the host build. 

ZoomRatioTest requires getArrayWidthAndHeight, which has been added in
this patch to SessionConfigurationUtilsHost.cpp.

Bug: 207411352
Test: Ran test on gLinux.
Change-Id: Ie1cd954cc49ab0f3bb80bd2fbe82397689c25dd2
parent 0c9eee2e

services/camera/libcameraservice/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ cc_library_shared { 
        "device3/StatusTracker.cpp",

        "device3/Camera3BufferManager.cpp",

        "device3/Camera3StreamSplitter.cpp",

        "device3/ZoomRatioMapper.cpp",

        "device3/Camera3OutputStreamInterface.cpp",

        "device3/Camera3OutputUtils.cpp",

        "device3/Camera3DeviceInjectionMethods.cpp",
@@ -201,6 +200,7 @@ cc_library_static { 
        "device3/CoordinateMapper.cpp",

        "device3/DistortionMapper.cpp",

        "device3/RotateAndCropMapper.cpp",

        "device3/ZoomRatioMapper.cpp",

        "utils/ExifUtils.cpp",

        "utils/SessionConfigurationUtilsHost.cpp",

    ],

services/camera/libcameraservice/device3/ZoomRatioMapper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <algorithm>



#include "device3/ZoomRatioMapper.h"

#include "utils/SessionConfigurationUtils.h"

#include "utils/SessionConfigurationUtilsHost.h"



namespace android {

services/camera/libcameraservice/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ cc_test_host { 
        "DistortionMapperTest.cpp",

        "ExifUtilsTest.cpp",

        "RotateAndCropMapperTest.cpp",

        "ZoomRatioTest.cpp",

    ],



    cflags: [

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

+0 −14
Original line number Diff line number Diff line
@@ -129,20 +129,6 @@ size_t getUHRMaxJpegBufferSize(camera3::Size uhrMaxJpegSize, 
            (defaultMaxJpegSize.width * defaultMaxJpegSize.height) * defaultMaxJpegBufferSize;

}



bool getArrayWidthAndHeight(const CameraMetadata *deviceInfo,

        int32_t arrayTag, int32_t *width, int32_t *height) {

    if (width == nullptr || height == nullptr) {

        ALOGE("%s: width / height nullptr", __FUNCTION__);

        return false;

    }

    camera_metadata_ro_entry_t entry;

    entry = deviceInfo->find(arrayTag);

    if (entry.count != 4) return false;

    *width = entry.data.i32[2];

    *height = entry.data.i32[3];

    return true;

}



StreamConfigurationPair

getStreamConfigurationPair(const CameraMetadata &staticInfo) {

    camera3::StreamConfigurationPair streamConfigurationPair;

services/camera/libcameraservice/utils/SessionConfigurationUtils.h

+0 −3
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ bool roundBufferDimensionNearest(int32_t width, int32_t height, int32_t format, 
        android_dataspace dataSpace, const CameraMetadata& info, bool maxResolution,

        /*out*/int32_t* outWidth, /*out*/int32_t* outHeight);



bool getArrayWidthAndHeight(const CameraMetadata *deviceInfo, int32_t arrayTag,

        int32_t *width, int32_t *height);



// check if format is not custom format

bool isPublicFormat(int32_t format);