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

Unified Diff: content/renderer/pepper/pepper_platform_audio_output_impl.cc

Issue 9965076: Revert 130180 - Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/pepper_platform_audio_output_impl.cc
===================================================================
--- content/renderer/pepper/pepper_platform_audio_output_impl.cc (revision 130181)
+++ content/renderer/pepper/pepper_platform_audio_output_impl.cc (working copy)
@@ -83,20 +83,20 @@
client_ = client;
- media::AudioParameters::Format format;
+ AudioParameters::Format format;
const int kMaxFramesForLowLatency = 2048;
// Use the low latency back end if the client request is compatible, and
// the sample count is low enough to justify using AUDIO_PCM_LOW_LATENCY.
if (sample_rate == audio_hardware::GetOutputSampleRate() &&
frames_per_buffer <= kMaxFramesForLowLatency &&
frames_per_buffer % audio_hardware::GetOutputBufferSize() == 0) {
- format = media::AudioParameters::AUDIO_PCM_LOW_LATENCY;
+ format = AudioParameters::AUDIO_PCM_LOW_LATENCY;
} else {
- format = media::AudioParameters::AUDIO_PCM_LINEAR;
+ format = AudioParameters::AUDIO_PCM_LINEAR;
}
- media::AudioParameters params(format, CHANNEL_LAYOUT_STEREO, sample_rate, 16,
- frames_per_buffer);
+ AudioParameters params(format, CHANNEL_LAYOUT_STEREO, sample_rate,
+ 16, frames_per_buffer);
ChildProcess::current()->io_message_loop()->PostTask(
FROM_HERE,
@@ -106,7 +106,7 @@
}
void PepperPlatformAudioOutputImpl::InitializeOnIOThread(
- const media::AudioParameters& params) {
+ const AudioParameters& params) {
stream_id_ = filter_->AddDelegate(this);
filter_->Send(new AudioHostMsg_CreateStream(stream_id_, params));
}
« no previous file with comments | « content/renderer/pepper/pepper_platform_audio_output_impl.h ('k') | content/renderer/renderer_webkitplatformsupport_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698