Assorted fixes for 64-bit.

media/base/video_frame_impl.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/video_frame_impl.h"
 
 namespace media {
 
 // static
 void VideoFrameImpl::CreateFrame(VideoSurface::Format format,
@@ skipping 49 matching lines @@
 
 bool VideoFrameImpl::AllocateRGB(size_t bytes_per_pixel) {
   // Round up to align at a 64-bit (8 byte) boundary for each row.  This
   // is sufficient for MMX reads (movq).
   size_t bytes_per_row = RoundUp(surface_.width * bytes_per_pixel, 8);
   surface_.planes = VideoSurface::kNumRGBPlanes;
   surface_.strides[VideoSurface::kRGBPlane] = bytes_per_row;
   surface_.data[VideoSurface::kRGBPlane] = new uint8[bytes_per_row *
                                                      surface_.height];
   DCHECK(surface_.data[VideoSurface::kRGBPlane]);
-  DCHECK(!(reinterpret_cast<int>(surface_.data[VideoSurface::kRGBPlane]) & 7));
+  DCHECK(!(reinterpret_cast<intptr_t>(
+              surface_.data[VideoSurface::kRGBPlane]) & 7));
   COMPILE_ASSERT(0 == VideoSurface::kRGBPlane, RGB_data_must_be_index_0);
   return (NULL != surface_.data[VideoSurface::kRGBPlane]);
 }
 
 bool VideoFrameImpl::AllocateYUV() {
   DCHECK(surface_.format == VideoSurface::YV12 ||
          surface_.format == VideoSurface::YV16);
   // Align Y rows at 32-bit (4 byte) boundaries.  The stride for both YV12 and
   // YV16 is 1/2 of the stride of Y.  For YV12, every row of bytes for U and V
   // applies to two rows of Y (one byte of UV for 4 bytes of Y), so in the
@@ skipping 61 matching lines @@
   DCHECK(locked_);
   DCHECK_NE(surface_.format, VideoSurface::EMPTY);
   locked_ = false;
 }
 
 bool VideoFrameImpl::IsEndOfStream() const {
   return surface_.format == VideoSurface::EMPTY;
 }
 
 }  // namespace media