Speech refactoring: Turned AudioChunk into a refcounted class (CL1.4)

content/browser/speech/audio_buffer.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.
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "content/browser/speech/audio_buffer.h"
 
 namespace speech {
 
@@ skipping 34 matching lines @@
   DCHECK(bytes_per_sample == 1 ||
          bytes_per_sample == 2 ||
          bytes_per_sample == 4);
 }
 
 AudioBuffer::~AudioBuffer() {
   Clear();
 }
 
 void AudioBuffer::Enqueue(const uint8* data, size_t length) {
-  AudioChunk* chunk = new AudioChunk(data, length, bytes_per_sample_);
+  scoped_refptr<AudioChunk> chunk(
+      new AudioChunk(data, length, bytes_per_sample_));
   chunks_.push_back(chunk);

[hans, 2012/03/27 15:56:31]

could we just do this on a single line?

chunks_.push_back(new AudioChunk(data, length, bytes_per_sample_));

[Primiano Tucci (use gerrit), 2012/03/27 16:51:24]

Uh, right. It was a remainder of the old code :)

 }
 
-scoped_ptr<AudioChunk> AudioBuffer::DequeueSingleChunk() {
+scoped_refptr<AudioChunk> AudioBuffer::DequeueSingleChunk() {
   DCHECK(!chunks_.empty());
-  AudioChunk* chunk = *chunks_.begin();
-  chunks_.weak_erase(chunks_.begin());
-  return scoped_ptr<AudioChunk>(chunk);
+  scoped_refptr<AudioChunk> chunk(chunks_.front());
+  chunks_.pop_front();
+  return chunk;
 }
 
-scoped_ptr<AudioChunk> AudioBuffer::DequeueAll() {
-  AudioChunk* chunk = new AudioChunk(bytes_per_sample_);
+scoped_refptr<AudioChunk> AudioBuffer::DequeueAll() {
+  scoped_refptr<AudioChunk> chunk(new AudioChunk(bytes_per_sample_));
   size_t resulting_length = 0;
-  ChunksContainer::const_iterator it;
+  ChunksContainer::iterator it;

[hans, 2012/03/27 15:56:31]

hmm, why isn't it a const_iterator anymore?

[Primiano Tucci (use gerrit), 2012/03/27 16:51:24]

Ah right. I tried to use a std::queue at beginning, and then forgot to revert
the iterator to const_.

   // In order to improve performance, calulate in advance the total length
   // and then copy the chunks.
   for (it = chunks_.begin(); it != chunks_.end(); ++it) {
     resulting_length += (*it)->data_string_.length();
   }
   chunk->data_string_.reserve(resulting_length);
   for (it = chunks_.begin(); it != chunks_.end(); ++it) {
     chunk->data_string_.append((*it)->data_string_);
   }
   Clear();
-  return scoped_ptr<AudioChunk>(chunk);
+  return chunk;
 }
 
 void AudioBuffer::Clear() {
-  chunks_.erase(chunks_.begin(), chunks_.end());
+  chunks_.clear();
 }
 
 bool AudioBuffer::IsEmpty() const {
   return chunks_.empty();
 }
 
 }  // namespace speech