media: Create Mojo StructTraits for VideoFrame

media/mojo/services/mojo_cdm_allocator_unittest.cc

 // Copyright 2016 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 <stddef.h>
 #include <stdint.h>
 
 #include <cstring>
 
 #include "base/macros.h"
@@ skipping 67 matching lines @@
   // the number of free buffers will be capped at |kMaxExpectedFreeBuffers|.
   for (int i = 0; i < 10; ++i) {
     buffer_size += kBufferSizeIncrease;
     cdm::Buffer* buffer = CreateCdmBuffer(buffer_size);
     buffer->Destroy();
     EXPECT_LE(GetAvailableBufferCount(), kMaxExpectedFreeBuffers);
   }
 }
 
 TEST_F(MojoCdmAllocatorTest, CreateCdmVideoFrame) {
-  const int kHeight = 16;
-  const int kWidth = 9;
+  const int kWidth = 16;
+  const int kHeight = 9;
   const VideoPixelFormat kFormat = PIXEL_FORMAT_I420;
-  const gfx::Size kSize(kHeight, kWidth);
+  const gfx::Size kSize(kWidth, kHeight);
   const size_t kBufferSize = VideoFrame::AllocationSize(kFormat, kSize);
 
   // Create a VideoFrameImpl and initialize it.
   std::unique_ptr<VideoFrameImpl> video_frame = CreateCdmVideoFrame();
   video_frame->SetFormat(cdm::kI420);
-  video_frame->SetSize(cdm::Size(kHeight, kWidth));
+  video_frame->SetSize(cdm::Size(kWidth, kHeight));
   video_frame->SetStride(VideoFrameImpl::kYPlane,
                          static_cast<uint32_t>(VideoFrame::RowBytes(
                              VideoFrame::kYPlane, kFormat, kWidth)));
   video_frame->SetStride(VideoFrameImpl::kUPlane,
                          static_cast<uint32_t>(VideoFrame::RowBytes(
                              VideoFrame::kUPlane, kFormat, kWidth)));
   video_frame->SetStride(VideoFrameImpl::kVPlane,
                          static_cast<uint32_t>(VideoFrame::RowBytes(
                              VideoFrame::kVPlane, kFormat, kWidth)));
   EXPECT_EQ(nullptr, video_frame->FrameBuffer());
@@ skipping 14 matching lines @@
   // Check that the buffer is still in use. It will be freed when |frame|
   // is destroyed.
   EXPECT_EQ(0u, GetAvailableBufferCount());
   frame = nullptr;
 
   // Check that the buffer is now in the free list.
   EXPECT_EQ(1u, GetAvailableBufferCount());
 }
 
 }  // namespace media