diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 18:54:17 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 18:54:17 +0000 |
| commit | b3e1bc055de885a92f7f148f9136bf1570581518 (patch) | |
| tree | f8369389ccc2ac3127ee4eb29340c99210a7deb8 /media/audio | |
| parent | 9ce7cb4c378d6ac673abfd8c136960424f8308bb (diff) | |
| download | chromium_src-b3e1bc055de885a92f7f148f9136bf1570581518.zip chromium_src-b3e1bc055de885a92f7f148f9136bf1570581518.tar.gz chromium_src-b3e1bc055de885a92f7f148f9136bf1570581518.tar.bz2 | |
Replace media::Limits struct with media::limits namespace and update documentation.
Review URL: http://codereview.chromium.org/8786013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
| -rw-r--r-- | media/audio/audio_parameters.cc | 8 | ||||
| -rw-r--r-- | media/audio/win/audio_output_win_unittest.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/media/audio/audio_parameters.cc b/media/audio/audio_parameters.cc index 45c98d9..4395481 100644 --- a/media/audio/audio_parameters.cc +++ b/media/audio/audio_parameters.cc @@ -28,12 +28,12 @@ AudioParameters::AudioParameters(Format format, ChannelLayout channel_layout, bool AudioParameters::IsValid() const { return (format >= 0) && (format < AUDIO_LAST_FORMAT) && - (channels > 0) && (channels <= media::Limits::kMaxChannels) && - (sample_rate > 0) && (sample_rate <= media::Limits::kMaxSampleRate) && + (channels > 0) && (channels <= media::limits::kMaxChannels) && + (sample_rate > 0) && (sample_rate <= media::limits::kMaxSampleRate) && (bits_per_sample > 0) && - (bits_per_sample <= media::Limits::kMaxBitsPerSample) && + (bits_per_sample <= media::limits::kMaxBitsPerSample) && (samples_per_packet > 0) && - (samples_per_packet <= media::Limits::kMaxSamplesPerPacket); + (samples_per_packet <= media::limits::kMaxSamplesPerPacket); } int AudioParameters::GetPacketSize() const { diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc index bc01e73..71c0d0c 100644 --- a/media/audio/win/audio_output_win_unittest.cc +++ b/media/audio/win/audio_output_win_unittest.cc @@ -262,7 +262,7 @@ TEST(WinAudioTest, SanityOnMakeParams) { AudioParameters(fmt, CHANNEL_LAYOUT_MONO, 8000, 16, 0))); EXPECT_TRUE(NULL == audio_man->MakeAudioOutputStream( AudioParameters(fmt, CHANNEL_LAYOUT_MONO, 8000, 16, - media::Limits::kMaxSamplesPerPacket + 1))); + media::limits::kMaxSamplesPerPacket + 1))); } // Test that it can be opened and closed. |