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

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

Issue 2656183002: Change effect of flag kDisableAcceleratedVideoDecode to only affect decode
Patch Set: Created 3 years, 10 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_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 1367 matching lines...) Expand 10 before | Expand all | Expand 10 after
1378 scoped_refptr<ui::ContextProviderCommandBuffer> media_context_provider = 1378 scoped_refptr<ui::ContextProviderCommandBuffer> media_context_provider =
1379 CreateOffscreenContext(gpu_channel_host, limits, support_locking, 1379 CreateOffscreenContext(gpu_channel_host, limits, support_locking,
1380 ui::command_buffer_metrics::RENDER_WORKER_CONTEXT, 1380 ui::command_buffer_metrics::RENDER_WORKER_CONTEXT,
1381 gpu::GPU_STREAM_DEFAULT, 1381 gpu::GPU_STREAM_DEFAULT,
1382 gpu::GpuStreamPriority::NORMAL); 1382 gpu::GpuStreamPriority::NORMAL);
1383 if (!media_context_provider->BindToCurrentThread()) 1383 if (!media_context_provider->BindToCurrentThread())
1384 return nullptr; 1384 return nullptr;
1385 1385
1386 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner = 1386 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner =
1387 GetMediaThreadTaskRunner(); 1387 GetMediaThreadTaskRunner();
1388 const bool enable_video_accelerator = 1388 const bool enable_video_decode_accelerator =
1389 !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); 1389 !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
1390 const bool enable_gpu_memory_buffer_video_frames = 1390 const bool enable_gpu_memory_buffer_video_frames =
1391 #if defined(OS_MACOSX) || defined(OS_LINUX) 1391 #if defined(OS_MACOSX) || defined(OS_LINUX)
1392 !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && 1392 !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) &&
1393 !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && 1393 !cmd_line->HasSwitch(switches::kDisableGpuCompositing) &&
1394 !gpu_channel_host->gpu_info().software_rendering; 1394 !gpu_channel_host->gpu_info().software_rendering;
1395 #else 1395 #else
1396 cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); 1396 cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
1397 #endif 1397 #endif
1398 1398
1399 gpu_factories_.push_back(RendererGpuVideoAcceleratorFactories::Create( 1399 gpu_factories_.push_back(RendererGpuVideoAcceleratorFactories::Create(
1400 std::move(gpu_channel_host), base::ThreadTaskRunnerHandle::Get(), 1400 std::move(gpu_channel_host), base::ThreadTaskRunnerHandle::Get(),
1401 media_task_runner, std::move(media_context_provider), 1401 media_task_runner, std::move(media_context_provider),
1402 enable_gpu_memory_buffer_video_frames, buffer_to_texture_target_map_, 1402 enable_gpu_memory_buffer_video_frames, buffer_to_texture_target_map_,
1403 enable_video_accelerator)); 1403 enable_video_decode_accelerator));
1404 return gpu_factories_.back(); 1404 return gpu_factories_.back();
1405 } 1405 }
1406 1406
1407 scoped_refptr<ui::ContextProviderCommandBuffer> 1407 scoped_refptr<ui::ContextProviderCommandBuffer>
1408 RenderThreadImpl::SharedMainThreadContextProvider() { 1408 RenderThreadImpl::SharedMainThreadContextProvider() {
1409 DCHECK(IsMainThread()); 1409 DCHECK(IsMainThread());
1410 if (shared_main_thread_contexts_ && 1410 if (shared_main_thread_contexts_ &&
1411 shared_main_thread_contexts_->ContextGL()->GetGraphicsResetStatusKHR() == 1411 shared_main_thread_contexts_->ContextGL()->GetGraphicsResetStatusKHR() ==
1412 GL_NO_ERROR) 1412 GL_NO_ERROR)
1413 return shared_main_thread_contexts_; 1413 return shared_main_thread_contexts_;
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
2438 } 2438 }
2439 } 2439 }
2440 2440
2441 void RenderThreadImpl::OnRendererInterfaceRequest( 2441 void RenderThreadImpl::OnRendererInterfaceRequest(
2442 mojom::RendererAssociatedRequest request) { 2442 mojom::RendererAssociatedRequest request) {
2443 DCHECK(!renderer_binding_.is_bound()); 2443 DCHECK(!renderer_binding_.is_bound());
2444 renderer_binding_.Bind(std::move(request)); 2444 renderer_binding_.Bind(std::move(request));
2445 } 2445 }
2446 2446
2447 } // namespace content 2447 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc/peer_connection_dependency_factory.cc ('k') | media/renderers/gpu_video_accelerator_factories.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698