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

Side by Side Diff: content/renderer/media/renderer_gpu_video_accelerator_factories.cc

Issue 668633002: Duplicate VideoEncodeAccelerator::SupportedProfile in gpu_info.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month 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 | « content/common/gpu/media/gpu_video_encode_accelerator.cc ('k') | gpu/config/DEPS » ('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/media/renderer_gpu_video_accelerator_factories.h" 5 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h"
6 6
7 #include <GLES2/gl2.h> 7 #include <GLES2/gl2.h>
8 #include <GLES2/gl2ext.h> 8 #include <GLES2/gl2ext.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "content/child/child_thread.h" 11 #include "content/child/child_thread.h"
12 #include "content/common/gpu/client/context_provider_command_buffer.h" 12 #include "content/common/gpu/client/context_provider_command_buffer.h"
13 #include "content/common/gpu/client/gl_helper.h" 13 #include "content/common/gpu/client/gl_helper.h"
14 #include "content/common/gpu/client/gpu_channel_host.h" 14 #include "content/common/gpu/client/gpu_channel_host.h"
15 #include "content/common/gpu/client/gpu_video_encode_accelerator_host.h"
15 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 16 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
16 #include "content/renderer/render_thread_impl.h" 17 #include "content/renderer/render_thread_impl.h"
17 #include "gpu/command_buffer/client/gles2_implementation.h" 18 #include "gpu/command_buffer/client/gles2_implementation.h"
18 #include "media/video/video_decode_accelerator.h" 19 #include "media/video/video_decode_accelerator.h"
19 #include "media/video/video_encode_accelerator.h" 20 #include "media/video/video_encode_accelerator.h"
20 #include "third_party/skia/include/core/SkBitmap.h" 21 #include "third_party/skia/include/core/SkBitmap.h"
21 #include "third_party/skia/include/core/SkPixelRef.h" 22 #include "third_party/skia/include/core/SkPixelRef.h"
22 23
23 namespace content { 24 namespace content {
24 25
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 } 242 }
242 243
243 scoped_refptr<base::SingleThreadTaskRunner> 244 scoped_refptr<base::SingleThreadTaskRunner>
244 RendererGpuVideoAcceleratorFactories::GetTaskRunner() { 245 RendererGpuVideoAcceleratorFactories::GetTaskRunner() {
245 return task_runner_; 246 return task_runner_;
246 } 247 }
247 248
248 std::vector<media::VideoEncodeAccelerator::SupportedProfile> 249 std::vector<media::VideoEncodeAccelerator::SupportedProfile>
249 RendererGpuVideoAcceleratorFactories:: 250 RendererGpuVideoAcceleratorFactories::
250 GetVideoEncodeAcceleratorSupportedProfiles() { 251 GetVideoEncodeAcceleratorSupportedProfiles() {
251 return gpu_channel_host_->gpu_info() 252 return GpuVideoEncodeAcceleratorHost::ConvertGpuToMediaProfiles(
252 .video_encode_accelerator_supported_profiles; 253 gpu_channel_host_->gpu_info()
254 .video_encode_accelerator_supported_profiles);
253 } 255 }
254 256
255 } // namespace content 257 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/media/gpu_video_encode_accelerator.cc ('k') | gpu/config/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698