Revert of [Cast] Software encoder support for varying video frame sizes.

media/cast/test/utility/video_utility.cc

 // Copyright 2014 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/cast/test/utility/video_utility.h"
 
 #include <math.h>
 #include <cstdio>
 
 #include "base/rand_util.h"
@@ skipping 41 matching lines @@
                           frame2->stride(VideoFrame::kYPlane),
                           frame2->data(VideoFrame::kUPlane),
                           frame2->stride(VideoFrame::kUPlane),
                           frame2->data(VideoFrame::kVPlane),
                           frame2->stride(VideoFrame::kVPlane),
                           frame1->coded_size().width(),
                           frame1->coded_size().height());
 }
 
 void PopulateVideoFrame(VideoFrame* frame, int start_value) {
-  const gfx::Size frame_size = frame->coded_size();
-  const int stripe_size =
-      std::max(32, std::min(frame_size.width(), frame_size.height()) / 8) & -2;
-
-  int height = frame_size.height();
+  int height = frame->coded_size().height();
   int stride_y = frame->stride(VideoFrame::kYPlane);
   int stride_u = frame->stride(VideoFrame::kUPlane);
   int stride_v = frame->stride(VideoFrame::kVPlane);
   int half_height = (height + 1) / 2;
   uint8* y_plane = frame->data(VideoFrame::kYPlane);
   uint8* u_plane = frame->data(VideoFrame::kUPlane);
   uint8* v_plane = frame->data(VideoFrame::kVPlane);
 
   // Set Y.
   for (int j = 0; j < height; ++j) {
-    const int stripe_j = (j / stripe_size) * stripe_size;
     for (int i = 0; i < stride_y; ++i) {
-      const int stripe_i = (i / stripe_size) * stripe_size;
-      *y_plane = static_cast<uint8>(start_value + stripe_i + stripe_j);
+      *y_plane = static_cast<uint8>(start_value + i + j);
       ++y_plane;
     }
   }
 
   // Set U.
   for (int j = 0; j < half_height; ++j) {
-    const int stripe_j = (j / stripe_size) * stripe_size;
     for (int i = 0; i < stride_u; ++i) {
-      const int stripe_i = (i / stripe_size) * stripe_size;
-      *u_plane = static_cast<uint8>(start_value + stripe_i + stripe_j);
+      *u_plane = static_cast<uint8>(start_value + i + j);
       ++u_plane;
     }
   }
 
   // Set V.
   for (int j = 0; j < half_height; ++j) {
-    const int stripe_j = (j / stripe_size) * stripe_size;
     for (int i = 0; i < stride_v; ++i) {
-      const int stripe_i = (i / stripe_size) * stripe_size;
-      *u_plane = static_cast<uint8>(start_value + stripe_i + stripe_j);
+      *v_plane = static_cast<uint8>(start_value + i + j);
       ++v_plane;
     }
   }
 }
 
 void PopulateVideoFrameWithNoise(VideoFrame* frame) {
   int height = frame->coded_size().height();
   int stride_y = frame->stride(VideoFrame::kYPlane);
   int stride_u = frame->stride(VideoFrame::kUPlane);
   int stride_v = frame->stride(VideoFrame::kVPlane);
@@ skipping 26 matching lines @@
   memcpy(u_plane, raw_data + width * height, half_width * half_height);
   memcpy(v_plane,
          raw_data + width * height + half_width * half_height,
          half_width * half_height);
   delete[] raw_data;
   return true;
 }
 
 }  // namespace cast
 }  // namespace media