diff options
| author | Edwin Wong <edwinwong@google.com> | 2012-07-13 17:54:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-13 17:54:32 -0700 |
| commit | 2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead (patch) | |
| tree | 58b79b403e5ec36812aa8ef233cb404b2fcd7341 /media/libstagefright | |
| parent | 1ea6d23396118a9cfe912b7b8a4e6f231e318ea2 (diff) | |
| parent | 190313ec68e81c10d200ff3c20ac152cf90760d6 (diff) | |
| download | frameworks_av-2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead.zip frameworks_av-2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead.tar.gz frameworks_av-2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead.tar.bz2 | |
am 190313ec: am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev
* commit '190313ec68e81c10d200ff3c20ac152cf90760d6':
Fixed sample video corrupted in MediaCodec mode.
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); |