Improve input handling for WaveAudioHandler.

media/audio/sounds/wav_audio_handler.h

 // Copyright 2013 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 MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_
 #define MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_
 
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 class AudioBus;
 
 // This class provides the input from wav file format.  See
 // https://ccrma.stanford.edu/courses/422/projects/WaveFormat/
 class MEDIA_EXPORT WavAudioHandler {
  public:
-  explicit WavAudioHandler(const base::StringPiece& wav_data);
+  static scoped_ptr<WavAudioHandler> Create(const base::StringPiece& wav_data);

[wzhong, 2015/11/18 22:21:35]

static methods should be after dtor.

[slan, 2015/11/19 00:19:44]

Done.

   virtual ~WavAudioHandler();
 
   // Returns true when cursor points to the end of the track.
   bool AtEnd(size_t cursor) const;
 
   // Copies the audio data to |bus| starting from the |cursor| and in
   // the case of success stores the number of written bytes in
-  // |bytes_written|. |bytes_written| should not be NULL.
+  // |bytes_written|. |bytes_written| should not be NULL. Returns false if the
+  // operation was unsuccessful. Returns true otherwise.
   bool CopyTo(AudioBus* bus, size_t cursor, size_t* bytes_written) const;
 
   // Accessors.
   const base::StringPiece& data() const { return data_; }
   uint16_t num_channels() const { return num_channels_; }
   uint32_t sample_rate() const { return sample_rate_; }
   uint16_t bits_per_sample() const { return bits_per_sample_; }
   uint32_t total_frames() const { return total_frames_; }
 
   // Returns the duration of the entire audio chunk.
   base::TimeDelta GetDuration() const;
 
  private:
-  // Parses a chunk of wav format data. Returns the length of the chunk.
-  int ParseSubChunk(const base::StringPiece& data);
-
-  // Parses the 'fmt' section chunk and stores |params_|.
-  bool ParseFmtChunk(const base::StringPiece& data);
-
-  // Parses the 'data' section chunk and stores |data_|.
-  bool ParseDataChunk(const base::StringPiece& data);
+  explicit WavAudioHandler(const base::StringPiece& audio_data,

[wzhong, 2015/11/18 22:21:35]

explicit not needed.

[slan, 2015/11/19 00:19:44]

Whoops, leftover. Done.

+                           uint16_t num_channels,
+                           uint32_t sample_rate,
+                           uint16_t bits_per_sample);
 
   // Data part of the |wav_data_|.
-  base::StringPiece data_;
+  const base::StringPiece data_;
+  const uint16_t num_channels_;
+  const uint32_t sample_rate_;
+  const uint16_t bits_per_sample_;
+  uint32_t total_frames_;
 
-  uint16_t num_channels_;
-  uint32_t sample_rate_;
-  uint16_t bits_per_sample_;
-  uint32_t total_frames_;
+  DISALLOW_COPY_AND_ASSIGN(WavAudioHandler);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_