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

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

Merge "Camera: Add OPAQUE pixel format to CameraParameters"

parents e78d5c7b f6d9696b

camera/CameraParameters.cpp

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ const char CameraParameters::PIXEL_FORMAT_RGB565[] = "rgb565"; 
const char CameraParameters::PIXEL_FORMAT_RGBA8888[] = "rgba8888";

const char CameraParameters::PIXEL_FORMAT_JPEG[] = "jpeg";

const char CameraParameters::PIXEL_FORMAT_BAYER_RGGB[] = "bayer-rggb";

const char CameraParameters::PIXEL_FORMAT_ANDROID_OPAQUE[] = "android-opaque";



// Values for focus mode settings.

const char CameraParameters::FOCUS_MODE_AUTO[] = "auto";

include/camera/CameraParameters.h

+2 −0
Original line number Diff line number Diff line
@@ -606,6 +606,8 @@ public: 
    // Raw bayer format used for images, which is 10 bit precision samples

    // stored in 16 bit words. The filter pattern is RGGB.

    static const char PIXEL_FORMAT_BAYER_RGGB[];

    // Pixel format is not known to the framework

    static const char PIXEL_FORMAT_ANDROID_OPAQUE[];



    // Values for focus mode settings.

    // Auto-focus mode. Applications should call