Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Side by Side Diff: media/audio/sounds/wav_audio_handler.h

Issue 1453233002: Improve input handling for WaveAudioHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Correct typo Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_ 5 #ifndef MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_
6 #define MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_ 6 #define MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_
7 7
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 class AudioBus; 14 class AudioBus;
15 15
16 // This class provides the input from wav file format. See 16 // This class provides the input from wav file format. See
17 // https://ccrma.stanford.edu/courses/422/projects/WaveFormat/ 17 // https://ccrma.stanford.edu/courses/422/projects/WaveFormat/
18 class MEDIA_EXPORT WavAudioHandler { 18 class MEDIA_EXPORT WavAudioHandler {
19 public: 19 public:
20 // Parses |wav_data| for use by this class. If wav_data parses successfully,
21 // is_valid() will return true. Otherwise, is_valid() will return false.
20 explicit WavAudioHandler(const base::StringPiece& wav_data); 22 explicit WavAudioHandler(const base::StringPiece& wav_data);
21 virtual ~WavAudioHandler(); 23 virtual ~WavAudioHandler();
22 24
23 // Returns true when cursor points to the end of the track. 25 // If the data is not valid, returns true for any value of cursor.
26 // Otherwise, returns true when cursor points to the end of the track.
24 bool AtEnd(size_t cursor) const; 27 bool AtEnd(size_t cursor) const;
25 28
26 // Copies the audio data to |bus| starting from the |cursor| and in 29 // Copies the audio data to |bus| starting from the |cursor| and in
27 // the case of success stores the number of written bytes in 30 // the case of success stores the number of written bytes in
28 // |bytes_written|. |bytes_written| should not be NULL. 31 // |bytes_written|. |bytes_written| should not be NULL. Returns false if
32 // data is not valid, or if the operation was unssuccessful. Returns true
33 // otherwise.
29 bool CopyTo(AudioBus* bus, size_t cursor, size_t* bytes_written) const; 34 bool CopyTo(AudioBus* bus, size_t cursor, size_t* bytes_written) const;
30 35
31 // Accessors. 36 // Accessors.
37 bool is_valid() const { return is_valid_; }
32 const base::StringPiece& data() const { return data_; } 38 const base::StringPiece& data() const { return data_; }
33 uint16_t num_channels() const { return num_channels_; } 39 uint16_t num_channels() const { return num_channels_; }
34 uint32_t sample_rate() const { return sample_rate_; } 40 uint32_t sample_rate() const { return sample_rate_; }
35 uint16_t bits_per_sample() const { return bits_per_sample_; } 41 uint16_t bits_per_sample() const { return bits_per_sample_; }
36 uint32_t total_frames() const { return total_frames_; } 42 uint32_t total_frames() const { return total_frames_; }
37 43
38 // Returns the duration of the entire audio chunk. 44 // If the data is not valid(), returns zero duration. Otherwise, returns the
45 // duration of the entire audio chunk.
39 base::TimeDelta GetDuration() const; 46 base::TimeDelta GetDuration() const;
40 47
41 private: 48 private:
42 // Parses a chunk of wav format data. Returns the length of the chunk. 49 // Parses a chunk of wav format data. Returns the length of the chunk.
43 int ParseSubChunk(const base::StringPiece& data); 50 int ParseSubChunk(const base::StringPiece& data);
44 51
45 // Parses the 'fmt' section chunk and stores |params_|. 52 // Parses the 'fmt' section chunk and stores |params_|.
46 bool ParseFmtChunk(const base::StringPiece& data); 53 bool ParseFmtChunk(const base::StringPiece& data);
47 54
48 // Parses the 'data' section chunk and stores |data_|. 55 // Parses the 'data' section chunk and stores |data_|.
49 bool ParseDataChunk(const base::StringPiece& data); 56 bool ParseDataChunk(const base::StringPiece& data);
50 57
58 // Reset all data members to intial values.
59 void ResetAll();
60
51 // Data part of the |wav_data_|. 61 // Data part of the |wav_data_|.
52 base::StringPiece data_; 62 base::StringPiece data_;
53 63 bool is_valid_;
54 uint16_t num_channels_; 64 uint16_t num_channels_;
55 uint32_t sample_rate_; 65 uint32_t sample_rate_;
56 uint16_t bits_per_sample_; 66 uint16_t bits_per_sample_;
57 uint32_t total_frames_; 67 uint32_t total_frames_;
58 }; 68 };
59 69
60 } // namespace media 70 } // namespace media
61 71
62 #endif // MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_ 72 #endif // MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698