Refactor WritableBuffer interface for more useful ptr management.

media/tools/wav_ola_test.cc

 // Copyright (c) 2009 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.
 
 // This application is a test for AudioRendererAlgorithmOLA. It reads in a
 // specified wav file (so far only 8, 16 and 32 bit are supported) and uses
 // ARAO to scale the playback by a specified rate. Then it outputs the result
 // to the specified location. Command line calls should be as follows:
 //
 //    wav_ola_test RATE INFILE OUTFILE
@@ skipping 31 matching lines @@
 // Dummy class to feed data to OLA algorithm. Necessary to create callback.
 class Dummy {
  public:
   Dummy(FILE* in, AudioRendererAlgorithmOLA* ola, size_t window_size)
       : input_(in),
         ola_(ola),
         window_size_(window_size) {
   }
 
   void ReadDataForAlg() {
-    scoped_refptr<DataBuffer> b(new DataBuffer());
-    uint8* buf = b->GetWritableData(window_size_);
+    scoped_refptr<DataBuffer> buffer(new DataBuffer(window_size_));
+    uint8* buf = buffer->GetWritableData();
     if (fread(buf, 1, window_size_, input_) > 0) {
-      ola_->EnqueueBuffer(b.get());
+      ola_->EnqueueBuffer(buffer.get());
     }
   }
 
  private:
   FILE* input_;
   AudioRendererAlgorithmOLA* ola_;
   size_t window_size_;
 
   DISALLOW_COPY_AND_ASSIGN(Dummy);
 };
@@ skipping 63 matching lines @@
             << "\n"
             << "Scaling audio by " << playback_rate << "x..." << std::endl;
 
   // Write the header back out again.
   if (fwrite(&wav, sizeof(wav), 1, output.get()) < 1) {
     LOG(ERROR) << "could not write WAV header";
     return 1;
   }
 
   // Create buffer to be filled by |ola|.
-  scoped_refptr<DataBuffer> buffer(new DataBuffer());
-  uint8* buf = buffer->GetWritableData(window_size);
+  scoped_refptr<DataBuffer> buffer(new DataBuffer(window_size));
+  const uint8* buf = buffer->GetData();
 
   // Keep track of bytes written to disk and bytes copied to |b|.
   size_t bytes_written = 0;
   size_t bytes;
   while ((bytes = ola.FillBuffer(buffer.get())) > 0) {
     if (fwrite(buf, 1, bytes, output.get()) != bytes) {
       LOG(ERROR) << "could not write data after " << bytes_written;
     } else {
       bytes_written += bytes;
     }
   }
 
   // Seek back to the beginning of our output file and update the header.
   wav.chunk_size = 36 + bytes_written;
   wav.subchunk1_size = 16;
   wav.subchunk2_size = bytes_written;
   fseek(output.get(), 0, SEEK_SET);
   if (fwrite(&wav, sizeof(wav), 1, output.get()) < 1) {
     LOG(ERROR) << "could not write wav header.";
     return 1;
   }
 
   return 0;
 }