Index: media/audio/sounds/wav_audio_handler.h |
diff --git a/media/audio/sounds/wav_audio_handler.h b/media/audio/sounds/wav_audio_handler.h |
index a2c3e02365002133fdd84bd01451ef0c421d4887..d2b813bc20b1513eddf5ab6a2e208fd5e310360a 100644 |
--- a/media/audio/sounds/wav_audio_handler.h |
+++ b/media/audio/sounds/wav_audio_handler.h |
@@ -6,6 +6,8 @@ |
#define MEDIA_AUDIO_SOUNDS_WAV_AUDIO_HANDLER_H_ |
#include "base/strings/string_piece.h" |
+#include "base/time/time.h" |
+#include "media/audio/audio_parameters.h" |
#include "media/base/media_export.h" |
namespace media { |
@@ -27,11 +29,10 @@ class MEDIA_EXPORT WavAudioHandler { |
// |bytes_written|. |bytes_written| should not be NULL. |
bool CopyTo(AudioBus* bus, size_t cursor, size_t* bytes_written) const; |
- int size() const { return data_.size(); } |
- uint16 num_channels() const { return num_channels_; } |
- uint32 sample_rate() const { return sample_rate_; } |
- uint32 byte_rate() const { return byte_rate_; } |
- uint16 bits_per_sample() const { return bits_per_sample_; } |
+ int GetByteRate() const; |
DaleCurtis
2013/12/18 21:20:21
Looks unused? Does this end up being different tha
ygorshenin1
2013/12/19 15:42:29
Done.
|
+ const AudioParameters& params() const { return params_; } |
+ const base::TimeDelta& duration() const { return duration_; } |
DaleCurtis
2013/12/18 21:20:21
TimeDelta can be passed by value efficiently, so n
ygorshenin1
2013/12/19 15:42:29
Fixed to return by value now.
|
+ const base::StringPiece& data() const { return data_; } |
DaleCurtis
2013/12/18 21:20:21
I don't think this should be exposed. I don't see
ygorshenin1
2013/12/19 15:42:29
It's used once in wav_audio_handler_unittest.cc, f
|
private: |
// Parses a chunk of wav format data. Returns the length of the chunk. |
@@ -46,12 +47,8 @@ class MEDIA_EXPORT WavAudioHandler { |
// Data part of the |wav_data_|. |
base::StringPiece data_; |
- uint16 num_channels_; |
- uint32 sample_rate_; |
- uint32 byte_rate_; |
- uint16 bits_per_sample_; |
- int bytes_per_sample_; |
- int bytes_per_frame_; |
+ base::TimeDelta duration_; |
+ AudioParameters params_; |
}; |
} // namespace media |