am 647336c7: am e0daeb39: Fixed sample video corrupted in MediaCodec mode.

* commit '647336c76e8da68fb44ca52ec14a8a2c6d5735bb':
  Fixed sample video corrupted in MediaCodec mode.
This commit is contained in:
Edwin Wong 2012-07-13 17:54:30 -07:00 committed by Android Git Automerger
commit 85324d9546

View File

@ -70,7 +70,9 @@ struct CryptoPlugin {
// At the java level these special errors will then trigger a // At the java level these special errors will then trigger a
// MediaCodec.CryptoException that gives clients access to both // MediaCodec.CryptoException that gives clients access to both
// the error code and the errorDetailMsg. // 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, bool secure,
const uint8_t key[16], const uint8_t key[16],
const uint8_t iv[16], const uint8_t iv[16],