Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

media/base/video_frame_unittest.cc

 // Copyright (c) 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 "media/base/video_frame.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/format_macros.h"
 #include "base/memory/aligned_memory.h"
@@ skipping 58 matching lines @@
                            yv12_frame->coded_size().height(),
                            yv12_frame->stride(VideoFrame::kYPlane),
                            yv12_frame->stride(VideoFrame::kUPlane),
                            bytes_per_row,
                            media::YV12);
 
   for (int row = 0; row < yv12_frame->coded_size().height(); ++row) {
     uint32* rgb_row_data = reinterpret_cast<uint32*>(
         rgb_data + (bytes_per_row * row));
     for (int col = 0; col < yv12_frame->coded_size().width(); ++col) {
-      SCOPED_TRACE(
-          base::StringPrintf("Checking (%d, %d)", row, col));
+      SCOPED_TRACE(base::StringPrintf("Checking (%d, %d)", row, col));
       EXPECT_EQ(expect_rgb_color, rgb_row_data[col]);
     }
   }
 
   base::AlignedFree(rgb_data);
 }
 
 // Fill each plane to its reported extents and verify accessors report non
 // zero values.  Additionally, for the first plane verify the rows and
 // row_bytes values are correct.
@@ skipping 163 matching lines @@
   {
     scoped_refptr<VideoFrame> frame = VideoFrame::WrapNativeTexture(
         gpu::MailboxHolder(gpu::Mailbox(), 5, 0 /* sync_point */),
         base::Bind(&TextureCallback, &called_sync_point),
         gfx::Size(10, 10),  // coded_size
         gfx::Rect(10, 10),  // visible_rect
         gfx::Size(10, 10),  // natural_size
         base::TimeDelta(),  // timestamp
         false,              // allow_overlay
         true);              // has_alpha
-    EXPECT_EQ(VideoFrame::TEXTURE_RGBA, frame->texture_format());
+    EXPECT_EQ(VideoFrame::STORAGE_TEXTURE, frame->storage_type());
+    EXPECT_EQ(VideoFrame::ARGB, frame->format());
   }
   // Nobody set a sync point to |frame|, so |frame| set |called_sync_point| to 0
   // as default value.
   EXPECT_EQ(0u, called_sync_point);
 }
 
 namespace {
 
 class SyncPointClientImpl : public VideoFrame::SyncPointClient {
  public:
@@ skipping 28 matching lines @@
         gpu::MailboxHolder(mailbox[VideoFrame::kYPlane], target, sync_point),
         gpu::MailboxHolder(mailbox[VideoFrame::kUPlane], target, sync_point),
         gpu::MailboxHolder(mailbox[VideoFrame::kVPlane], target, sync_point),
         base::Bind(&TextureCallback, &called_sync_point),
         gfx::Size(10, 10),  // coded_size
         gfx::Rect(10, 10),  // visible_rect
         gfx::Size(10, 10),  // natural_size
         base::TimeDelta(),  // timestamp
         false);             // allow_overlay
 
-    EXPECT_EQ(VideoFrame::TEXTURE_YUV_420, frame->texture_format());
-    EXPECT_EQ(3u, VideoFrame::NumTextures(frame->texture_format()));
-    for (size_t i = 0; i < VideoFrame::NumTextures(frame->texture_format());
+    EXPECT_EQ(VideoFrame::STORAGE_TEXTURE, frame->storage_type());
+    EXPECT_EQ(VideoFrame::I420, frame->format());
+    EXPECT_EQ(3u, VideoFrame::NumPlanes(frame->format()));
+    for (size_t i = 0; i < VideoFrame::NumPlanes(frame->format());
          ++i) {
       const gpu::MailboxHolder& mailbox_holder = frame->mailbox_holder(i);
       EXPECT_EQ(mailbox[i].name[0], mailbox_holder.mailbox.name[0]);
       EXPECT_EQ(target, mailbox_holder.texture_target);
       EXPECT_EQ(sync_point, mailbox_holder.sync_point);
     }
 
     SyncPointClientImpl client(release_sync_point);
     frame->UpdateReleaseSyncPoint(&client);
     EXPECT_EQ(sync_point,
@@ skipping 95 matching lines @@
 
   for (int i = 0; i < VideoFrameMetadata::NUM_KEYS; ++i) {
     const VideoFrameMetadata::Key key = static_cast<VideoFrameMetadata::Key>(i);
     int value = -1;
     EXPECT_TRUE(result.GetInteger(key, &value));
     EXPECT_EQ(i, value);
   }
 }
 
 }  // namespace media