Introduce some buffering into the cast media pipeline.

chromecast/media/cma/base/buffering_frame_provider.h

Index: chromecast/media/cma/base/buffering_frame_provider.h
diff --git a/chromecast/media/cma/base/buffering_frame_provider.h b/chromecast/media/cma/base/buffering_frame_provider.h
new file mode 100644
index 0000000000000000000000000000000000000000..992890c03fa51364b80d88d99e98540173c96fe8
--- /dev/null
+++ b/chromecast/media/cma/base/buffering_frame_provider.h
@@ -0,0 +1,118 @@
+// Copyright 2014 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.
+
+#ifndef CHROMECAST_MEDIA_CMA_BASE_BUFFERING_FRAME_PROVIDER_H_
+#define CHROMECAST_MEDIA_CMA_BASE_BUFFERING_FRAME_PROVIDER_H_
+
+#include <list>
+
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/threading/thread_checker.h"
+#include "chromecast/media/cma/base/coded_frame_provider.h"
+#include "media/base/audio_decoder_config.h"
+#include "media/base/video_decoder_config.h"
+
+namespace chromecast {
+namespace media {
+class DecoderBufferBase;
+
+// BufferingFrameProvider -
+// Fetch some data from another CodedFrameProvider up to a certain size limit.
+//

[gunsch, 2014/09/09 15:58:19]

remove

[damienv1, 2014/09/09 16:24:17]

Done.

+class BufferingFrameProvider : public CodedFrameProvider {
+ public:
+  typedef base::Callback<void(const scoped_refptr<DecoderBufferBase>&, bool)>
+      FrameBufferedCB;
+
+  // Create a frame provider that buffers coded frames up to the

[gunsch, 2014/09/09 15:58:19]

nit: Creates

[damienv1, 2014/09/09 16:24:17]

Done.

+  // |max_buffer_size| limit (given as a number of bytes).
+  // |max_frame_size| corresponds to an upper bound of the expected frame size.
+  // Each time a frame is buffered, |frame_buffered_cb| is invoked with the
+  // last frame buffered. The second parameter of the callback indicates
+  // whether the maximum capacity has been reached, i.e. whether the next frame
+  // size might overflow the buffer: |total_buffer_size_| + next_frame_size
+  // might be greater than |max_buffer_size|.
+  // Note: takes ownership of |coded_frame_provider|.
+  BufferingFrameProvider(
+      scoped_ptr<CodedFrameProvider> coded_frame_provider,
+      size_t max_buffer_size,
+      size_t max_frame_size,
+      const FrameBufferedCB& frame_buffered_cb);
+  virtual ~BufferingFrameProvider();
+
+  // CodedFrameProvider implementation.
+  virtual void Read(const ReadCB& read_cb) OVERRIDE;
+  virtual void Flush(const base::Closure& flush_cb) OVERRIDE;
+
+ private:
+  class BufferWithConfig {
+   public:
+    BufferWithConfig(
+        const scoped_refptr<DecoderBufferBase>& buffer,
+        const ::media::AudioDecoderConfig& audio_config,
+        const ::media::VideoDecoderConfig& video_config);
+    ~BufferWithConfig();
+
+    const scoped_refptr<DecoderBufferBase>& buffer() const { return buffer_; }
+    const ::media::AudioDecoderConfig& audio_config() const {
+      return audio_config_;
+    }
+    const ::media::VideoDecoderConfig& video_config() const {
+      return video_config_;
+    }
+
+   private:
+    scoped_refptr<DecoderBufferBase> buffer_;
+    ::media::AudioDecoderConfig audio_config_;
+    ::media::VideoDecoderConfig video_config_;
+  };
+
+  void OnNewBuffer(const scoped_refptr<DecoderBufferBase>& buffer,
+                   const ::media::AudioDecoderConfig& audio_config,
+                   const ::media::VideoDecoderConfig& video_config);
+  void RequestBufferIfNeeded();
+  void CompleteReadIfNeeded();
+
+  base::ThreadChecker thread_checker_;
+
+  // Frame provider the buffering frame provider fetches data from.
+  scoped_ptr<CodedFrameProvider> coded_frame_provider_;
+
+  // Indicate whether there is a pending read request on
+  // |coded_frame_provider_|.
+  bool is_pending_request_;
+
+  // Indicate whether the end of stream has been reached.
+  bool is_eos_;
+
+  std::list<BufferWithConfig> buffer_list_;
+
+  // Size in bytes of audio/video buffers in |buffer_list_|.
+  size_t total_buffer_size_;
+
+  // Max amount of data to buffer.
+  // i.e. this is the maximum size of buffers in |buffer_list_|.
+  const size_t max_buffer_size_;
+
+  // Maximum expected frame size.
+  const size_t max_frame_size_;
+
+  // Callback invoked each time there is a new frame buffered.
+  FrameBufferedCB frame_buffered_cb_;
+
+  // Pending read callback.
+  ReadCB read_cb_;
+
+  scoped_ptr<base::WeakPtrFactory<BufferingFrameProvider> > weak_factory_;

[gunsch, 2014/09/09 15:58:19]

It seems to be more typical to have a member base::WeakPtrFactory that is not a
pointer.

Ref:
https://code.google.com/p/chromium/codesearch#search/&q=base::weakptrfactory%...

[damienv1, 2014/09/09 16:24:17]

This one is a special case since I have to re-create a weak pointer in Flush.
Since there is no copy constructor, the weak pointer factory must be a pointer
in this case (Please let me know if you have an alternate solution without using
pointers).

+  base::WeakPtr<BufferingFrameProvider> weak_this_;
+
+  DISALLOW_COPY_AND_ASSIGN(BufferingFrameProvider);
+};
+
+}  // namespace media
+}  // namespace chromecast
+
+#endif  // CHROMECAST_MEDIA_CMA_BASE_BUFFERING_FRAME_PROVIDER_H_