commit f97f26afe0affa79e97e89f57f1e447ca8fa2192
author The Android Automerger <android-build@google.com> Thu Jun 23 00:07:43 2016 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 23 00:07:43 2016 -0700
tree e7b2513ce6f57ef0f22761ce6087ae417134f372
parent dd20107a9932203f96b4a3059739dc92029ab1ce
parent f1efcd59429e53091d69ececb55bdedf8265284d

merge in nyc-dr1-release history after reset to nyc-mr1-dev

videodecoder/VideoDecoderAVC.cpp

diff --git a/videodecoder/VideoDecoderAVC.cpp b/videodecoder/VideoDecoderAVC.cpp
index 077710c..283442e 100644
--- a/videodecoder/VideoDecoderAVC.cpp
+++ b/videodecoder/VideoDecoderAVC.cpp
@@ -722,6 +722,12 @@
     if (data->codec_data->crop_bottom > 0)
         height -= data->codec_data->crop_bottom;
 
+    if(data->codec_data->crop_left > 0)
+        width -= data->codec_data->crop_left;
+
+    if(data->codec_data->crop_right > 0)
+        width -= data->codec_data->crop_right;
+
     ITRACE("updateFormatInfo: current size: %d x %d, new size: %d x %d",
         mVideoFormatInfo.width, mVideoFormatInfo.height, width, height);
 

videodecoder/VideoDecoderBase.cpp

diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp
index 6d214bb..9de8631 100644
--- a/videodecoder/VideoDecoderBase.cpp
+++ b/videodecoder/VideoDecoderBase.cpp
@@ -1221,6 +1221,7 @@
     if (strcasecmp(mVideoFormatInfo.mimeType,"video/avc") == 0 ||
         strcasecmp(mVideoFormatInfo.mimeType,"video/h264") == 0) {
         cropHeight = mVideoFormatInfo.height;
+        cropWidth = mVideoFormatInfo.width;
     }
     int32_t size = cropWidth  * cropHeight * 3 / 2;
 
@@ -1654,6 +1655,7 @@
     if (strcasecmp(mVideoFormatInfo.mimeType,"video/avc") == 0 ||
         strcasecmp(mVideoFormatInfo.mimeType,"video/h264") == 0) {
         rect.height = mVideoFormatInfo.height;
+        rect.width = mVideoFormatInfo.width;
     }
 
     VADisplayAttribute render_rect;