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

Commit e8de773c authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "Fix the api level annotation for AMediaCodec_getBufferFormat"

parents 086a6da7 62d60f07

media/ndk/include/media/NdkMediaCodec.h

+6 −6
Original line number Diff line number Diff line
@@ -240,12 +240,6 @@ ssize_t AMediaCodec_dequeueOutputBuffer(AMediaCodec*, AMediaCodecBufferInfo *inf 
        int64_t timeoutUs) __INTRODUCED_IN(21);

AMediaFormat* AMediaCodec_getOutputFormat(AMediaCodec*) __INTRODUCED_IN(21);



/**

 * Get format of the buffer. The specified buffer index must have been previously obtained from

 * dequeueOutputBuffer.

 */

AMediaFormat* AMediaCodec_getBufferFormat(AMediaCodec*, size_t index) __INTRODUCED_IN(21);



/**

 * If you are done with a buffer, use this call to return the buffer to

 * the codec. If you previously specified a surface when configuring this
@@ -352,6 +346,12 @@ media_status_t AMediaCodec_signalEndOfInputStream(AMediaCodec *mData) __INTRODUC 


#if __ANDROID_API__ >= 28



/**

 * Get format of the buffer. The specified buffer index must have been previously obtained from

 * dequeueOutputBuffer.

 */

AMediaFormat* AMediaCodec_getBufferFormat(AMediaCodec*, size_t index) __INTRODUCED_IN(28);



/**

 * Get the component name. If the codec was created by createDecoderByType

 * or createEncoderByType, what component is chosen is not known beforehand.

media/ndk/libmediandk.map.txt

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ LIBMEDIANDK { 
    AMediaCodec_dequeueInputBuffer;

    AMediaCodec_dequeueOutputBuffer;

    AMediaCodec_flush;

    AMediaCodec_getBufferFormat; # introduced=21

    AMediaCodec_getBufferFormat; # introduced=28

    AMediaCodec_getInputBuffer;

    AMediaCodec_getInputFormat; # introduced=28

    AMediaCodec_getName; # introduced=28