libvpx: Pull from upstream

source/libvpx/test/md5_helper.h

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef LIBVPX_TEST_MD5_HELPER_H_
 #define LIBVPX_TEST_MD5_HELPER_H_
 
 extern "C" {
 #include "./md5_utils.h"
 #include "vpx/vpx_decoder.h"
 }
 
 namespace libvpx_test {
 class MD5 {
  public:
   MD5() {
     MD5Init(&md5_);
   }
 
   void Add(const vpx_image_t *img) {
     for (int plane = 0; plane < 3; ++plane) {
-      uint8_t *buf = img->planes[plane];
-      const int h = plane ? (img->d_h + 1) >> 1 : img->d_h;
-      const int w = plane ? (img->d_w + 1) >> 1 : img->d_w;
+      const uint8_t *buf = img->planes[plane];
+      // Calculate the width and height to do the md5 check. For the chroma
+      // plane, we never want to round down and thus skip a pixel so if
+      // we are shifting by 1 (chroma_shift) we add 1 before doing the shift.
+      // This works only for chroma_shift of 0 and 1.
+      const int h = plane ? (img->d_h + img->y_chroma_shift) >>
+                    img->y_chroma_shift : img->d_h;
+      const int w = plane ? (img->d_w + img->x_chroma_shift) >>
+                    img->x_chroma_shift : img->d_w;
 
       for (int y = 0; y < h; ++y) {
         MD5Update(&md5_, buf, w);
         buf += img->stride[plane];
       }
     }
   }
 
   const char *Get(void) {
     static const char hex[16] = {
@@ skipping 14 matching lines @@
   }
 
  protected:
   char res_[33];
   MD5Context md5_;
 };
 
 }  // namespace libvpx_test
 
 #endif  // LIBVPX_TEST_MD5_HELPER_H_