Audio/video data streaming over shared memory.

chromecast/media/cma/ipc_streamer/av_streamer_unittest.cc

Index: chromecast/media/cma/ipc_streamer/av_streamer_unittest.cc
diff --git a/chromecast/media/cma/base/buffering_frame_provider_unittest.cc b/chromecast/media/cma/ipc_streamer/av_streamer_unittest.cc
similarity index 53%
copy from chromecast/media/cma/base/buffering_frame_provider_unittest.cc
copy to chromecast/media/cma/ipc_streamer/av_streamer_unittest.cc
index 6f7902a70b86e480bc0d43dbbbc00708b247737c..2971fb7ba671e3943bb9d424403f8b42a0813c8f 100644
--- a/chromecast/media/cma/base/buffering_frame_provider_unittest.cc
+++ b/chromecast/media/cma/ipc_streamer/av_streamer_unittest.cc
@@ -11,11 +11,14 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
-#include "chromecast/media/cma/base/buffering_frame_provider.h"
 #include "chromecast/media/cma/base/decoder_buffer_base.h"
 #include "chromecast/media/cma/base/frame_generator_for_test.h"
 #include "chromecast/media/cma/base/mock_frame_consumer.h"
 #include "chromecast/media/cma/base/mock_frame_provider.h"
+#include "chromecast/media/cma/ipc/media_memory_chunk.h"
+#include "chromecast/media/cma/ipc/media_message_fifo.h"
+#include "chromecast/media/cma/ipc_streamer/av_streamer_proxy.h"
+#include "chromecast/media/cma/ipc_streamer/coded_frame_provider_host.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/video_decoder_config.h"
@@ -24,45 +27,71 @@
 namespace chromecast {
 namespace media {
 
-class BufferingFrameProviderTest : public testing::Test {
+namespace {
+
+class FifoMemoryChunk : public MediaMemoryChunk {
  public:
-  BufferingFrameProviderTest();
-  virtual ~BufferingFrameProviderTest();
+  FifoMemoryChunk(void* mem, size_t size)
+      : mem_(mem), size_(size) {}
+  virtual ~FifoMemoryChunk() {}
+
+  virtual void* data() const OVERRIDE { return mem_; }
+  virtual size_t size() const OVERRIDE { return size_; }
+  virtual bool valid() const OVERRIDE { return true; }
+
+ private:
+  void* mem_;
+  size_t size_;
+
+  DISALLOW_COPY_AND_ASSIGN(FifoMemoryChunk);
+};
 
-  // Setup the test.
+}  // namespace
+
+class AvStreamerTest : public testing::Test {
+ public:
+  AvStreamerTest();
+  virtual ~AvStreamerTest();
+
+  // Setups the test.
   void Configure(
       size_t frame_count,
       const std::vector<bool>& provider_delayed_pattern,
       const std::vector<bool>& consumer_delayed_pattern);
 
-  // Start the test.
+  // Starts the test.
   void Start();
 
  protected:
-  scoped_ptr<BufferingFrameProvider> buffering_frame_provider_;
+  scoped_ptr<uint64[]> fifo_mem_;
+
+  scoped_ptr<AvStreamerProxy> av_buffer_proxy_;
+  scoped_ptr<CodedFrameProviderHost> coded_frame_provider_host_;
   scoped_ptr<MockFrameConsumer> frame_consumer_;
 
  private:
   void OnTestTimeout();
   void OnTestCompleted();
 
-  DISALLOW_COPY_AND_ASSIGN(BufferingFrameProviderTest);
+  void OnFifoRead();
+  void OnFifoWrite();
+
+  DISALLOW_COPY_AND_ASSIGN(AvStreamerTest);
 };
 
-BufferingFrameProviderTest::BufferingFrameProviderTest() {
+AvStreamerTest::AvStreamerTest() {
 }
 
-BufferingFrameProviderTest::~BufferingFrameProviderTest() {
+AvStreamerTest::~AvStreamerTest() {
 }
 
-void BufferingFrameProviderTest::Configure(
+void AvStreamerTest::Configure(
     size_t frame_count,
     const std::vector<bool>& provider_delayed_pattern,
     const std::vector<bool>& consumer_delayed_pattern) {
-  DCHECK_GE(frame_count, 1u);
-
   // Frame generation on the producer and consumer side.
-  std::vector<FrameGeneratorForTest::FrameSpec> frame_specs(frame_count);
+  std::vector<FrameGeneratorForTest::FrameSpec> frame_specs;
+  frame_specs.resize(frame_count);
   for (size_t k = 0; k < frame_specs.size() - 1; k++) {
     frame_specs[k].has_config = (k == 0);
     frame_specs[k].timestamp = base::TimeDelta::FromMilliseconds(40) * k;
@@ -80,44 +109,80 @@ void BufferingFrameProviderTest::Configure(
   frame_provider->Configure(provider_delayed_pattern,
                             frame_generator_provider.Pass());
 
-  size_t max_frame_size = 10 * 1024;
-  size_t buffer_size = 10 * max_frame_size;
-  buffering_frame_provider_.reset(
-      new BufferingFrameProvider(
-          scoped_ptr<CodedFrameProvider>(frame_provider.release()),
-          buffer_size,
-          max_frame_size,
-          BufferingFrameProvider::FrameBufferedCB()));
+  size_t fifo_size_div_8 = 512;
+  fifo_mem_.reset(new uint64[fifo_size_div_8]);
+  scoped_ptr<MediaMessageFifo> producer_fifo(
+      new MediaMessageFifo(
+          scoped_ptr<MediaMemoryChunk>(
+              new FifoMemoryChunk(&fifo_mem_[0], fifo_size_div_8 * 8)),
+          true));
+  scoped_ptr<MediaMessageFifo> consumer_fifo(
+      new MediaMessageFifo(
+          scoped_ptr<MediaMemoryChunk>(
+              new FifoMemoryChunk(&fifo_mem_[0], fifo_size_div_8 * 8)),
+          false));
+  producer_fifo->ObserveWriteActivity(
+      base::Bind(&AvStreamerTest::OnFifoWrite, base::Unretained(this)));
+  consumer_fifo->ObserveReadActivity(
+      base::Bind(&AvStreamerTest::OnFifoRead, base::Unretained(this)));
+
+  av_buffer_proxy_.reset(
+      new AvStreamerProxy());
+  av_buffer_proxy_->SetCodedFrameProvider(
+      scoped_ptr<CodedFrameProvider>(frame_provider.release()));
+  av_buffer_proxy_->SetMediaMessageFifo(producer_fifo.Pass());
+
+  coded_frame_provider_host_.reset(
+      new CodedFrameProviderHost(consumer_fifo.Pass()));
 
   frame_consumer_.reset(
-      new MockFrameConsumer(buffering_frame_provider_.get()));
+      new MockFrameConsumer(coded_frame_provider_host_.get()));
   frame_consumer_->Configure(
       consumer_delayed_pattern,
       false,
       frame_generator_consumer.Pass());
 }
 
-void BufferingFrameProviderTest::Start() {
+void AvStreamerTest::Start() {
+  base::MessageLoopProxy::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&AvStreamerProxy::Start,
+                 base::Unretained(av_buffer_proxy_.get())));
+
   frame_consumer_->Start(
-      base::Bind(&BufferingFrameProviderTest::OnTestCompleted,
+      base::Bind(&AvStreamerTest::OnTestCompleted,
                  base::Unretained(this)));
 }
 
-void BufferingFrameProviderTest::OnTestTimeout() {
+void AvStreamerTest::OnTestTimeout() {
   ADD_FAILURE() << "Test timed out";
   if (base::MessageLoop::current())
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
-void BufferingFrameProviderTest::OnTestCompleted() {
+void AvStreamerTest::OnTestCompleted() {
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
-TEST_F(BufferingFrameProviderTest, FastProviderSlowConsumer) {
+void AvStreamerTest::OnFifoWrite() {
+  base::MessageLoopProxy::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&CodedFrameProviderHost::OnFifoWriteEvent,
+                 base::Unretained(coded_frame_provider_host_.get())));
+}
+
+void AvStreamerTest::OnFifoRead() {
+  base::MessageLoopProxy::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&AvStreamerProxy::OnFifoReadEvent,
+                 base::Unretained(av_buffer_proxy_.get())));
+}
+
+TEST_F(AvStreamerTest, FastProviderSlowConsumer) {
+  size_t frame_count = 100;
   bool provider_delayed_pattern[] = { false };
   bool consumer_delayed_pattern[] = { true };
 
-  const size_t frame_count = 100u;
   Configure(
       frame_count,
       std::vector<bool>(
@@ -130,15 +195,15 @@ TEST_F(BufferingFrameProviderTest, FastProviderSlowConsumer) {
   scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
   message_loop->PostTask(
       FROM_HERE,
-      base::Bind(&BufferingFrameProviderTest::Start, base::Unretained(this)));
+      base::Bind(&AvStreamerTest::Start, base::Unretained(this)));
   message_loop->Run();
 };
 
-TEST_F(BufferingFrameProviderTest, SlowProviderFastConsumer) {
+TEST_F(AvStreamerTest, SlowProviderFastConsumer) {
+  size_t frame_count = 100;

[gunsch, 2014/09/10 18:51:37]

Chromium review picked up the diff between this and
BufferingFrameProviderTest... so why not "const" here? :)

[damienv1, 2014/09/10 21:24:54]

Done.

   bool provider_delayed_pattern[] = { true };
   bool consumer_delayed_pattern[] = { false };
 
-  const size_t frame_count = 100u;
   Configure(
       frame_count,
       std::vector<bool>(
@@ -151,12 +216,15 @@ TEST_F(BufferingFrameProviderTest, SlowProviderFastConsumer) {
   scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
   message_loop->PostTask(
       FROM_HERE,
-      base::Bind(&BufferingFrameProviderTest::Start, base::Unretained(this)));
+      base::Bind(&AvStreamerTest::Start, base::Unretained(this)));
   message_loop->Run();
 };
 
-TEST_F(BufferingFrameProviderTest, SlowFastProducerConsumer) {
-  // Lengths are prime between each other so we can test a lot of combinations.
+TEST_F(AvStreamerTest, SlowFastProducerConsumer) {
+  size_t frame_count = 100;
+
+  // Pattern lengths are prime between each other
+  // so that a lot of combinations can be tested.
   bool provider_delayed_pattern[] = {
     true, true, true, true, true,
     false, false, false, false
@@ -166,7 +234,6 @@ TEST_F(BufferingFrameProviderTest, SlowFastProducerConsumer) {
     false, false, false, false, false, false, false
   };
 
-  const size_t frame_count = 100u;
   Configure(
       frame_count,
       std::vector<bool>(
@@ -179,7 +246,7 @@ TEST_F(BufferingFrameProviderTest, SlowFastProducerConsumer) {
   scoped_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
   message_loop->PostTask(
       FROM_HERE,
-      base::Bind(&BufferingFrameProviderTest::Start, base::Unretained(this)));
+      base::Bind(&AvStreamerTest::Start, base::Unretained(this)));
   message_loop->Run();
 };