Introduce AudioBufferMemoryPool to avoid thrashing on audio buffers.

media/base/audio_buffer.h

Index: media/base/audio_buffer.h
diff --git a/media/base/audio_buffer.h b/media/base/audio_buffer.h
index d03a02ed4fcfa1ea7ffd2bbae91e0c669a37cb2a..f7b3fe1963c5e1405eb1dd64da79f99d2d4663df 100644
--- a/media/base/audio_buffer.h
+++ b/media/base/audio_buffer.h
@@ -8,12 +8,15 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <list>
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/aligned_memory.h"
 #include "base/memory/ref_counted.h"
+#include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "media/base/channel_layout.h"
 #include "media/base/media_export.h"
@@ -28,6 +31,7 @@ class StructPtr;
 
 namespace media {
 class AudioBus;
+class AudioBufferMemoryPool;
 
 namespace mojom {
 class AudioBuffer;
@@ -48,22 +52,29 @@ class MEDIA_EXPORT AudioBuffer
   // interleaved data, only the first buffer is used. For planar data, the
   // number of buffers must be equal to |channel_count|. |frame_count| is the
   // number of frames in each buffer. |data| must not be null and |frame_count|
-  // must be >= 0.
-  static scoped_refptr<AudioBuffer> CopyFrom(SampleFormat sample_format,
-                                             ChannelLayout channel_layout,
-                                             int channel_count,
-                                             int sample_rate,
-                                             int frame_count,
-                                             const uint8_t* const* data,
-                                             const base::TimeDelta timestamp);
+  // must be >= 0. For optimal efficiency when many buffers are being created, a
+  // AudioBufferMemoryPool can be provided to avoid thrashing memory.
+  static scoped_refptr<AudioBuffer> CopyFrom(
+      SampleFormat sample_format,
+      ChannelLayout channel_layout,
+      int channel_count,
+      int sample_rate,
+      int frame_count,
+      const uint8_t* const* data,
+      const base::TimeDelta timestamp,
+      scoped_refptr<AudioBufferMemoryPool> pool = nullptr);
 
   // Create an AudioBuffer with |frame_count| frames. Buffer is allocated, but
-  // not initialized. Timestamp and duration are set to kNoTimestamp.
-  static scoped_refptr<AudioBuffer> CreateBuffer(SampleFormat sample_format,
-                                                 ChannelLayout channel_layout,
-                                                 int channel_count,
-                                                 int sample_rate,
-                                                 int frame_count);
+  // not initialized. Timestamp and duration are set to kNoTimestamp. For
+  // optimal efficiency when many buffers are being created, a
+  // AudioBufferMemoryPool can be provided to avoid thrashing memory.
+  static scoped_refptr<AudioBuffer> CreateBuffer(
+      SampleFormat sample_format,
+      ChannelLayout channel_layout,
+      int channel_count,
+      int sample_rate,
+      int frame_count,
+      scoped_refptr<AudioBufferMemoryPool> pool = nullptr);
 
   // Create an empty AudioBuffer with |frame_count| frames.
   static scoped_refptr<AudioBuffer> CreateEmptyBuffer(
@@ -157,7 +168,8 @@ class MEDIA_EXPORT AudioBuffer
               int frame_count,
               bool create_buffer,
               const uint8_t* const* data,
-              const base::TimeDelta timestamp);
+              const base::TimeDelta timestamp,
+              scoped_refptr<AudioBufferMemoryPool> pool);
 
   virtual ~AudioBuffer();
 
@@ -177,9 +189,37 @@ class MEDIA_EXPORT AudioBuffer
   // For planar data, points to each channels data.
   std::vector<uint8_t*> channel_data_;
 
+  // Allows recycling of memory data to avoid repeated allocations.
+  scoped_refptr<AudioBufferMemoryPool> pool_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(AudioBuffer);
 };
 
+// Basic memory pool for reusing AudioBuffer internal memory to avoid thrashing.

[xhwang, 2017/04/01 00:05:26]

Please add a comment that AudioBuffer created using this pool will hold a
ref-count to it.

[DaleCurtis, 2017/04/01 01:00:01]

Done.

+class MEDIA_EXPORT AudioBufferMemoryPool
+    : public base::RefCountedThreadSafe<AudioBufferMemoryPool> {
+ public:
+  AudioBufferMemoryPool();
+
+  size_t get_pool_size_for_testing() const { return entries_.size(); }
+
+ private:
+  friend class AudioBuffer;
+  friend class base::RefCountedThreadSafe<AudioBufferMemoryPool>;
+
+  ~AudioBufferMemoryPool();
+
+  using AudioMemory = std::unique_ptr<uint8_t, base::AlignedFreeDeleter>;
+  AudioMemory CreateBuffer(size_t size);
+  void ReturnBuffer(AudioMemory memory, size_t size);
+
+  base::Lock entry_lock_;
+  using MemoryEntry = std::pair<AudioMemory, size_t>;
+  std::list<MemoryEntry> entries_;
+
+  DISALLOW_COPY_AND_ASSIGN(AudioBufferMemoryPool);
+};
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_BUFFER_H_