From fa2b8f243eb048fb2b8e5a14356190f69eb31a36 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Tue, 10 Jul 2012 20:01:13 -0700
Subject: Fixed sample video corrupted in MediaCodec mode.

Change-Id: I50c5660072d40f6e297e58fd026ea04c89d6a70a
related-to-bug: 6732061
---
 media/libstagefright/MediaCodec.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'media/libstagefright/MediaCodec.cpp')

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);
-- 
cgit v1.1