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

Commit 5b0f43dc authored by Sally Qi's avatar Sally Qi Committed by Automerger Merge Worker
Browse files

Merge "Update AImageReader NDK API." into udc-dev am: b30b710b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23333931



Change-Id: I270b1c1526e38f0df6d744b229ba75373850ee21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e588b58 b30b710b

media/ndk/include/media/NdkImage.h

+2 −2
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ media_status_t AImage_getHardwareBuffer(const AImage* image, /*out*/AHardwareBuf 
/**

 * Query the dataspace of the input {@link AImage}.

 *

 * Available since API level 33.

 * Available since API level 34.

 *

 * @param image the {@link AImage} of interest.

 * @param dataSpace the dataspace of the image will be filled here if the method call succeeds.
@@ -843,7 +843,7 @@ media_status_t AImage_getHardwareBuffer(const AImage* image, /*out*/AHardwareBuf 
 *                 image has been deleted.</li></ul>

 */

media_status_t AImage_getDataSpace(const AImage* image,

                                   /*out*/int32_t* dataSpace) __INTRODUCED_IN(33);

                                   /*out*/int32_t* dataSpace) __INTRODUCED_IN(34);



__END_DECLS

media/ndk/include/media/NdkImageReader.h

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ media_status_t AImageReader_newWithUsage( 
 * the combination of {@code hardwareBufferFormat} and {@code dataSpace} for the

 * format of the Image that the reader will produce.</p>

 *

 * Available since API level 33.

 * Available since API level 34.

 *

 * @param width The default width in pixels of the Images that this reader will produce.

 * @param height The default height in pixels of the Images that this reader will produce.
@@ -422,7 +422,7 @@ media_status_t AImageReader_newWithUsage( 
 */

media_status_t AImageReader_newWithDataSpace(int32_t width, int32_t height, uint64_t usage,

        int32_t maxImages, uint32_t hardwareBufferFormat, int32_t dataSpace,

        /*out*/ AImageReader** reader) __INTRODUCED_IN(33);

        /*out*/ AImageReader** reader) __INTRODUCED_IN(34);



/**

 * Acquire the next {@link AImage} from the image reader's queue asynchronously.

media/ndk/libmediandk.map.txt

+2 −2
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ LIBMEDIANDK { 
    AImageReader_getWindow; # introduced=24

    AImageReader_new; # introduced=24

    AImageReader_newWithUsage; # introduced=26

    AImageReader_newWithDataSpace; # introduced=Tiramisu

    AImageReader_newWithDataSpace; # introduced=UpsideDownCake

    AImageReader_setBufferRemovedListener; # introduced=26

    AImageReader_setImageListener; # introduced=24

    AImage_delete; # introduced=24

    AImage_deleteAsync; # introduced=26

    AImage_getCropRect; # introduced=24

    AImage_getDataSpace; # introduced=Tiramisu

    AImage_getDataSpace; # introduced=UpsideDownCake

    AImage_getFormat; # introduced=24

    AImage_getHardwareBuffer; # introduced=26

    AImage_getHeight; # introduced=24