commit 86fb6eb85a7476fe8f3e4100b130b5a2614a6745
author The Android Automerger <android-build@google.com> Thu Jun 23 00:04:06 2016 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 23 00:04:06 2016 -0700
tree 9127849dd6b562bc174e0466b4a70b040b4ffc6c
parent 7c953196797fd5be227c69c9e53847e64fa2db17
parent eb8e087ce9e645e1e2f6d92cb7229ef4c54519f2

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

videocodec/OMXVideoDecoderBase.cpp

diff --git a/videocodec/OMXVideoDecoderBase.cpp b/videocodec/OMXVideoDecoderBase.cpp
index 323739b..a2686bc 100755
--- a/videocodec/OMXVideoDecoderBase.cpp
+++ b/videocodec/OMXVideoDecoderBase.cpp
@@ -786,6 +786,7 @@
     if (strcasecmp(formatInfo->mimeType,"video/avc") == 0 ||
         strcasecmp(formatInfo->mimeType,"video/h264") == 0) {
         heightCropped = formatInfo->height;
+        widthCropped = formatInfo->width;
     }
     uint32_t strideCropped = widthCropped;
     uint32_t sliceHeightCropped = heightCropped;
@@ -1215,6 +1216,7 @@
         if (strcasecmp(formatInfo->mimeType,"video/avc") == 0 ||
             strcasecmp(formatInfo->mimeType,"video/h264") == 0) {
             rectParams->nHeight = formatInfo->height;
+            rectParams->nWidth = formatInfo->width;
         }
 
         // if port width parsed from extractor is not as same as from SPS/PPS nalu header,

videocodec/OMXVideoDecoderVP9Hybrid.cpp

diff --git a/videocodec/OMXVideoDecoderVP9Hybrid.cpp b/videocodec/OMXVideoDecoderVP9Hybrid.cpp
index 20075ab..53dbd48 100644
--- a/videocodec/OMXVideoDecoderVP9Hybrid.cpp
+++ b/videocodec/OMXVideoDecoderVP9Hybrid.cpp
@@ -251,7 +251,6 @@
         unsigned int width, height;
         mDecoderDecode(mCtx,mHybridCtx,NULL,0,true);
         mGetOutput(mCtx,mHybridCtx, &width, &height);
-        mLastTimeStamp = 0;
     }
     return OMX_ErrorNone;
 }