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

Commit 743e105d authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "Equity between SDK/NDK for MediaCodec setParameters()"

parents d32936fc ef058464

media/ndk/NdkMediaCodec.cpp

+8 −0
Original line number Diff line number Diff line
@@ -954,5 +954,13 @@ media_status_t AMediaCodecCryptoInfo_getEncryptedBytes(AMediaCodecCryptoInfo* ci 
    return AMEDIA_OK;

}



EXPORT const char* AMEDIACODEC_KEY_HDR10_PLUS_INFO = AMEDIAFORMAT_KEY_HDR10_PLUS_INFO;

EXPORT const char* AMEDIACODEC_KEY_LOW_LATENCY = AMEDIAFORMAT_KEY_LOW_LATENCY;

EXPORT const char* AMEDIACODEC_KEY_OFFSET_TIME = "time-offset-us";

EXPORT const char* AMEDIACODEC_KEY_REQUEST_SYNC_FRAME = "request-sync";

EXPORT const char* AMEDIACODEC_KEY_SUSPEND = "drop-input-frames";

EXPORT const char* AMEDIACODEC_KEY_SUSPEND_TIME = "drop-start-time-us";

EXPORT const char* AMEDIACODEC_KEY_VIDEO_BITRATE = "video-bitrate";



} // extern "C"

media/ndk/include/media/NdkMediaCodec.h

+10 −0
Original line number Diff line number Diff line
@@ -582,6 +582,16 @@ media_status_t AMediaCodecCryptoInfo_getEncryptedBytes(AMediaCodecCryptoInfo*, s 


#endif /* __ANDROID_API__ >= 21 */



#if __ANDROID_API__ >= 31

extern const char* AMEDIACODEC_KEY_HDR10_PLUS_INFO __INTRODUCED_IN(31);

extern const char* AMEDIACODEC_KEY_LOW_LATENCY __INTRODUCED_IN(31);

extern const char* AMEDIACODEC_KEY_OFFSET_TIME __INTRODUCED_IN(31);

extern const char* AMEDIACODEC_KEY_REQUEST_SYNC_FRAME __INTRODUCED_IN(31);

extern const char* AMEDIACODEC_KEY_SUSPEND __INTRODUCED_IN(31);

extern const char* AMEDIACODEC_KEY_SUSPEND_TIME __INTRODUCED_IN(31);

extern const char* AMEDIACODEC_KEY_VIDEO_BITRATE __INTRODUCED_IN(31);

#endif /* __ANDROID_API__ >= 31 */



__END_DECLS



#endif //_NDK_MEDIA_CODEC_H

media/ndk/include/media/NdkMediaFormat.h

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ extern const char* AMEDIAFORMAT_KEY_LOW_LATENCY __INTRODUCED_IN(30); 
#endif /* __ANDROID_API__ >= 30 */



#if __ANDROID_API__ >= 31

extern const char* AMEDIAFORMAT_KEY_HDR10_PLUS_INFO __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_KEY_SLOW_MOTION_MARKERS __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_KEY_THUMBNAIL_CSD_AV1C __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_KEY_XMP_OFFSET __INTRODUCED_IN(31);

media/ndk/libmediandk.map.txt

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,13 @@ LIBMEDIANDK { 
    AImage_getPlaneRowStride; # introduced=24

    AImage_getTimestamp; # introduced=24

    AImage_getWidth; # introduced=24

    AMEDIACODEC_KEY_HDR10_PLUS_INFO; # var introduced=31

    AMEDIACODEC_KEY_LOW_LATENCY; # var introduced=31

    AMEDIACODEC_KEY_OFFSET_TIME; # var introduced=31

    AMEDIACODEC_KEY_REQUEST_SYNC_FRAME; # var introduced=31

    AMEDIACODEC_KEY_SUSPEND; # var introduced=31

    AMEDIACODEC_KEY_SUSPEND_TIME; # var introduced=31

    AMEDIACODEC_KEY_VIDEO_BITRATE; # var introduced=31

    AMEDIAFORMAT_KEY_AAC_DRC_ATTENUATION_FACTOR; # var introduced=28

    AMEDIAFORMAT_KEY_AAC_DRC_BOOST_FACTOR; # var introduced=28

    AMEDIAFORMAT_KEY_AAC_DRC_HEAVY_COMPRESSION; # var introduced=28
@@ -91,6 +98,7 @@ LIBMEDIANDK { 
    AMEDIAFORMAT_KEY_GRID_ROWS; # var introduced=28

    AMEDIAFORMAT_KEY_HAPTIC_CHANNEL_COUNT; # var introduced=29

    AMEDIAFORMAT_KEY_HDR_STATIC_INFO; # var introduced=28

    AMEDIAFORMAT_KEY_HDR10_PLUS_INFO; # var introduced=31

    AMEDIAFORMAT_KEY_HEIGHT; # var introduced=21

    AMEDIAFORMAT_KEY_ICC_PROFILE; # var introduced=29

    AMEDIAFORMAT_KEY_INTRA_REFRESH_PERIOD; # var introduced=28