diff options
| author | Edwin Wong <edwinwong@google.com> | 2012-07-10 20:01:13 -0700 |
|---|---|---|
| committer | Edwin Wong <edwinwong@google.com> | 2012-07-13 13:05:56 -0700 |
| commit | fa2b8f243eb048fb2b8e5a14356190f69eb31a36 (patch) | |
| tree | d54232d4c61bf767677bcee2373069c4969301c1 /media/libmediaplayerservice | |
| parent | 4221e2813f7a307936036e62b6a63bbda23005ee (diff) | |
Fixed sample video corrupted in MediaCodec mode.
Change-Id: I50c5660072d40f6e297e58fd026ea04c89d6a70a
related-to-bug: 6732061
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/Crypto.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/Crypto.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/Crypto.cpp b/media/libmediaplayerservice/Crypto.cpp index d35d5b1e..0e8f913d 100644 --- a/media/libmediaplayerservice/Crypto.cpp +++ b/media/libmediaplayerservice/Crypto.cpp @@ -141,7 +141,7 @@ bool Crypto::requiresSecureDecoderComponent(const char *mime) const { return mPlugin->requiresSecureDecoderComponent(mime); } -status_t Crypto::decrypt( +ssize_t Crypto::decrypt( bool secure, const uint8_t key[16], const uint8_t iv[16], diff --git a/media/libmediaplayerservice/Crypto.h b/media/libmediaplayerservice/Crypto.h index c5aa3c6c..d066774f 100644 --- a/media/libmediaplayerservice/Crypto.h +++ b/media/libmediaplayerservice/Crypto.h @@ -42,7 +42,7 @@ struct Crypto : public BnCrypto { virtual bool requiresSecureDecoderComponent( const char *mime) const; - virtual status_t decrypt( + virtual ssize_t decrypt( bool secure, const uint8_t key[16], const uint8_t iv[16], |