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

Commit 5ff1b20f authored by Fedor Kudasov's avatar Fedor Kudasov Committed by Android (Google) Code Review
Browse files

Merge "Remove pixel format conversion functions from jni"

parents 00c3a02a 4d027e97

core/jni/android_view_Surface.cpp

+0 −13
Original line number Diff line number Diff line
@@ -126,19 +126,6 @@ jobject android_view_Surface_createFromIGraphicBufferProducer(JNIEnv* env, 
    return android_view_Surface_createFromSurface(env, surface);

}



int android_view_Surface_mapPublicFormatToHalFormat(PublicFormat f) {

    return mapPublicFormatToHalFormat(f);

}



android_dataspace android_view_Surface_mapPublicFormatToHalDataspace(

        PublicFormat f) {

    return mapPublicFormatToHalDataspace(f);

}



PublicFormat android_view_Surface_mapHalFormatDataspaceToPublicFormat(

        int format, android_dataspace dataSpace) {

    return mapHalFormatDataspaceToPublicFormat(format, dataSpace);

}

// ----------------------------------------------------------------------------



static inline bool isSurfaceValid(const sp<Surface>& sur) {

core/jni/include/android_runtime/android_view_Surface.h

+0 −15
Original line number Diff line number Diff line
@@ -46,21 +46,6 @@ extern jobject android_view_Surface_createFromSurface(JNIEnv* env, 
extern jobject android_view_Surface_createFromIGraphicBufferProducer(JNIEnv* env,

        const sp<IGraphicBufferProducer>& bufferProducer);



/* Convert from android.graphics.ImageFormat/PixelFormat enums to graphics.h HAL

 * format */

extern int android_view_Surface_mapPublicFormatToHalFormat(PublicFormat f);



/* Convert from android.graphics.ImageFormat/PixelFormat enums to graphics.h HAL

 * dataspace */

extern android_dataspace android_view_Surface_mapPublicFormatToHalDataspace(

        PublicFormat f);



/* Convert from HAL format, dataspace pair to

 * android.graphics.ImageFormat/PixelFormat.

 * For unknown/unspecified pairs, returns PublicFormat::UNKNOWN */

extern PublicFormat android_view_Surface_mapHalFormatDataspaceToPublicFormat(

        int format, android_dataspace dataSpace);



} // namespace android



#endif // _ANDROID_VIEW_SURFACE_H

media/jni/android_media_ImageReader.cpp

+5 −10
Original line number Diff line number Diff line
@@ -360,10 +360,8 @@ static void ImageReader_init(JNIEnv* env, jobject thiz, jobject weakThiz, jint w 
          __FUNCTION__, width, height, format, maxImages);



    PublicFormat publicFormat = static_cast<PublicFormat>(format);

    nativeFormat = android_view_Surface_mapPublicFormatToHalFormat(

        publicFormat);

    nativeDataspace = android_view_Surface_mapPublicFormatToHalDataspace(

        publicFormat);

    nativeFormat = mapPublicFormatToHalFormat(publicFormat);

    nativeDataspace = mapPublicFormatToHalDataspace(publicFormat);



    jclass clazz = env->GetObjectClass(thiz);

    if (clazz == NULL) {
@@ -729,8 +727,7 @@ static jobjectArray Image_createSurfacePlanes(JNIEnv* env, jobject thiz, 
    jobject byteBuffer = NULL;



    PublicFormat publicReaderFormat = static_cast<PublicFormat>(readerFormat);

    int halReaderFormat = android_view_Surface_mapPublicFormatToHalFormat(

        publicReaderFormat);

    int halReaderFormat = mapPublicFormatToHalFormat(publicReaderFormat);



    if (isFormatOpaque(halReaderFormat) && numPlanes > 0) {

        String8 msg;
@@ -796,8 +793,7 @@ static jint Image_getFormat(JNIEnv* env, jobject thiz, jint readerFormat) 
        return static_cast<jint>(PublicFormat::PRIVATE);

    } else {

        BufferItem* buffer = Image_getBufferItem(env, thiz);

        int readerHalFormat = android_view_Surface_mapPublicFormatToHalFormat(

                static_cast<PublicFormat>(readerFormat));

        int readerHalFormat = mapPublicFormatToHalFormat(static_cast<PublicFormat>(readerFormat));

        int32_t fmt = applyFormatOverrides(

                buffer->mGraphicBuffer->getPixelFormat(), readerHalFormat);

        // Override the image format to HAL_PIXEL_FORMAT_YCbCr_420_888 if the actual format is
@@ -808,8 +804,7 @@ static jint Image_getFormat(JNIEnv* env, jobject thiz, jint readerFormat) 
        if (isPossiblyYUV(fmt)) {

            fmt = HAL_PIXEL_FORMAT_YCbCr_420_888;

        }

        PublicFormat publicFmt = android_view_Surface_mapHalFormatDataspaceToPublicFormat(

                fmt, buffer->mDataSpace);

        PublicFormat publicFmt = mapHalFormatDataspaceToPublicFormat(fmt, buffer->mDataSpace);

        return static_cast<jint>(publicFmt);

    }

}

media/jni/android_media_ImageWriter.cpp

+3 −3
Original line number Diff line number Diff line
@@ -819,8 +819,8 @@ static jint Image_getFormat(JNIEnv* env, jobject thiz) { 
    }



    // ImageWriter doesn't support data space yet, assuming it is unknown.

    PublicFormat publicFmt = android_view_Surface_mapHalFormatDataspaceToPublicFormat(

            buffer->getPixelFormat(), HAL_DATASPACE_UNKNOWN);

    PublicFormat publicFmt = mapHalFormatDataspaceToPublicFormat(buffer->getPixelFormat(),

                                                                 HAL_DATASPACE_UNKNOWN);

    return static_cast<jint>(publicFmt);

}
@@ -918,7 +918,7 @@ static jobjectArray Image_createSurfacePlanes(JNIEnv* env, jobject thiz, 


    // Create all SurfacePlanes

    PublicFormat publicWriterFormat = static_cast<PublicFormat>(writerFormat);

    writerFormat = android_view_Surface_mapPublicFormatToHalFormat(publicWriterFormat);

    writerFormat = mapPublicFormatToHalFormat(publicWriterFormat);

    for (int i = 0; i < numPlanes; i++) {

        Image_getLockedImageInfo(env, &lockedImg, i, writerFormat,

                &pData, &dataSize, &pixelStride, &rowStride);