commit bbe1ed453aa0407237127fb45a30ba8ffd9e0941
author Andreas Huber <andih@google.com> Fri Jan 29 14:08:56 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 29 14:08:56 2010 -0800
tree a07cb996941d8d4d6aa7ed6f22947e721b464ff5
parent 1846096f274048a5882402e12be7c47db91b3834
parent 88c030e0e0152791ff74f90249f55fce01371198

Merge "Properly forward errors returned by AudioTrack up to the player."

media/libstagefright/codecs/avc/dec/AVCDecoder.cpp

diff --git a/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp b/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp
index 36272ea..aa2a3d1 100644
--- a/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp
+++ b/media/libstagefright/codecs/avc/dec/AVCDecoder.cpp
@@ -322,8 +322,10 @@
                 crop_top = crop_left = 0;
             }
 
-            mFormat->setInt32(kKeyWidth, crop_right - crop_left + 1);
-            mFormat->setInt32(kKeyHeight, crop_bottom - crop_top + 1);
+            int32_t aligned_width = (crop_right - crop_left + 1 + 15) & ~15;
+            int32_t aligned_height = (crop_bottom - crop_top + 1 + 15) & ~15;
+            mFormat->setInt32(kKeyWidth, aligned_width);
+            mFormat->setInt32(kKeyHeight, aligned_height);
 
             mInputBuffer->release();
             mInputBuffer = NULL;