A DataSpace describes how buffer data, such as from an {@link android.media.Image Image} + * or a {@link android.hardware.HardwareBuffer HardwareBuffer} + * should be interpreted by both applications and typical hardware.
+ * + *As buffer information is not guaranteed to be representative of color information, + * while DataSpace is typically used to describe three aspects of interpreting colors, + * some DataSpaces may describe other typical interpretations of buffer data + * such as depth information.
+ * + *Note that while {@link android.graphics.ColorSpace ColorSpace} and {@code DataSpace} + * are similar concepts, they are not equivalent. Not all ColorSpaces, + * such as {@link android.graphics.ColorSpace.Named#ACES ColorSpace.Named.ACES}, + * are able to be understood by typical hardware blocks so they cannot be DataSpaces.
+ * + *Defines the chromaticity coordinates of the source primaries in terms of + * the CIE 1931 definition of x and y specified in ISO 11664-1.
+ * + *Transfer characteristics are the opto-electronic transfer characteristic + * at the source as a function of linear optical intensity (luminance).
+ * + *For digital signals, E corresponds to the recorded value. Normally, the + * transfer function is applied in RGB space to each of the R, G and B + * components independently. This may result in color shift that can be + * minized by applying the transfer function in Lab space only for the L + * component. Implementation may apply the transfer function in RGB space + * for all pixel formats if desired.
+ * + *Defines the range of values corresponding to the unit range of {@code 0-1}.
+ */ + +public final class DataSpace { + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @LongDef(flag = true, value = { + STANDARD_UNSPECIFIED, + STANDARD_BT709, + STANDARD_BT601_625, + STANDARD_BT601_625_UNADJUSTED, + STANDARD_BT601_525, + STANDARD_BT601_525_UNADJUSTED, + STANDARD_BT2020, + STANDARD_BT2020_CONSTANT_LUMINANCE, + STANDARD_BT470M, + STANDARD_FILM, + STANDARD_DCI_P3, + STANDARD_ADOBE_RGB + }) + public @interface DataSpaceStandard {}; + + private static final long STANDARD_MASK = 63 << 16; + + /** + * Chromacity coordinates are unknown or are determined by the application. + */ + public static final long STANDARD_UNSPECIFIED = 0 << 16; + /** + * Use the unadjusted {@code KR = 0.2126}, {@code KB = 0.0722} luminance interpretation + * for RGB conversion. + * + *+ * Primaries: x y + * green 0.300 0.600 + * blue 0.150 0.060 + * red 0.640 0.330 + * white (D65) 0.3127 0.3290+ */ + public static final long STANDARD_BT709 = 1 << 16; + /** + * Use the adjusted {@code KR = 0.299}, {@code KB = 0.114} luminance interpretation + * for RGB conversion from the one purely determined by the primaries + * to minimize the color shift into RGB space that uses BT.709 + * primaries. + * + *
+ * Primaries: x y + * green 0.290 0.600 + * blue 0.150 0.060 + * red 0.640 0.330 + * white (D65) 0.3127 0.3290+ */ + public static final long STANDARD_BT601_625 = 2 << 16; + /** + * Use the unadjusted {@code KR = 0.222}, {@code KB = 0.071} luminance interpretation + * for RGB conversion. + * + *
+ * Primaries: x y + * green 0.290 0.600 + * blue 0.150 0.060 + * red 0.640 0.330 + * white (D65) 0.3127 0.3290+ */ + public static final long STANDARD_BT601_625_UNADJUSTED = 3 << 16; + /** + * Use the adjusted {@code KR = 0.299}, {@code KB = 0.114} luminance interpretation + * for RGB conversion from the one purely determined by the primaries + * to minimize the color shift into RGB space that uses BT.709 + * primaries. + * + *
+ * Primaries: x y + * green 0.310 0.595 + * blue 0.155 0.070 + * red 0.630 0.340 + * white (D65) 0.3127 0.3290+ */ + public static final long STANDARD_BT601_525 = 4 << 16; + /** + * Use the unadjusted {@code KR = 0.212}, {@code KB = 0.087} luminance interpretation + * for RGB conversion (as in SMPTE 240M). + * + *
+ * Primaries: x y + * green 0.310 0.595 + * blue 0.155 0.070 + * red 0.630 0.340 + * white (D65) 0.3127 0.3290+ */ + public static final long STANDARD_BT601_525_UNADJUSTED = 5 << 16; + /** + * Use the unadjusted {@code KR = 0.2627}, {@code KB = 0.0593} luminance interpretation + * for RGB conversion. + * + *
+ * Primaries: x y + * green 0.170 0.797 + * blue 0.131 0.046 + * red 0.708 0.292 + * white (D65) 0.3127 0.3290+ */ + public static final long STANDARD_BT2020 = 6 << 16; + /** + * Use the unadjusted {@code KR = 0.2627}, {@code KB = 0.0593} luminance interpretation + * for RGB conversion using the linear domain. + * + *
+ * Primaries: x y + * green 0.170 0.797 + * blue 0.131 0.046 + * red 0.708 0.292 + * white (D65) 0.3127 0.3290+ */ + public static final long STANDARD_BT2020_CONSTANT_LUMINANCE = 7 << 16; + /** + * Use the unadjusted {@code KR = 0.30}, {@code KB = 0.11} luminance interpretation + * for RGB conversion. + * + *
+ * Primaries: x y + * green 0.21 0.71 + * blue 0.14 0.08 + * red 0.67 0.33 + * white (C) 0.310 0.316+ */ + public static final long STANDARD_BT470M = 8 << 16; + /** + * Use the unadjusted {@code KR = 0.254}, {@code KB = 0.068} luminance interpretation + * for RGB conversion. + * + *
+ * Primaries: x y + * green 0.243 0.692 + * blue 0.145 0.049 + * red 0.681 0.319 + * white (C) 0.310 0.316+ */ + public static final long STANDARD_FILM = 9 << 16; + /** + * SMPTE EG 432-1 and SMPTE RP 431-2. + * + *
+ * Primaries: x y + * green 0.265 0.690 + * blue 0.150 0.060 + * red 0.680 0.320 + * white (D65) 0.3127 0.3290+ */ + public static final long STANDARD_DCI_P3 = 10 << 16; + /** + * Adobe RGB primaries. + * + *
+ * Primaries: x y + * green 0.210 0.710 + * blue 0.150 0.060 + * red 0.640 0.330 + * white (D65) 0.3127 0.3290+ */ + public static final long STANDARD_ADOBE_RGB = 11 << 16; + + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @LongDef(flag = true, value = { + TRANSFER_UNSPECIFIED, + TRANSFER_LINEAR, + TRANSFER_SRGB, + TRANSFER_SMPTE_170M, + TRANSFER_GAMMA2_2, + TRANSFER_GAMMA2_6, + TRANSFER_GAMMA2_8, + TRANSFER_ST2084, + TRANSFER_HLG + }) + public @interface DataSpaceTransfer {}; + + private static final long TRANSFER_MASK = 31 << 22; + + /** + * Transfer characteristics are unknown or are determined by the + * application. + */ + public static final long TRANSFER_UNSPECIFIED = 0 << 22; + /** + * Linear transfer. + * + *
{@code
+ * Transfer characteristic curve:
+ * E = L
+ * L - luminance of image 0 <= L <= 1 for conventional colorimetry
+ * E - corresponding electrical signal}
+ */
+ public static final long TRANSFER_LINEAR = 1 << 22;
+ /**
+ * sRGB transfer.
+ *
+ * {@code
+ * Transfer characteristic curve:
+ * E = 1.055 * L^(1/2.4) - 0.055 for 0.0031308 <= L <= 1
+ * = 12.92 * L for 0 <= L < 0.0031308
+ * L - luminance of image 0 <= L <= 1 for conventional colorimetry
+ * E - corresponding electrical signal}
+ *
+ * Use for RGB formats.
+ */
+ public static final long TRANSFER_SRGB = 2 << 22;
+ /**
+ * SMPTE 170M transfer.
+ *
+ * {@code
+ * Transfer characteristic curve:
+ * E = 1.099 * L ^ 0.45 - 0.099 for 0.018 <= L <= 1
+ * = 4.500 * L for 0 <= L < 0.018
+ * L - luminance of image 0 <= L <= 1 for conventional colorimetry
+ * E - corresponding electrical signal}
+ *
+ * Use for YCbCr formats.
+ */
+ public static final long TRANSFER_SMPTE_170M = 3 << 22;
+ /**
+ * Display gamma 2.2.
+ *
+ * {@code
+ * Transfer characteristic curve:
+ * E = L ^ (1/2.2)
+ * L - luminance of image 0 <= L <= 1 for conventional colorimetry
+ * E - corresponding electrical signal}
+ */
+ public static final long TRANSFER_GAMMA2_2 = 4 << 22;
+ /**
+ * Display gamma 2.6.
+ *
+ * {@code
+ * Transfer characteristic curve:
+ * E = L ^ (1/2.6)
+ * L - luminance of image 0 <= L <= 1 for conventional colorimetry
+ * E - corresponding electrical signal}
+ */
+ public static final long TRANSFER_GAMMA2_6 = 5 << 22;
+ /**
+ * Display gamma 2.8.
+ *
+ * {@code
+ * Transfer characteristic curve:
+ * E = L ^ (1/2.8)
+ * L - luminance of image 0 <= L <= 1 for conventional colorimetry
+ * E - corresponding electrical signal}
+ */
+ public static final long TRANSFER_GAMMA2_8 = 6 << 22;
+ /**
+ * SMPTE ST 2084 (Dolby Perceptual Quantizer).
+ *
+ * {@code
+ * Transfer characteristic curve:
+ * E = ((c1 + c2 * L^n) / (1 + c3 * L^n)) ^ m
+ * c1 = c3 - c2 + 1 = 3424 / 4096 = 0.8359375
+ * c2 = 32 * 2413 / 4096 = 18.8515625
+ * c3 = 32 * 2392 / 4096 = 18.6875
+ * m = 128 * 2523 / 4096 = 78.84375
+ * n = 0.25 * 2610 / 4096 = 0.1593017578125
+ * L - luminance of image 0 <= L <= 1 for HDR colorimetry.
+ * L = 1 corresponds to 10000 cd/m2
+ * E - corresponding electrical signal}
+ */
+ public static final long TRANSFER_ST2084 = 7 << 22;
+ /**
+ * ARIB STD-B67 Hybrid Log Gamma.
+ *
+ * {@code
+ * Transfer characteristic curve:
+ * E = r * L^0.5 for 0 <= L <= 1
+ * = a * ln(L - b) + c for 1 < L
+ * a = 0.17883277
+ * b = 0.28466892
+ * c = 0.55991073
+ * r = 0.5
+ * L - luminance of image 0 <= L for HDR colorimetry. L = 1 corresponds
+ * to reference white level of 100 cd/m2
+ * E - corresponding electrical signal}
+ */
+ public static final long TRANSFER_HLG = 8 << 22;
+
+ /** @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @LongDef(flag = true, value = {
+ RANGE_UNSPECIFIED,
+ RANGE_FULL,
+ RANGE_LIMITED,
+ RANGE_EXTENDED
+ })
+ public @interface DataSpaceRange {};
+
+ private static final long RANGE_MASK = 7 << 27;
+
+ /**
+ * Range characteristics are unknown or are determined by the application.
+ */
+ public static final long RANGE_UNSPECIFIED = 0 << 27;
+ /**
+ * Full range uses all values for Y, Cb and Cr from
+ * {@code 0} to {@code 2^b-1}, where b is the bit depth of the color format.
+ */
+ public static final long RANGE_FULL = 1 << 27;
+ /**
+ * Limited range uses values {@code 16/256*2^b} to {@code 235/256*2^b} for Y, and
+ * {@code 1/16*2^b} to {@code 15/16*2^b} for Cb, Cr, R, G and B, where b is the bit depth of
+ * the color format.
+ *
+ * E.g. For 8-bit-depth formats: + * Luma (Y) samples should range from 16 to 235, inclusive + * Chroma (Cb, Cr) samples should range from 16 to 240, inclusive + * + * For 10-bit-depth formats: + * Luma (Y) samples should range from 64 to 940, inclusive + * Chroma (Cb, Cr) samples should range from 64 to 960, inclusive.
+ */ + public static final long RANGE_LIMITED = 2 << 27; + /** + * Extended range is used for scRGB only. + * + *Intended for use with floating point pixel formats. [0.0 - 1.0] is the standard + * sRGB space. Values outside the range [0.0 - 1.0] can encode + * color outside the sRGB gamut. [-0.5, 7.5] is the scRGB range. + * Used to blend/merge multiple dataspaces on a single display.
+ */ + public static final long RANGE_EXTENDED = 3 << 27; + + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @LongDef(flag = true, value = { + DATASPACE_UNKNOWN, + DATASPACE_SCRGB_LINEAR, + DATASPACE_SRGB, + DATASPACE_SCRGB, + DATASPACE_DISPLAY_P3, + DATASPACE_BT2020_PQ, + DATASPACE_ADOBE_RGB, + DATASPACE_JFIF, + DATASPACE_BT601_625, + DATASPACE_BT601_525, + DATASPACE_BT2020, + DATASPACE_BT709, + DATASPACE_DCI_P3, + DATASPACE_SRGB_LINEAR + }) + public @interface NamedDataSpace {}; + + /** + * Default-assumption data space, when not explicitly specified. + * + *It is safest to assume a buffer is an image with sRGB primaries and + * encoding ranges, but the consumer and/or the producer of the data may + * simply be using defaults. No automatic gamma transform should be + * expected, except for a possible display gamma transform when drawn to a + * screen.
+ */ + public static final long DATASPACE_UNKNOWN = 0; + /** + * scRGB linear encoding. + * + *Composed of the following -
+ *+ * Primaries: STANDARD_BT709 + * Transfer: TRANSFER_LINEAR + * Range: RANGE_EXTENDED+ * + * The values are floating point. + * A pixel value of 1.0, 1.0, 1.0 corresponds to sRGB white (D65) at 80 nits. + * Values beyond the range [0.0 - 1.0] would correspond to other colors + * spaces and/or HDR content. + */ + public static final long DATASPACE_SCRGB_LINEAR = 406913024; + /** + * sRGB gamma encoding. + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_BT709 + * Transfer: TRANSFER_SRGB + * Range: RANGE_FULL+ * + * When written, the inverse transformation is performed. + * + * The alpha component, if present, is always stored in linear space and + * is left unmodified when read or written. + */ + public static final long DATASPACE_SRGB = 142671872; + /** + * scRGB gamma encoding. + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_BT709 + * Transfer: TRANSFER_SRGB + * Range: RANGE_EXTENDED+ * + * The values are floating point. + * + * A pixel value of 1.0, 1.0, 1.0 corresponds to sRGB white (D65) at 80 nits. + * Values beyond the range [0.0 - 1.0] would correspond to other colors + * spaces and/or HDR content. + */ + public static final long DATASPACE_SCRGB = 411107328; + /** + * Display P3 encoding. + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_DCI_P3 + * Transfer: TRANSFER_SRGB + * Range: RANGE_FULL+ */ + public static final long DATASPACE_DISPLAY_P3 = 143261696; + /** + * ITU-R Recommendation 2020 (BT.2020) + * + * Ultra High-definition television. + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_BT2020 + * Transfer: TRANSFER_ST2084 + * Range: RANGE_FULL+ */ + public static final long DATASPACE_BT2020_PQ = 163971072; + /** + * Adobe RGB encoding. + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_ADOBE_RGB + * Transfer: TRANSFER_GAMMA2_2 + * Range: RANGE_FULL+ * + * Note: Application is responsible for gamma encoding the data. + */ + public static final long DATASPACE_ADOBE_RGB = 151715840; + /** + * JPEG File Interchange Format (JFIF). + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_BT601_625 + * Transfer: TRANSFER_SMPTE_170M + * Range: RANGE_FULL+ * + * Same model as BT.601-625, but all values (Y, Cb, Cr) range from {@code 0} to {@code 255} + */ + public static final long DATASPACE_JFIF = 146931712; + /** + * ITU-R Recommendation 601 (BT.601) - 525-line + * + * Standard-definition television, 525 Lines (NTSC). + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_BT601_625 + * Transfer: TRANSFER_SMPTE_170M + * Range: RANGE_LIMITED+ */ + public static final long DATASPACE_BT601_625 = 281149440; + /** + * ITU-R Recommendation 709 (BT.709) + * + * High-definition television. + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_BT601_525 + * Transfer: TRANSFER_SMPTE_170M + * Range: RANGE_LIMITED+ */ + public static final long DATASPACE_BT601_525 = 281280512; + /** + * ITU-R Recommendation 2020 (BT.2020) + * + * Ultra High-definition television. + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_BT2020 + * Transfer: TRANSFER_SMPTE_170M + * Range: RANGE_FULL+ */ + public static final long DATASPACE_BT2020 = 147193856; + /** + * ITU-R Recommendation 709 (BT.709) + * + * High-definition television. + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_BT709 + * Transfer: TRANSFER_SMPTE_170M + * Range: RANGE_LIMITED+ */ + public static final long DATASPACE_BT709 = 281083904; + /** + * SMPTE EG 432-1 and SMPTE RP 431-2 + * + * Digital Cinema DCI-P3. + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_DCI_P3 + * Transfer: TRANSFER_GAMMA2_6 + * Range: RANGE_FULL+ * + * Note: Application is responsible for gamma encoding the data as + * a 2.6 gamma encoding is not supported in HW. + */ + public static final long DATASPACE_DCI_P3 = 155844608; + /** + * sRGB linear encoding. + * + *
Composed of the following -
+ *+ * Primaries: STANDARD_BT709 + * Transfer: TRANSFER_LINEAR + * Range: RANGE_FULL+ * + * The values are encoded using the full range ([0,255] for 8-bit) for all + * components. + */ + public static final long DATASPACE_SRGB_LINEAR = 138477568; + + private DataSpace() {} + + /** + * Pack the dataSpace value using standard, transfer and range field value. + * Field values should be in the correct bits place. + * + * @param standard Chromaticity coordinates of source primaries + * @param transfer Opto-electronic transfer characteristic at the source + * @param range The range of values + * + * @return The long dataspace packed by standard, transfer and range value + */ + public static @NamedDataSpace long pack(@DataSpaceStandard long standard, + @DataSpaceTransfer long transfer, + @DataSpaceRange long range) { + if ((standard & STANDARD_MASK) != standard) { + throw new IllegalArgumentException("Invalid standard " + standard); + } + if ((transfer & TRANSFER_MASK) != transfer) { + throw new IllegalArgumentException("Invalid transfer " + transfer); + } + if ((range & RANGE_MASK) != range) { + throw new IllegalArgumentException("Invalid range " + range); + } + return standard | transfer | range; + } + + /** + * Unpack the standard field value from the packed dataSpace value. + * + * @param dataSpace The packed dataspace value + * + * @return The standard aspect + */ + public static @DataSpaceStandard long getStandard(@NamedDataSpace long dataSpace) { + @DataSpaceStandard long standard = dataSpace & STANDARD_MASK; + return standard; + } + + /** + * Unpack the transfer field value from the packed dataSpace value + * + * @param dataSpace The packed dataspace value + * + * @return The transfer aspect + */ + public static @DataSpaceTransfer long getTransfer(@NamedDataSpace long dataSpace) { + @DataSpaceTransfer long transfer = dataSpace & TRANSFER_MASK; + return transfer; + } + + /** + * Unpack the range field value from the packed dataSpace value + * + * @param dataSpace The packed dataspace value + * + * @return The range aspect + */ + public static @DataSpaceRange long getRange(@NamedDataSpace long dataSpace) { + @DataSpaceRange long range = dataSpace & RANGE_MASK; + return range; + } +} diff --git a/core/jni/android_graphics_SurfaceTexture.cpp b/core/jni/android_graphics_SurfaceTexture.cpp index 2f12289621607..0f647ea2eaea3 100644 --- a/core/jni/android_graphics_SurfaceTexture.cpp +++ b/core/jni/android_graphics_SurfaceTexture.cpp @@ -346,6 +346,11 @@ static jlong SurfaceTexture_getTimestamp(JNIEnv* env, jobject thiz) return surfaceTexture->getTimestamp(); } +static jlong SurfaceTexture_getDataSpace(JNIEnv* env, jobject thiz) { + sp
+ * If dataspace for an image is not set, dataspace value depends on {@link android.view.Surface} + * that is provided in the {@link ImageWriter} constructor. + *
+ * + * @param dataSpace The Dataspace to be set for this image + */ + public void setDataSpace(@NamedDataSpace long dataSpace) { + throwISEIfImageIsInvalid(); + mDataSpace = dataSpace; + } + private Rect mCropRect; /** diff --git a/media/java/android/media/ImageReader.java b/media/java/android/media/ImageReader.java index 5656dffe1d4ad..bd0f32e6ffee0 100644 --- a/media/java/android/media/ImageReader.java +++ b/media/java/android/media/ImageReader.java @@ -16,7 +16,6 @@ package android.media; -import android.annotation.CallbackExecutor; import android.annotation.IntRange; import android.annotation.NonNull; import android.graphics.GraphicBuffer; @@ -28,7 +27,6 @@ import android.hardware.HardwareBuffer.Usage; import android.hardware.camera2.MultiResolutionImageReader; import android.os.Handler; import android.os.Looper; -import android.os.Message; import android.view.Surface; import dalvik.system.VMRuntime; diff --git a/media/java/android/media/ImageWriter.java b/media/java/android/media/ImageWriter.java index 1b743679e5850..1fc2cf9edc90d 100644 --- a/media/java/android/media/ImageWriter.java +++ b/media/java/android/media/ImageWriter.java @@ -23,9 +23,9 @@ import android.graphics.ImageFormat; import android.graphics.ImageFormat.Format; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.hardware.HardwareBuffer; import android.hardware.camera2.params.StreamConfigurationMap; import android.hardware.camera2.utils.SurfaceUtils; -import android.hardware.HardwareBuffer; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -454,8 +454,9 @@ public class ImageWriter implements AutoCloseable { } Rect crop = image.getCropRect(); - nativeQueueInputImage(mNativeContext, image, image.getTimestamp(), crop.left, crop.top, - crop.right, crop.bottom, image.getTransform(), image.getScalingMode()); + nativeQueueInputImage(mNativeContext, image, image.getTimestamp(), image.getDataSpace(), + crop.left, crop.top, crop.right, crop.bottom, image.getTransform(), + image.getScalingMode()); /** * Only remove and cleanup the Images that are owned by this @@ -642,13 +643,13 @@ public class ImageWriter implements AutoCloseable { Rect crop = image.getCropRect(); if (image.getNativeContext() != 0) { nativeAttachAndQueueImage(mNativeContext, image.getNativeContext(), image.getFormat(), - image.getTimestamp(), crop.left, crop.top, crop.right, crop.bottom, - image.getTransform(), image.getScalingMode()); + image.getTimestamp(), image.getDataSpace(), crop.left, crop.top, crop.right, + crop.bottom, image.getTransform(), image.getScalingMode()); } else { GraphicBuffer gb = GraphicBuffer.createFromHardwareBuffer(image.getHardwareBuffer()); nativeAttachAndQueueGraphicBuffer(mNativeContext, gb, image.getFormat(), - image.getTimestamp(), crop.left, crop.top, crop.right, crop.bottom, - image.getTransform(), image.getScalingMode()); + image.getTimestamp(), image.getDataSpace(), crop.left, crop.top, crop.right, + crop.bottom, image.getTransform(), image.getScalingMode()); gb.destroy(); image.close(); } @@ -976,15 +977,15 @@ public class ImageWriter implements AutoCloseable { private synchronized native void nativeDequeueInputImage(long nativeCtx, Image wi); private synchronized native void nativeQueueInputImage(long nativeCtx, Image image, - long timestampNs, int left, int top, int right, int bottom, int transform, - int scalingMode); + long timestampNs, long dataSpace, int left, int top, int right, int bottom, + int transform, int scalingMode); private synchronized native int nativeAttachAndQueueImage(long nativeCtx, - long imageNativeBuffer, int imageFormat, long timestampNs, int left, - int top, int right, int bottom, int transform, int scalingMode); + long imageNativeBuffer, int imageFormat, long timestampNs, long dataSpace, + int left, int top, int right, int bottom, int transform, int scalingMode); private synchronized native int nativeAttachAndQueueGraphicBuffer(long nativeCtx, - GraphicBuffer graphicBuffer, int imageFormat, long timestampNs, int left, - int top, int right, int bottom, int transform, int scalingMode); + GraphicBuffer graphicBuffer, int imageFormat, long timestampNs, long dataSpace, + int left, int top, int right, int bottom, int transform, int scalingMode); private synchronized native void cancelImage(long nativeCtx, Image image); diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp index 5174c0c04dbf2..021507c8631c1 100644 --- a/media/jni/android_media_ImageReader.cpp +++ b/media/jni/android_media_ImageReader.cpp @@ -48,6 +48,7 @@ #define ANDROID_MEDIA_IMAGEREADER_CTX_JNI_ID "mNativeContext" #define ANDROID_MEDIA_SURFACEIMAGE_BUFFER_JNI_ID "mNativeBuffer" #define ANDROID_MEDIA_SURFACEIMAGE_TS_JNI_ID "mTimestamp" +#define ANDROID_MEDIA_SURFACEIMAGE_DS_JNI_ID "mDataSpace" #define ANDROID_MEDIA_SURFACEIMAGE_TF_JNI_ID "mTransform" #define ANDROID_MEDIA_SURFACEIMAGE_SM_JNI_ID "mScalingMode" @@ -71,6 +72,7 @@ static struct { static struct { jfieldID mNativeBuffer; jfieldID mTimestamp; + jfieldID mDataSpace; jfieldID mTransform; jfieldID mScalingMode; jfieldID mPlanes; @@ -319,6 +321,12 @@ static void ImageReader_classInit(JNIEnv* env, jclass clazz) "can't find android/graphics/ImageReader.%s", ANDROID_MEDIA_SURFACEIMAGE_TS_JNI_ID); + gSurfaceImageClassInfo.mDataSpace = env->GetFieldID( + imageClazz, ANDROID_MEDIA_SURFACEIMAGE_DS_JNI_ID, "J"); + LOG_ALWAYS_FATAL_IF(gSurfaceImageClassInfo.mDataSpace == NULL, + "can't find android/graphics/ImageReader.%s", + ANDROID_MEDIA_SURFACEIMAGE_DS_JNI_ID); + gSurfaceImageClassInfo.mTransform = env->GetFieldID( imageClazz, ANDROID_MEDIA_SURFACEIMAGE_TF_JNI_ID, "I"); LOG_ALWAYS_FATAL_IF(gSurfaceImageClassInfo.mTransform == NULL, @@ -619,6 +627,8 @@ static jint ImageReader_imageSetup(JNIEnv* env, jobject thiz, jobject image) { Image_setBufferItem(env, image, buffer); env->SetLongField(image, gSurfaceImageClassInfo.mTimestamp, static_cast