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

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

Issue 20632002: Add media::VideoEncodeAccelerator with WebRTC integration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn
Patch Set: 1ad5d4b8 piman@ comments. Created 7 years, 4 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
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/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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 #include "content/renderer/text_input_client_observer.h" 124 #include "content/renderer/text_input_client_observer.h"
125 #include "content/renderer/v8_value_converter_impl.h" 125 #include "content/renderer/v8_value_converter_impl.h"
126 #include "content/renderer/web_ui_extension.h" 126 #include "content/renderer/web_ui_extension.h"
127 #include "content/renderer/web_ui_extension_data.h" 127 #include "content/renderer/web_ui_extension_data.h"
128 #include "content/renderer/websharedworker_proxy.h" 128 #include "content/renderer/websharedworker_proxy.h"
129 #include "media/audio/audio_output_device.h" 129 #include "media/audio/audio_output_device.h"
130 #include "media/base/audio_renderer_mixer_input.h" 130 #include "media/base/audio_renderer_mixer_input.h"
131 #include "media/base/filter_collection.h" 131 #include "media/base/filter_collection.h"
132 #include "media/base/media_switches.h" 132 #include "media/base/media_switches.h"
133 #include "media/filters/audio_renderer_impl.h" 133 #include "media/filters/audio_renderer_impl.h"
134 #include "media/filters/gpu_video_decoder_factories.h" 134 #include "media/filters/gpu_video_accelerator_factories.h"
135 #include "net/base/data_url.h" 135 #include "net/base/data_url.h"
136 #include "net/base/escape.h" 136 #include "net/base/escape.h"
137 #include "net/base/net_errors.h" 137 #include "net/base/net_errors.h"
138 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 138 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
139 #include "net/http/http_util.h" 139 #include "net/http/http_util.h"
140 #include "third_party/WebKit/public/platform/WebCString.h" 140 #include "third_party/WebKit/public/platform/WebCString.h"
141 #include "third_party/WebKit/public/platform/WebDragData.h" 141 #include "third_party/WebKit/public/platform/WebDragData.h"
142 #include "third_party/WebKit/public/platform/WebFileSystemType.h" 142 #include "third_party/WebKit/public/platform/WebFileSystemType.h"
143 #include "third_party/WebKit/public/platform/WebHTTPBody.h" 143 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
144 #include "third_party/WebKit/public/platform/WebImage.h" 144 #include "third_party/WebKit/public/platform/WebImage.h"
(...skipping 2907 matching lines...) Expand 10 before | Expand all | Expand 10 after
3052 return web_media_player_android.release(); 3052 return web_media_player_android.release();
3053 #endif // defined(OS_ANDROID) 3053 #endif // defined(OS_ANDROID)
3054 3054
3055 scoped_refptr<media::AudioRendererSink> sink; 3055 scoped_refptr<media::AudioRendererSink> sink;
3056 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { 3056 if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
3057 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()-> 3057 sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()->
3058 CreateInput(routing_id_); 3058 CreateInput(routing_id_);
3059 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get(); 3059 DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get();
3060 } 3060 }
3061 3061
3062 scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories = 3062 scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories =
3063 RenderThreadImpl::current()->GetGpuFactories( 3063 RenderThreadImpl::current()->GetGpuFactories(
3064 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy()); 3064 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy());
3065 3065
3066 WebMediaPlayerParams params( 3066 WebMediaPlayerParams params(
3067 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), 3067 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
3068 base::Bind(&ContentRendererClient::DeferMediaLoad, 3068 base::Bind(&ContentRendererClient::DeferMediaLoad,
3069 base::Unretained(GetContentClient()->renderer()), 3069 base::Unretained(GetContentClient()->renderer()),
3070 static_cast<RenderView*>(this)), 3070 static_cast<RenderView*>(this)),
3071 sink, 3071 sink,
3072 gpu_factories, 3072 gpu_factories,
(...skipping 3468 matching lines...) Expand 10 before | Expand all | Expand 10 after
6541 WebURL url = icon_urls[i].iconURL(); 6541 WebURL url = icon_urls[i].iconURL();
6542 if (!url.isEmpty()) 6542 if (!url.isEmpty())
6543 urls.push_back(FaviconURL(url, 6543 urls.push_back(FaviconURL(url,
6544 ToFaviconType(icon_urls[i].iconType()))); 6544 ToFaviconType(icon_urls[i].iconType())));
6545 } 6545 }
6546 SendUpdateFaviconURL(urls); 6546 SendUpdateFaviconURL(urls);
6547 } 6547 }
6548 6548
6549 6549
6550 } // namespace content 6550 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698