Verify returned frames from media::VideoFrame::Wrap*() methods

cc/resources/video_resource_updater_unittest.cc

 // Copyright 2013 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/resources/video_resource_updater.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "cc/resources/resource_provider.h"
@@ skipping 69 matching lines @@
         output_surface_software_.get(), shared_bitmap_manager_.get());
   }
 
   scoped_refptr<media::VideoFrame> CreateTestYUVVideoFrame() {
     const int kDimension = 10;
     gfx::Size size(kDimension, kDimension);
     static uint8_t y_data[kDimension * kDimension] = {0};
     static uint8_t u_data[kDimension * kDimension / 2] = {0};
     static uint8_t v_data[kDimension * kDimension / 2] = {0};
 
-    return media::VideoFrame::WrapExternalYuvData(
-        media::PIXEL_FORMAT_YV16,  // format
-        size,                      // coded_size
-        gfx::Rect(size),           // visible_rect
-        size,                      // natural_size
-        size.width(),              // y_stride
-        size.width() / 2,          // u_stride
-        size.width() / 2,          // v_stride
-        y_data,                    // y_data
-        u_data,                    // u_data
-        v_data,                    // v_data
-        base::TimeDelta());        // timestamp
+    scoped_refptr<media::VideoFrame> video_frame =
+        media::VideoFrame::WrapExternalYuvData(
+            media::PIXEL_FORMAT_YV16,  // format
+            size,                      // coded_size
+            gfx::Rect(size),           // visible_rect
+            size,                      // natural_size
+            size.width(),              // y_stride
+            size.width() / 2,          // u_stride
+            size.width() / 2,          // v_stride
+            y_data,                    // y_data
+            u_data,                    // u_data
+            v_data,                    // v_data
+            base::TimeDelta());        // timestamp
+    EXPECT_NE(nullptr, video_frame.get());

[DaleCurtis, 2016/01/14 23:27:04]

EXPECT_TRUE like you've used in most other places. Remove get.

[emircan, 2016/01/15 00:28:28]

Done.

+    return video_frame;
   }
 
   static void ReleaseMailboxCB(const gpu::SyncToken& sync_token) {}
 
   scoped_refptr<media::VideoFrame> CreateTestRGBAHardwareVideoFrame() {
     const int kDimension = 10;
     gfx::Size size(kDimension, kDimension);
 
     gpu::Mailbox mailbox;
     mailbox.name[0] = 51;
 
     const gpu::SyncToken sync_token(7);
     const unsigned target = GL_TEXTURE_2D;
-    return media::VideoFrame::WrapNativeTexture(
-        media::PIXEL_FORMAT_ARGB,
-        gpu::MailboxHolder(mailbox, sync_token, target),
-        base::Bind(&ReleaseMailboxCB),
-        size,                // coded_size
-        gfx::Rect(size),     // visible_rect
-        size,                // natural_size
-        base::TimeDelta());  // timestamp
+    scoped_refptr<media::VideoFrame> video_frame =
+        media::VideoFrame::WrapNativeTexture(
+            media::PIXEL_FORMAT_ARGB,
+            gpu::MailboxHolder(mailbox, sync_token, target),
+            base::Bind(&ReleaseMailboxCB),
+            size,                // coded_size
+            gfx::Rect(size),     // visible_rect
+            size,                // natural_size
+            base::TimeDelta());  // timestamp
+    EXPECT_NE(nullptr, video_frame.get());

[DaleCurtis, 2016/01/14 23:27:04]

EXPECT_TRUE, remove get.

[emircan, 2016/01/15 00:28:27]

Done.

+    return video_frame;
   }
 
   scoped_refptr<media::VideoFrame> CreateTestYUVHardareVideoFrame() {
     const int kDimension = 10;
     gfx::Size size(kDimension, kDimension);
 
     const int kPlanesNum = 3;
     gpu::Mailbox mailbox[kPlanesNum];
     for (int i = 0; i < kPlanesNum; ++i) {
       mailbox[i].name[0] = 50 + 1;
     }
     const gpu::SyncToken sync_token(7);
     const unsigned target = GL_TEXTURE_RECTANGLE_ARB;
-    return media::VideoFrame::WrapYUV420NativeTextures(
-        gpu::MailboxHolder(mailbox[media::VideoFrame::kYPlane], sync_token,
-                           target),
-        gpu::MailboxHolder(mailbox[media::VideoFrame::kUPlane], sync_token,
-                           target),
-        gpu::MailboxHolder(mailbox[media::VideoFrame::kVPlane], sync_token,
-                           target),
-        base::Bind(&ReleaseMailboxCB),
-        size,                // coded_size
-        gfx::Rect(size),     // visible_rect
-        size,                // natural_size
-        base::TimeDelta());  // timestamp
+    scoped_refptr<media::VideoFrame> video_frame =
+        media::VideoFrame::WrapYUV420NativeTextures(
+            gpu::MailboxHolder(mailbox[media::VideoFrame::kYPlane], sync_token,
+                               target),
+            gpu::MailboxHolder(mailbox[media::VideoFrame::kUPlane], sync_token,
+                               target),
+            gpu::MailboxHolder(mailbox[media::VideoFrame::kVPlane], sync_token,
+                               target),
+            base::Bind(&ReleaseMailboxCB),
+            size,                // coded_size
+            gfx::Rect(size),     // visible_rect
+            size,                // natural_size
+            base::TimeDelta());  // timestamp
+    EXPECT_NE(nullptr, video_frame.get());

[DaleCurtis, 2016/01/14 23:27:04]

EXPECT_TRUE, remove get.

[emircan, 2016/01/15 00:28:28]

Done.

+    return video_frame;
   }
 
   WebGraphicsContext3DUploadCounter* context3d_;
   FakeOutputSurfaceClient client_;
   scoped_ptr<FakeOutputSurface> output_surface3d_;
   scoped_ptr<FakeOutputSurface> output_surface_software_;
   scoped_ptr<SharedBitmapManagerAllocationCounter> shared_bitmap_manager_;
   scoped_ptr<ResourceProvider> resource_provider3d_;
   scoped_ptr<ResourceProvider> resource_provider_software_;
 };
@@ skipping 152 matching lines @@
 
   resources = updater.CreateExternalResourcesFromVideoFrame(video_frame);
   EXPECT_EQ(VideoFrameExternalResources::YUV_RESOURCE, resources.type);
   EXPECT_TRUE(resources.read_lock_fences_enabled);
   EXPECT_EQ(3u, resources.mailboxes.size());
   EXPECT_EQ(3u, resources.release_callbacks.size());
   EXPECT_EQ(0u, resources.software_resources.size());
 }
 }  // namespace
 }  // namespace cc