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

Side by Side Diff: content/renderer/renderer_webkitplatformsupport_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, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/platform_file.h" 10 #include "base/platform_file.h"
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 case 7: 651 case 7:
652 layout = CHANNEL_LAYOUT_7_0; 652 layout = CHANNEL_LAYOUT_7_0;
653 break; 653 break;
654 case 8: 654 case 8:
655 layout = CHANNEL_LAYOUT_7_1; 655 layout = CHANNEL_LAYOUT_7_1;
656 break; 656 break;
657 default: 657 default:
658 layout = CHANNEL_LAYOUT_STEREO; 658 layout = CHANNEL_LAYOUT_STEREO;
659 } 659 }
660 660
661 media::AudioParameters params( 661 AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY,
662 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, layout, 662 layout,
663 static_cast<int>(sampleRate), 16, bufferSize); 663 static_cast<int>(sampleRate),
664 16,
665 bufferSize);
664 666
665 return new RendererWebAudioDeviceImpl(params, callback); 667 return new RendererWebAudioDeviceImpl(params, callback);
666 } 668 }
667 669
668 //------------------------------------------------------------------------------ 670 //------------------------------------------------------------------------------
669 671
670 WebKit::WebString 672 WebKit::WebString
671 RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString( 673 RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
672 unsigned key_size_index, 674 unsigned key_size_index,
673 const WebKit::WebString& challenge, 675 const WebKit::WebString& challenge,
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 DCHECK(render_thread); 737 DCHECK(render_thread);
736 if (!render_thread) 738 if (!render_thread)
737 return NULL; 739 return NULL;
738 return render_thread->CreateMediaStreamCenter(client); 740 return render_thread->CreateMediaStreamCenter(client);
739 } 741 }
740 742
741 GpuChannelHostFactory* 743 GpuChannelHostFactory*
742 RendererWebKitPlatformSupportImpl::GetGpuChannelHostFactory() { 744 RendererWebKitPlatformSupportImpl::GetGpuChannelHostFactory() {
743 return RenderThreadImpl::current(); 745 return RenderThreadImpl::current();
744 } 746 }
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_platform_audio_output_impl.cc ('k') | content/test/webrtc_audio_device_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698