Android media: VideoFrame should not store so many sync points.

content/browser/renderer_host/media/video_capture_controller_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.
 
 // Unit test for VideoCaptureController.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "content/browser/renderer_host/media/media_stream_provider.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
+#include "content/common/gpu/client/gl_helper.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/video_util.h"
 #include "media/video/capture/video_capture_types.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_ANDROID)
+#include "content/browser/renderer_host/image_transport_factory_android.h"
+#include "content/browser/renderer_host/no_image_transport_factory_android.h"
+#else
+#include "content/browser/compositor/image_transport_factory.h"
+#include "ui/compositor/test/in_process_context_factory.h"
+#endif
+
 using ::testing::InSequence;
 using ::testing::Mock;
 
 namespace content {
 
 class MockVideoCaptureControllerEventHandler
     : public VideoCaptureControllerEventHandler {
  public:
   explicit MockVideoCaptureControllerEventHandler(
       VideoCaptureController* controller)
@@ skipping 26 matching lines @@
                              const media::VideoCaptureFormat& format,
                              base::TimeTicks timestamp) OVERRIDE {
     DoBufferReady(id);
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&VideoCaptureController::ReturnBuffer,
                    base::Unretained(controller_),
                    id,
                    this,
                    buffer_id,
-                   std::vector<uint32>()));
+                   0));
   }
   virtual void OnMailboxBufferReady(const VideoCaptureControllerID& id,
                                     int buffer_id,
                                     const gpu::MailboxHolder& mailbox_holder,
                                     const media::VideoCaptureFormat& format,
                                     base::TimeTicks timestamp) OVERRIDE {
     DoMailboxBufferReady(id);
-    // Use a very different syncpoint value when returning a new syncpoint.
-    std::vector<uint32> release_sync_points;
-    release_sync_points.push_back(~mailbox_holder.sync_point);
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&VideoCaptureController::ReturnBuffer,
                    base::Unretained(controller_),
                    id,
                    this,
                    buffer_id,
-                   release_sync_points));
+                   mailbox_holder.sync_point));
   }
   virtual void OnEnded(const VideoCaptureControllerID& id) OVERRIDE {
     DoEnded(id);
     // OnEnded() must respond by (eventually) unregistering the client.
     base::MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(base::IgnoreResult(&VideoCaptureController::RemoveClient),
                    base::Unretained(controller_), id, this));
   }
 
   VideoCaptureController* controller_;
@@ skipping 154 matching lines @@
   ASSERT_EQ(1, controller_->GetClientCount())
       << "Removing non-existant session 200 should be a no-op.";
   ASSERT_EQ(400,
       controller_->RemoveClient(client_b_route_2, client_b_.get()))
       << "Removing client B/2 should return its session_id.";
   // Clients in controller: []
   ASSERT_EQ(0, controller_->GetClientCount())
       << "Client count should return to zero after all clients are gone.";
 }
 
-static void CacheSyncPoint(std::vector<uint32>* called_release_sync_points,
-                           const std::vector<uint32>& release_sync_points) {
-  DCHECK(called_release_sync_points->empty());
-  called_release_sync_points->assign(release_sync_points.begin(),
-                                     release_sync_points.end());
+static void CacheSyncPoint(uint32* called_release_sync_point,
+                           uint32 release_sync_point) {
+  *called_release_sync_point = release_sync_point;
 }
 
 // This test will connect and disconnect several clients while simulating an
 // active capture device being started and generating frames. It runs on one
 // thread and is intended to behave deterministically.
 TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
+// VideoCaptureController::ReturnBuffer() uses ImageTransportFactory.
+#if defined(OS_ANDROID)
+  ImageTransportFactoryAndroid::InitializeForUnitTests(
+      new NoImageTransportFactoryAndroid);
+#else
+  ImageTransportFactory::InitializeForUnitTests(
+      scoped_ptr<ui::ContextFactory>(new ui::InProcessContextFactory));
+#endif
+
   media::VideoCaptureParams session_100;
   session_100.requested_format = media::VideoCaptureFormat(
       gfx::Size(320, 240), 30, media::PIXEL_FORMAT_I420);
 
   media::VideoCaptureParams session_200 = session_100;
 
   media::VideoCaptureParams session_300 = session_100;
 
   media::VideoCaptureParams session_1 = session_100;
 
@@ skipping 190 matching lines @@
     device_->OnIncomingCapturedVideoFrame(
         buffer,
         media::VideoCaptureFormat(capture_resolution,
                                   device_format.frame_rate,
                                   media::PIXEL_FORMAT_I420),
         WrapI420Buffer(buffer, capture_resolution),
         base::TimeTicks());
     buffer = NULL;
   }
   std::vector<uint32> mailbox_syncpoints(mailbox_buffers);
-  std::vector<std::vector<uint32> > release_syncpoint_vectors(mailbox_buffers);
+  std::vector<uint32> release_syncpoint_vectors(mailbox_buffers);

[no sievers, 2014/07/10 18:52:29]

nit: |release_syncpoints_|?

+#if defined(OS_ANDROID)
+  GLHelper* gl_helper =
+      ImageTransportFactoryAndroid::GetInstance()->GetGLHelper();
+#else
+  GLHelper* gl_helper = ImageTransportFactory::GetInstance()->GetGLHelper();
+#endif
   for (int i = 0; i < mailbox_buffers; ++i) {
     buffer = device_->ReserveOutputBuffer(media::VideoFrame::NATIVE_TEXTURE,
                                           gfx::Size(0, 0));
     ASSERT_TRUE(buffer);
-    mailbox_syncpoints[i] = i;
+    mailbox_syncpoints[i] = gl_helper->InsertSyncPoint();
     device_->OnIncomingCapturedVideoFrame(
         buffer,
         media::VideoCaptureFormat(capture_resolution,
                                   device_format.frame_rate,
                                   media::PIXEL_FORMAT_TEXTURE),
         WrapMailboxBuffer(
             buffer,
             make_scoped_ptr(new gpu::MailboxHolder(
                 gpu::Mailbox(), 0, mailbox_syncpoints[i])),
             base::Bind(&CacheSyncPoint, &release_syncpoint_vectors[i]),
             capture_resolution),
         base::TimeTicks());
     buffer = NULL;
   }
   // ReserveOutputBuffers ought to fail now regardless of buffer format, because
   // the pool is depleted.
   ASSERT_FALSE(device_->ReserveOutputBuffer(media::VideoFrame::I420,
                                             capture_resolution));
   ASSERT_FALSE(device_->ReserveOutputBuffer(media::VideoFrame::NATIVE_TEXTURE,
                                             gfx::Size(0, 0)));
   EXPECT_CALL(*client_b_, DoBufferReady(client_b_route_2)).Times(shm_buffers);
   EXPECT_CALL(*client_b_, DoMailboxBufferReady(client_b_route_2))
       .Times(mailbox_buffers);
   base::RunLoop().RunUntilIdle();
   for (size_t i = 0; i < mailbox_syncpoints.size(); ++i) {
-    // See: MockVideoCaptureControllerEventHandler::OnMailboxBufferReady()
-    ASSERT_EQ(1u, release_syncpoint_vectors[i].size());
-    ASSERT_EQ(mailbox_syncpoints[i], ~release_syncpoint_vectors[i][0]);
+    // A new release sync point must be inserted when the video frame is
+    // returned to the Browser process.
+    // See: MockVideoCaptureControllerEventHandler::OnMailboxBufferReady() and
+    // VideoCaptureController::ReturnBuffer()
+    ASSERT_NE(mailbox_syncpoints[i], release_syncpoint_vectors[i]);

[no sievers, 2014/07/10 18:52:29]

At what point are those equal though? Can we ASSERT that also above?

[dshwang, 2014/07/10 19:23:11]

Unfortunately, we cannot know what is release_syncpoint_vectors[i] because real
gl context generated the sync point.

   }
   Mock::VerifyAndClearExpectations(client_b_.get());
 }
 
 // Exercises the OnError() codepath of VideoCaptureController, and tests the
 // behavior of various operations after the error state has been signalled.
 TEST_F(VideoCaptureControllerTest, ErrorBeforeDeviceCreation) {
   media::VideoCaptureParams session_100;
   session_100.requested_format = media::VideoCaptureFormat(
       gfx::Size(320, 240), 30, media::PIXEL_FORMAT_I420);
@@ skipping 78 matching lines @@
 
   // Second client connects after the error state. It also should get told of
   // the error.
   EXPECT_CALL(*client_b_, DoError(route_id)).Times(1);
   controller_->AddClient(
       route_id, client_b_.get(), base::kNullProcessHandle, 200, session_200);
   Mock::VerifyAndClearExpectations(client_b_.get());
 }
 
 }  // namespace content