YUV software decode path stride fixes.

cc/texture_uploader.cc

 // Copyright 2012 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 "cc/texture_uploader.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/debug/alias.h"
@@ skipping 14 matching lines @@
 static const size_t uploadHistorySizeInitial = 100;
 
 // Global estimated number of textures per second to maintain estimates across
 // subsequent instances of TextureUploader.
 // More than one thread will not access this variable, so we do not need to synchronize access.
 static const double defaultEstimatedTexturesPerSecond = 48.0 * 60.0;
 
 // Flush interval when performing texture uploads.
 const int textureUploadFlushPeriod = 4;
 
+static uint32 RoundUp(uint32 n, uint32 mul)

[danakj, 2012/11/21 01:24:27]

don't use static here. it's already in anonymous namespace.

s/uint32/unsigned int/

+{
+  return (((n - 1) / mul) * mul) + mul;
+}
+
 } // anonymous namespace
 
 namespace cc {
 
 TextureUploader::Query::Query(WebKit::WebGraphicsContext3D* context)
     : m_context(context)
     , m_queryId(0)
     , m_value(0)
     , m_hasValue(false)
     , m_isNonBlocking(false)
@@ skipping 177 matching lines @@
     base::debug::Alias(&image_rect_height);
     base::debug::Alias(&dest_offset_x);
     base::debug::Alias(&dest_offset_y);
     TRACE_EVENT0("cc", "TextureUploader::uploadWithTexSubImage");
 
     // Offset from image-rect to source-rect.
     gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
 
     const uint8* pixel_source;
     unsigned int bytes_per_pixel = Resource::BytesPerPixel(format);
+    // Use 4-byte row alignment (OpenGL default) for upload performance.
+    // Assuming that GL_UNPACK_ALIGNMENT has not changed from default.
+    unsigned int upload_image_stride =
+        RoundUp(bytes_per_pixel * source_rect.width(), 4);
 
-    if (image_rect.width() == source_rect.width() && !offset.x()) {
-        pixel_source = &image[bytes_per_pixel * offset.y() * image_rect.width()];
+    if (upload_image_stride == image_rect.width() * bytes_per_pixel && !offset.x()) {
+        pixel_source = &image[image_rect.width() * bytes_per_pixel * offset.y()];
     } else {
-        size_t needed_size = source_rect.width() * source_rect.height() * bytes_per_pixel;
+        size_t needed_size = upload_image_stride * source_rect.height();
         if (m_subImageSize < needed_size) {
             m_subImage.reset(new uint8[needed_size]);
             m_subImageSize = needed_size;
         }
         // Strides not equal, so do a row-by-row memcpy from the
         // paint results into a temp buffer for uploading.
         for (int row = 0; row < source_rect.height(); ++row)
-            memcpy(&m_subImage[source_rect.width() * bytes_per_pixel * row],
+            memcpy(&m_subImage[upload_image_stride * row],
                    &image[bytes_per_pixel * (offset.x() +
                           (offset.y() + row) * image_rect.width())],
                    source_rect.width() * bytes_per_pixel);
 
         pixel_source = &m_subImage[0];
     }
 
     m_context->texSubImage2D(GL_TEXTURE_2D,
                              0,
                              dest_offset.x(),
@@ skipping 32 matching lines @@
     base::debug::Alias(&image_rect_width);
     base::debug::Alias(&image_rect_height);
     base::debug::Alias(&dest_offset_x);
     base::debug::Alias(&dest_offset_y);
 
     TRACE_EVENT0("cc", "TextureUploader::uploadWithMapTexSubImage");
 
     // Offset from image-rect to source-rect.
     gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
 
+    unsigned int bytes_per_pixel = Resource::BytesPerPixel(format);
+    // Use 4-byte row alignment (OpenGL default) for upload performance.
+    // Assuming that GL_UNPACK_ALIGNMENT has not changed from default.
+    unsigned int upload_image_stride =
+        RoundUp(bytes_per_pixel * source_rect.width(), 4);
+
     // Upload tile data via a mapped transfer buffer
     uint8* pixel_dest = static_cast<uint8*>(
         m_context->mapTexSubImage2DCHROMIUM(GL_TEXTURE_2D,
                                             0,
                                             dest_offset.x(),
                                             dest_offset.y(),
                                             source_rect.width(),
                                             source_rect.height(),
                                             format,
                                             GL_UNSIGNED_BYTE,
                                             GL_WRITE_ONLY));
 
     if (!pixel_dest) {
         uploadWithTexSubImage(
             image, image_rect, source_rect, dest_offset, format);
         return;
     }
 
-    unsigned int bytes_per_pixel = Resource::BytesPerPixel(format);
-
-    if (image_rect.width() == source_rect.width() && !offset.x()) {
+    if (upload_image_stride == image_rect.width() * bytes_per_pixel && !offset.x()) {
         memcpy(pixel_dest,
-               &image[offset.y() * image_rect.width() * bytes_per_pixel],
-               image_rect.width() * source_rect.height() * bytes_per_pixel);
+               &image[image_rect.width() * bytes_per_pixel * offset.y()],
+               source_rect.height() * image_rect.width() * bytes_per_pixel);
     } else {
         // Strides not equal, so do a row-by-row memcpy from the
         // paint results into the pixelDest
         for (int row = 0; row < source_rect.height(); ++row)
-            memcpy(&pixel_dest[source_rect.width() * row * bytes_per_pixel],
+            memcpy(&pixel_dest[upload_image_stride * row],
                    &image[bytes_per_pixel * (offset.x() +
                           (offset.y() + row) * image_rect.width())],
                    source_rect.width() * bytes_per_pixel);
     }
 
     m_context->unmapTexSubImage2DCHROMIUM(pixel_dest);
 }
 
 void TextureUploader::processQueries()
 {
@@ skipping 13 matching lines @@
             m_texturesPerSecondHistory.erase(m_texturesPerSecondHistory.begin());
             m_texturesPerSecondHistory.erase(--m_texturesPerSecondHistory.end());
         }
         m_texturesPerSecondHistory.insert(texturesPerSecond);
 
         m_availableQueries.append(m_pendingQueries.takeFirst());
     }
 }
 
 }  // namespace cc