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

Commit 9a4fa2df authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera: Remove RAW_SENSOR in favor of RAW16"

parents 9d19e392 a97dfeb9

camera/CameraParameters.cpp

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ int CameraParameters::previewFormatToEnum(const char* format) { 
        !strcmp(format, PIXEL_FORMAT_RGBA8888) ?

            HAL_PIXEL_FORMAT_RGBA_8888 :    // RGB8888

        !strcmp(format, PIXEL_FORMAT_BAYER_RGGB) ?

            HAL_PIXEL_FORMAT_RAW_SENSOR :   // Raw sensor data

            HAL_PIXEL_FORMAT_RAW16 :   // Raw sensor data

        -1;

}

camera/tests/ProCameraTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ protected: 
        CMP_STR(NV16, YCbCr_422_SP);

        CMP_STR(NV21, YCrCb_420_SP);

        CMP_STR(YUY2, YCbCr_422_I);

        CMP_STR(RAW,  RAW_SENSOR);

        CMP_STR(RAW,  RAW16);

        CMP_STR(RGBA, RGBA_8888);



        std::cerr << "Unknown format string " << str << std::endl;

services/camera/libcameraservice/api1/Camera2Client.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1959,7 +1959,7 @@ size_t Camera2Client::calculateBufferSize(int width, int height, 
            return width * height * 2;

        case HAL_PIXEL_FORMAT_RGBA_8888:

            return width * height * 4;

        case HAL_PIXEL_FORMAT_RAW_SENSOR:

        case HAL_PIXEL_FORMAT_RAW16:

            return width * height * 2;

        default:

            ALOGE("%s: Unknown preview format: %x",

services/camera/libcameraservice/api1/client2/Parameters.cpp

+3 −3
Original line number Diff line number Diff line
@@ -182,9 +182,9 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { 
                supportedPreviewFormats +=

                    CameraParameters::PIXEL_FORMAT_YUV420SP;

                break;

            // Not advertizing JPEG, RAW_SENSOR, etc, for preview formats

            // Not advertizing JPEG, RAW16, etc, for preview formats

            case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:

            case HAL_PIXEL_FORMAT_RAW_SENSOR:

            case HAL_PIXEL_FORMAT_RAW16:

            case HAL_PIXEL_FORMAT_BLOB:

                addComma = false;

                break;
@@ -2253,7 +2253,7 @@ const char* Parameters::formatEnumToString(int format) { 
        case HAL_PIXEL_FORMAT_RGBA_8888:   // RGBA8888

            fmt = CameraParameters::PIXEL_FORMAT_RGBA8888;

            break;

        case HAL_PIXEL_FORMAT_RAW_SENSOR:

        case HAL_PIXEL_FORMAT_RAW16:

            ALOGW("Raw sensor preview format requested.");

            fmt = CameraParameters::PIXEL_FORMAT_BAYER_RGGB;

            break;