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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 8980008: Integrate HTMLMediaElement with Web Audio API's MediaElementAudioSourceNode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "content/renderer/java/java_bridge_dispatcher.h" 58 #include "content/renderer/java/java_bridge_dispatcher.h"
59 #include "content/renderer/load_progress_tracker.h" 59 #include "content/renderer/load_progress_tracker.h"
60 #include "content/renderer/media/audio_message_filter.h" 60 #include "content/renderer/media/audio_message_filter.h"
61 #include "content/renderer/media/audio_renderer_impl.h" 61 #include "content/renderer/media/audio_renderer_impl.h"
62 #include "content/renderer/media/media_stream_impl.h" 62 #include "content/renderer/media/media_stream_impl.h"
63 #include "content/renderer/media/render_media_log.h" 63 #include "content/renderer/media/render_media_log.h"
64 #include "content/renderer/mhtml_generator.h" 64 #include "content/renderer/mhtml_generator.h"
65 #include "content/renderer/notification_provider.h" 65 #include "content/renderer/notification_provider.h"
66 #include "content/renderer/p2p/socket_dispatcher.h" 66 #include "content/renderer/p2p/socket_dispatcher.h"
67 #include "content/renderer/plugin_channel_host.h" 67 #include "content/renderer/plugin_channel_host.h"
68 #include "content/renderer/render_audiosourceprovider.h"
68 #include "content/renderer/render_process.h" 69 #include "content/renderer/render_process.h"
69 #include "content/renderer/render_thread_impl.h" 70 #include "content/renderer/render_thread_impl.h"
70 #include "content/renderer/render_widget_fullscreen_pepper.h" 71 #include "content/renderer/render_widget_fullscreen_pepper.h"
71 #include "content/renderer/renderer_accessibility.h" 72 #include "content/renderer/renderer_accessibility.h"
72 #include "content/renderer/renderer_gpu_video_decoder_factories.h" 73 #include "content/renderer/renderer_gpu_video_decoder_factories.h"
73 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 74 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
74 #include "content/renderer/renderer_webstoragenamespace_impl.h" 75 #include "content/renderer/renderer_webstoragenamespace_impl.h"
75 #include "content/renderer/speech_input_dispatcher.h" 76 #include "content/renderer/speech_input_dispatcher.h"
76 #include "content/renderer/text_input_client_observer.h" 77 #include "content/renderer/text_input_client_observer.h"
77 #include "content/renderer/v8_value_converter_impl.h" 78 #include "content/renderer/v8_value_converter_impl.h"
(...skipping 1846 matching lines...) Expand 10 before | Expand all | Expand 10 after
1924 WebMediaPlayer* RenderViewImpl::createMediaPlayer( 1925 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
1925 WebFrame* frame, WebMediaPlayerClient* client) { 1926 WebFrame* frame, WebMediaPlayerClient* client) {
1926 FOR_EACH_OBSERVER( 1927 FOR_EACH_OBSERVER(
1927 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); 1928 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
1928 1929
1929 media::MessageLoopFactory* message_loop_factory = 1930 media::MessageLoopFactory* message_loop_factory =
1930 new media::MessageLoopFactoryImpl(); 1931 new media::MessageLoopFactoryImpl();
1931 media::FilterCollection* collection = new media::FilterCollection(); 1932 media::FilterCollection* collection = new media::FilterCollection();
1932 RenderMediaLog* render_media_log = new RenderMediaLog(); 1933 RenderMediaLog* render_media_log = new RenderMediaLog();
1933 1934
1935 RenderAudioSourceProvider* audio_source_provider = NULL;
1936
1934 // Add in any custom filter factories first. 1937 // Add in any custom filter factories first.
1935 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 1938 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
1936 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { 1939 if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
1937 // Add the chrome specific audio renderer. 1940 // audio_source_provider is a "provider" to WebKit, and a sink
1938 collection->AddAudioRenderer(new AudioRendererImpl()); 1941 // from the perspective of the audio renderer.
1942 audio_source_provider = new RenderAudioSourceProvider();
1943
1944 // Add the chrome specific audio renderer, using audio_source_provider
1945 // as the sink.
1946 AudioRendererImpl* audio_renderer =
1947 new AudioRendererImpl(audio_source_provider);
1948 collection->AddAudioRenderer(audio_renderer);
1939 } 1949 }
1940 1950
1941 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) 1951 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
1942 // Currently only cros/arm has any HW video decode support in 1952 // Currently only cros/arm has any HW video decode support in
1943 // GpuVideoDecodeAccelerator so we don't even try to use it on other 1953 // GpuVideoDecodeAccelerator so we don't even try to use it on other
1944 // platforms. This is a startup-time optimization. When new VDA 1954 // platforms. This is a startup-time optimization. When new VDA
1945 // implementations are added, relax the #if above. 1955 // implementations are added, relax the #if above.
1946 WebKit::WebGraphicsContext3D* wk_context3d = webview()->graphicsContext3D(); 1956 WebKit::WebGraphicsContext3D* wk_context3d = webview()->graphicsContext3D();
1947 if (wk_context3d) { 1957 if (wk_context3d) {
1948 WebGraphicsContext3DCommandBufferImpl* context3d = 1958 WebGraphicsContext3DCommandBufferImpl* context3d =
1949 static_cast<WebGraphicsContext3DCommandBufferImpl*>(wk_context3d); 1959 static_cast<WebGraphicsContext3DCommandBufferImpl*>(wk_context3d);
1950 GpuChannelHost* gpu_channel_host = 1960 GpuChannelHost* gpu_channel_host =
1951 RenderThreadImpl::current()->EstablishGpuChannelSync( 1961 RenderThreadImpl::current()->EstablishGpuChannelSync(
1952 content::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); 1962 content::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
1953 collection->AddVideoDecoder(new media::GpuVideoDecoder( 1963 collection->AddVideoDecoder(new media::GpuVideoDecoder(
1954 MessageLoop::current(), 1964 MessageLoop::current(),
1955 new RendererGpuVideoDecoderFactories( 1965 new RendererGpuVideoDecoderFactories(
1956 gpu_channel_host, context3d->context()->AsWeakPtr()))); 1966 gpu_channel_host, context3d->context()->AsWeakPtr())));
1957 } 1967 }
1958 #endif 1968 #endif
1959 1969
1960 webkit_media::WebMediaPlayerImpl* result_ptr; 1970 webkit_media::WebMediaPlayerImpl* result_ptr;
1961 if (!content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( 1971 if (!content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
1962 this, client, AsWeakPtr(), collection, message_loop_factory, 1972 this, client, AsWeakPtr(), collection, audio_source_provider,
1963 media_stream_impl_.get(), render_media_log, &result_ptr)) { 1973 message_loop_factory, media_stream_impl_.get(), render_media_log,
1974 &result_ptr)) {
1964 result_ptr = new webkit_media::WebMediaPlayerImpl( 1975 result_ptr = new webkit_media::WebMediaPlayerImpl(
1965 client, AsWeakPtr(), collection, message_loop_factory, 1976 client, AsWeakPtr(), collection, audio_source_provider,
1966 media_stream_impl_.get(), render_media_log); 1977 message_loop_factory, media_stream_impl_.get(), render_media_log);
1967 } 1978 }
1968 1979
1969 DCHECK(result_ptr); 1980 DCHECK(result_ptr);
1970 scoped_ptr<webkit_media::WebMediaPlayerImpl> result; 1981 scoped_ptr<webkit_media::WebMediaPlayerImpl> result;
1971 result.reset(result_ptr); 1982 result.reset(result_ptr);
1972 1983
1973 if (!result->Initialize(frame, 1984 if (!result->Initialize(frame,
1974 cmd_line->HasSwitch(switches::kSimpleDataSource))) { 1985 cmd_line->HasSwitch(switches::kSimpleDataSource))) {
1975 return NULL; 1986 return NULL;
1976 } 1987 }
(...skipping 2826 matching lines...) Expand 10 before | Expand all | Expand 10 after
4803 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 4814 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
4804 return !!RenderThreadImpl::current()->compositor_thread(); 4815 return !!RenderThreadImpl::current()->compositor_thread();
4805 } 4816 }
4806 4817
4807 void RenderViewImpl::OnJavaBridgeInit() { 4818 void RenderViewImpl::OnJavaBridgeInit() {
4808 DCHECK(!java_bridge_dispatcher_.get()); 4819 DCHECK(!java_bridge_dispatcher_.get());
4809 #if defined(ENABLE_JAVA_BRIDGE) 4820 #if defined(ENABLE_JAVA_BRIDGE)
4810 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 4821 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
4811 #endif 4822 #endif
4812 } 4823 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698