diff options
| author | Edwin Wong <edwinwong@google.com> | 2012-07-10 19:57:26 -0700 |
|---|---|---|
| committer | Edwin Wong <edwinwong@google.com> | 2012-07-13 11:34:10 -0700 |
| commit | e0daeb3933e034f037630715e4cd2ecb3880498b (patch) | |
| tree | ed265497973bc659ef3ccaa5e88fca6954f0a675 | |
| parent | f455c9a267332960334794428c2abc5f716ee6ea (diff) | |
| download | frameworks_native-android-4.1.2_r2.zip frameworks_native-android-4.1.2_r2.tar.gz frameworks_native-android-4.1.2_r2.tar.bz2 | |
Fixed sample video corrupted in MediaCodec mode.android-cts-4.1_r2android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1
Change-Id: Ibe11a83199f3db1ba6266a1a9e11c7fc24ceb554
related-to-bug: 6732061
| -rw-r--r-- | include/media/hardware/CryptoAPI.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/hardware/CryptoAPI.h b/include/media/hardware/CryptoAPI.h index 810a443..44a0040 100644 --- a/include/media/hardware/CryptoAPI.h +++ b/include/media/hardware/CryptoAPI.h @@ -70,7 +70,9 @@ struct CryptoPlugin { // At the java level these special errors will then trigger a // MediaCodec.CryptoException that gives clients access to both // the error code and the errorDetailMsg. - virtual status_t decrypt( + // Returns a non-negative result to indicate the number of bytes written + // to the dstPtr, or a negative result to indicate an error. + virtual ssize_t decrypt( bool secure, const uint8_t key[16], const uint8_t iv[16], |