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

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

Issue 1784173005: Request a GpuVideoAcceleratorFactories when constructing decoders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update test_mojo_media_client.cc Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/blink/webmediaplayer_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2505 matching lines...) Expand 10 before | Expand all | Expand 10 after
2516 #if defined(ENABLE_MOJO_RENDERER) 2516 #if defined(ENABLE_MOJO_RENDERER)
2517 scoped_ptr<media::RendererFactory> media_renderer_factory( 2517 scoped_ptr<media::RendererFactory> media_renderer_factory(
2518 new media::MojoRendererFactory(GetMediaInterfaceProvider())); 2518 new media::MojoRendererFactory(GetMediaInterfaceProvider()));
2519 #else 2519 #else
2520 scoped_ptr<media::RendererFactory> media_renderer_factory = 2520 scoped_ptr<media::RendererFactory> media_renderer_factory =
2521 GetContentClient()->renderer()->CreateMediaRendererFactory( 2521 GetContentClient()->renderer()->CreateMediaRendererFactory(
2522 this, render_thread->GetGpuFactories(), media_log); 2522 this, render_thread->GetGpuFactories(), media_log);
2523 2523
2524 if (!media_renderer_factory.get()) { 2524 if (!media_renderer_factory.get()) {
2525 media_renderer_factory.reset(new media::DefaultRendererFactory( 2525 media_renderer_factory.reset(new media::DefaultRendererFactory(
2526 media_log, GetDecoderFactory(), render_thread->GetGpuFactories(), 2526 media_log, GetDecoderFactory(),
2527 base::Bind(&RenderThreadImpl::GetGpuFactories,
2528 base::Unretained(render_thread)),
2527 *render_thread->GetAudioHardwareConfig())); 2529 *render_thread->GetAudioHardwareConfig()));
2528 } 2530 }
2529 #endif // defined(ENABLE_MOJO_RENDERER) 2531 #endif // defined(ENABLE_MOJO_RENDERER)
2530 2532
2531 if (!url_index_.get() || url_index_->frame() != frame_) 2533 if (!url_index_.get() || url_index_->frame() != frame_)
2532 url_index_.reset(new media::UrlIndex(frame_)); 2534 url_index_.reset(new media::UrlIndex(frame_));
2533 2535
2534 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( 2536 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
2535 frame_, client, encrypted_client, 2537 frame_, client, encrypted_client,
2536 GetWebMediaPlayerDelegate()->AsWeakPtr(), 2538 GetWebMediaPlayerDelegate()->AsWeakPtr(),
(...skipping 3593 matching lines...) Expand 10 before | Expand all | Expand 10 after
6130 int match_count, 6132 int match_count,
6131 int ordinal, 6133 int ordinal,
6132 const WebRect& selection_rect, 6134 const WebRect& selection_rect,
6133 bool final_status_update) { 6135 bool final_status_update) {
6134 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6136 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6135 selection_rect, ordinal, 6137 selection_rect, ordinal,
6136 final_status_update)); 6138 final_status_update));
6137 } 6139 }
6138 6140
6139 } // namespace content 6141 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/blink/webmediaplayer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698