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

Side by Side Diff: content/common/gpu/media/vaapi_picture.cc

Issue 825163004: Add Vaapi support on Ozone/Freon (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Fix const issue Created 5 years, 12 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/common/gpu/media/vaapi_picture.h" 5 #include "content/common/gpu/media/vaapi_picture.h"
6 #include "content/common/gpu/media/vaapi_wrapper.h" 6 #include "content/common/gpu/media/vaapi_wrapper.h"
7 #include "ui/gl/gl_bindings.h" 7 #include "ui/gl/gl_bindings.h"
8 #include "ui/gl/gl_implementation.h" 8 #include "ui/gl/gl_implementation.h"
9 9
10 #if defined(USE_X11) 10 #if defined(USE_X11)
11 #include "content/common/gpu/media/vaapi_tfp_picture.h" 11 #include "content/common/gpu/media/vaapi_tfp_picture.h"
12 #elif defined(USE_OZONE)
13 #include "content/common/gpu/media/vaapi_drm_picture.h"
12 #endif 14 #endif
13 15
14 namespace content { 16 namespace content {
15 17
16 // static 18 // static
17 linked_ptr<VaapiPicture> VaapiPicture::CreatePicture( 19 linked_ptr<VaapiPicture> VaapiPicture::CreatePicture(
18 VaapiWrapper* vaapi_wrapper, 20 VaapiWrapper* vaapi_wrapper,
19 const base::Callback<bool(void)> make_context_current, 21 const base::Callback<bool(void)> make_context_current,
20 int32 picture_buffer_id, 22 int32 picture_buffer_id,
21 uint32 texture_id, 23 uint32 texture_id,
22 const gfx::Size& size) { 24 const gfx::Size& size) {
23 linked_ptr<VaapiPicture> picture; 25 linked_ptr<VaapiPicture> picture;
24 #if defined(USE_X11) 26 #if defined(USE_X11)
25 picture.reset(new VaapiTFPPicture(vaapi_wrapper, make_context_current, 27 picture.reset(new VaapiTFPPicture(vaapi_wrapper, make_context_current,
26 picture_buffer_id, texture_id, size)); 28 picture_buffer_id, texture_id, size));
29 #elif defined(USE_OZONE)
30 picture.reset(new VaapiDrmPicture(vaapi_wrapper, make_context_current,
31 picture_buffer_id, texture_id, size));
27 #endif // USE_X11 32 #endif // USE_X11
28 33
29 if (picture.get() && !picture->Initialize()) 34 if (picture.get() && !picture->Initialize())
30 picture.reset(); 35 picture.reset();
31 36
32 return picture; 37 return picture;
33 } 38 }
34 39
35 // static 40 // static
36 uint32 VaapiPicture::GetGLTextureTarget() { 41 uint32 VaapiPicture::GetGLTextureTarget() {
42 #if defined(USE_OZONE)
43 return GL_TEXTURE_EXTERNAL_OES;
44 #else
37 return GL_TEXTURE_2D; 45 return GL_TEXTURE_2D;
46 #endif
38 } 47 }
39 48
40 } // namespace content 49 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698