diff options
| author | Edwin Wong <edwinwong@google.com> | 2012-07-17 15:03:25 -0700 |
|---|---|---|
| committer | Edwin Wong <edwinwong@google.com> | 2012-07-17 15:17:23 -0700 |
| commit | b46ccde3610d3f1713f7ebf0e9ffe943e44b54d2 (patch) | |
| tree | 0cc18c7a6b51033a0f81e75991d2fa5d746dfb51 /media/libmediaplayerservice | |
| parent | faa5bdd1efff301962537a7b271bd31c78ec13dc (diff) | |
| download | frameworks_av-b46ccde3610d3f1713f7ebf0e9ffe943e44b54d2.zip frameworks_av-b46ccde3610d3f1713f7ebf0e9ffe943e44b54d2.tar.gz frameworks_av-b46ccde3610d3f1713f7ebf0e9ffe943e44b54d2.tar.bz2 | |
Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE
jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36
Change-Id: I4f08b9c8e9682a998db01c509a390e51bae60c2d
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 d35d5b1..0e8f913 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 c5aa3c6..d066774 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], |