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/libstagefright | |
| 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/libstagefright')
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index ff71170..67f5a22 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1346,7 +1346,7 @@ status_t MediaCodec::onQueueInputBuffer(const sp<AMessage> &msg) { AString *errorDetailMsg; CHECK(msg->findPointer("errorDetailMsg", (void **)&errorDetailMsg)); - status_t err = mCrypto->decrypt( + ssize_t result = mCrypto->decrypt( (mFlags & kFlagIsSecure) != 0, key, iv, @@ -1357,11 +1357,11 @@ status_t MediaCodec::onQueueInputBuffer(const sp<AMessage> &msg) { info->mData->base(), errorDetailMsg); - if (err != OK) { - return err; + if (result < 0) { + return result; } - info->mData->setRange(0, size); + info->mData->setRange(0, result); } reply->setBuffer("buffer", info->mData); |