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

Commit e857cc81 authored by Wu-cheng Li's avatar Wu-cheng Li Committed by Android (Google) Code Review
Browse files

Merge "Add YV12 preview format to camera parameter constants."

parents 47b8adec 10a1b30d

core/java/android/hardware/Camera.java

+5 −0
Original line number Diff line number Diff line
@@ -1362,6 +1362,7 @@ public class Camera { 
        private static final String PIXEL_FORMAT_YUV422SP = "yuv422sp";

        private static final String PIXEL_FORMAT_YUV420SP = "yuv420sp";

        private static final String PIXEL_FORMAT_YUV422I = "yuv422i-yuyv";

        private static final String PIXEL_FORMAT_YUV420P = "yuv420p";

        private static final String PIXEL_FORMAT_RGB565 = "rgb565";

        private static final String PIXEL_FORMAT_JPEG = "jpeg";
@@ -1882,6 +1883,7 @@ public class Camera { 
            case ImageFormat.NV16:      return PIXEL_FORMAT_YUV422SP;

            case ImageFormat.NV21:      return PIXEL_FORMAT_YUV420SP;

            case ImageFormat.YUY2:      return PIXEL_FORMAT_YUV422I;

            case ImageFormat.YV12:      return PIXEL_FORMAT_YUV420P;

            case ImageFormat.RGB_565:   return PIXEL_FORMAT_RGB565;

            case ImageFormat.JPEG:      return PIXEL_FORMAT_JPEG;

            default:                    return null;
@@ -1901,6 +1903,9 @@ public class Camera { 
            if (format.equals(PIXEL_FORMAT_YUV422I))

                return ImageFormat.YUY2;



            if (format.equals(PIXEL_FORMAT_YUV420P))

                return ImageFormat.YV12;



            if (format.equals(PIXEL_FORMAT_RGB565))

                return ImageFormat.RGB_565;

include/camera/CameraParameters.h

+1 −2
Original line number Diff line number Diff line
@@ -417,11 +417,10 @@ public: 


    // Pixel color formats for KEY_PREVIEW_FORMAT, KEY_PICTURE_FORMAT,

    // and KEY_VIDEO_FRAME_FORMAT

    // Planar variant of the YUV420 color format

    static const char PIXEL_FORMAT_YUV420P[];

    static const char PIXEL_FORMAT_YUV422SP[];

    static const char PIXEL_FORMAT_YUV420SP[]; // NV21

    static const char PIXEL_FORMAT_YUV422I[]; // YUY2

    static const char PIXEL_FORMAT_YUV420P[]; // YV12

    static const char PIXEL_FORMAT_RGB565[];

    static const char PIXEL_FORMAT_JPEG[];

libs/camera/CameraParameters.cpp

+1 −1
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ const char CameraParameters::SCENE_MODE_PARTY[] = "party"; 
const char CameraParameters::SCENE_MODE_CANDLELIGHT[] = "candlelight";

const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode";



const char CameraParameters::PIXEL_FORMAT_YUV420P[]  = "yuv420p";

const char CameraParameters::PIXEL_FORMAT_YUV422SP[] = "yuv422sp";

const char CameraParameters::PIXEL_FORMAT_YUV420SP[] = "yuv420sp";

const char CameraParameters::PIXEL_FORMAT_YUV422I[] = "yuv422i-yuyv";

const char CameraParameters::PIXEL_FORMAT_YUV420P[]  = "yuv420p";

const char CameraParameters::PIXEL_FORMAT_RGB565[] = "rgb565";

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