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

Commit 6334a2cd authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge "NdkMediaCodec: mark new APIs as introduced in 26" am: 3812e3a9 am: 5abb5638

am: 217ae4fc

Change-Id: I94356e4b58b3dcf5d908eba8d8bde18f5970ed74
parents d39eeefa 217ae4fc
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ media_status_t AMediaCodec_setOutputSurface(AMediaCodec*, ANativeWindow* surface
media_status_t AMediaCodec_releaseOutputBufferAtTime(
        AMediaCodec *mData, size_t idx, int64_t timestampNs);

#if __ANDROID_API__ >= 26

/**
 * Creates a Surface that can be used as the input to encoder, in place of input buffers
 *
@@ -278,7 +280,7 @@ media_status_t AMediaCodec_setParameters(
 */
media_status_t AMediaCodec_signalEndOfInputStream(AMediaCodec *mData);


#endif /* __ANDROID_API__ >= 26 */

typedef enum {
    AMEDIACODECRYPTOINFO_MODE_CLEAR = 0,