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

Commit f17731fb authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Add AES-CBC mode to NDK's CryptoInfo" into nyc-dev

parents 29f3b2e4 f45c7e7e

include/ndk/NdkMediaCodec.h

+3 −1
Original line number Diff line number Diff line
@@ -178,7 +178,9 @@ media_status_t AMediaCodec_releaseOutputBufferAtTime( 


typedef enum {

    AMEDIACODECRYPTOINFO_MODE_CLEAR = 0,

    AMEDIACODECRYPTOINFO_MODE_AES_CTR = 1

    AMEDIACODECRYPTOINFO_MODE_AES_CTR = 1,

    AMEDIACODECRYPTOINFO_MODE_AES_WV = 2,

    AMEDIACODECRYPTOINFO_MODE_AES_CBC = 3

} cryptoinfo_mode_t;



typedef struct {