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

Commit 98704f14 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into gingerbread 

Merge commit '38eea8bf' into gingerbread-plus-aosp

* commit '38eea8bf':
  Remove the YV16 format for simplicity's sake.
parents 50576fa8 38eea8bf

api/current.xml

+11 −0
Original line number Original line Diff line number Diff line
@@ -64855,6 +64855,17 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

</field>

<field name="YV12"

 type="int"

 transient="false"

 volatile="false"

 value="842094169"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</class>

<class name="Interpolator"

<class name="Interpolator"

 extends="java.lang.Object"

 extends="java.lang.Object"

graphics/java/android/graphics/ImageFormat.java

+72 −49
Original line number Original line Diff line number Diff line
@@ -16,60 +16,83 @@ 




package android.graphics;

package android.graphics;





public class ImageFormat

public class ImageFormat {

{

	/*

    /* these constants are chosen to be binary compatible with

	 * these constants are chosen to be binary compatible with their previous

     * their previous location in PixelFormat.java */

	 * location in PixelFormat.java

	 */





	public static final int UNKNOWN = 0;

	public static final int UNKNOWN = 0;





    /** RGB format used for pictures encoded as RGB_565   

	/**

     *  see {@link android.hardware.Camera.Parameters#setPictureFormat(int)}.

	 * RGB format used for pictures encoded as RGB_565 see

	 * {@link android.hardware.Camera.Parameters#setPictureFormat(int)}.

	 */

	 */

	public static final int RGB_565 = 4;

	public static final int RGB_565 = 4;





	/**

	/**

     * YCbCr formats, used for video. These are not necessarily supported

	 * Planar 4:2:0 YCrCb format. This format assumes an horizontal stride of 16

     * by the hardware.

	 * pixels for all planes and an implicit vertical stride of the image

	 * height's next multiple of two.

	 *   y_size = stride * ALIGN(height, 2)

	 *   c_size = ALIGN(stride/2, 16) * height

	 *   size = y_size + c_size * 2

	 *   cr_offset = y_size

	 *   cb_offset = y_size + c_size

	 * 

	 * Whether this format is supported by the camera hardware can be determined

	 * by

	 * {@link android.hardware.Camera.Parameters#getSupportedPreviewFormats()}.

	 */

	 */

    public static final int NV16 = 0x10;

	public static final int YV12 = 0x32315659;





	/**

	 * YCbCr format, used for video. Whether this format is supported by the

	 * camera hardware can be determined by

	 * {@link android.hardware.Camera.Parameters#getSupportedPreviewFormats()}.

	 */

	public static final int NV16 = 0x10;





    /** YCrCb format used for images, which uses the NV21 encoding format.   

	/**

     *  This is the default format for camera preview images, when not

	 * YCrCb format used for images, which uses the NV21 encoding format. This

     *  otherwise set with 

	 * is the default format for camera preview images, when not otherwise set

     *  {@link android.hardware.Camera.Parameters#setPreviewFormat(int)}.

	 * with {@link android.hardware.Camera.Parameters#setPreviewFormat(int)}.

	 */

	 */

	public static final int NV21 = 0x11;

	public static final int NV21 = 0x11;







	/**

    /** YCbCr format used for images, which uses YUYV (YUY2) encoding format.

	 * YCbCr format used for images, which uses YUYV (YUY2) encoding format.

	 * This is an alternative format for camera preview images. Whether this

	 * This is an alternative format for camera preview images. Whether this

	 * format is supported by the camera hardware can be determined by

	 * format is supported by the camera hardware can be determined by

	 * {@link android.hardware.Camera.Parameters#getSupportedPreviewFormats()}.

	 * {@link android.hardware.Camera.Parameters#getSupportedPreviewFormats()}.

	 */

	 */

	public static final int YUY2 = 0x14;

	public static final int YUY2 = 0x14;





    

	/**

	/**

	 * Encoded formats. These are not necessarily supported by the hardware.

	 * Encoded formats. These are not necessarily supported by the hardware.

	 */

	 */

	public static final int JPEG = 0x100;

	public static final int JPEG = 0x100;







	/**

	/**

     * Use this function to retrieve the number of bits per pixel of

	 * Use this function to retrieve the number of bits per pixel of an

     * an ImageFormat.

	 * ImageFormat.

	 * 

	 * @param format

	 * @param format

	 * @return the number of bits per pixel of the given format or -1 if the

	 * @return the number of bits per pixel of the given format or -1 if the

	 *         format doesn't exist or is not supported.

	 *         format doesn't exist or is not supported.

	 */

	 */

	public static int getBitsPerPixel(int format) {

	public static int getBitsPerPixel(int format) {

		switch (format) {

		switch (format) {

            case RGB_565:   return 16;

		case RGB_565:

            case NV16:      return 16;

			return 16;

            case NV21:      return 12;

		case NV16:

            case YUY2:      return 16;

			return 16;

		case YUY2:

			return 16;

		case YV12:

			return 12;

		case NV21:

			return 12;

		}

		}

		return -1;

		return -1;

	}

	}

libs/surfaceflinger/TextureManager.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -107,7 +107,6 @@ bool TextureManager::isSupportedYuvFormat(int format) 
{

{

    switch (format) {

    switch (format) {

    case HAL_PIXEL_FORMAT_YV12:

    case HAL_PIXEL_FORMAT_YV12:

    case HAL_PIXEL_FORMAT_YV16:

        return true;

        return true;

    }

    }

    return false;

    return false;
@@ -118,7 +117,6 @@ bool TextureManager::isYuvFormat(int format) 
    switch (format) {

    switch (format) {

    // supported YUV formats

    // supported YUV formats

    case HAL_PIXEL_FORMAT_YV12:

    case HAL_PIXEL_FORMAT_YV12:

    case HAL_PIXEL_FORMAT_YV16:

    // Legacy/deprecated YUV formats

    // Legacy/deprecated YUV formats

    case HAL_PIXEL_FORMAT_YCbCr_422_SP:

    case HAL_PIXEL_FORMAT_YCbCr_422_SP:

    case HAL_PIXEL_FORMAT_YCrCb_420_SP:

    case HAL_PIXEL_FORMAT_YCrCb_420_SP:

libs/ui/PixelFormat.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,6 @@ status_t getPixelFormatInfo(PixelFormat format, PixelFormatInfo* info) 
    switch (format) {

    switch (format) {

    case HAL_PIXEL_FORMAT_YCbCr_422_SP:

    case HAL_PIXEL_FORMAT_YCbCr_422_SP:

    case HAL_PIXEL_FORMAT_YCbCr_422_I:

    case HAL_PIXEL_FORMAT_YCbCr_422_I:

    case HAL_PIXEL_FORMAT_YV16:

        info->bitsPerPixel = 16;

        info->bitsPerPixel = 16;

        goto done;

        goto done;

    case HAL_PIXEL_FORMAT_YCrCb_420_SP:

    case HAL_PIXEL_FORMAT_YCrCb_420_SP: