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

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

Issue 1432963003: [Ozone] Extends the lifetime of VaapiWrapper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/vaapi_picture.h ('k') | content/common/gpu/media/vaapi_tfp_picture.h » ('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 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) 12 #elif defined(USE_OZONE)
13 #include "content/common/gpu/media/vaapi_drm_picture.h" 13 #include "content/common/gpu/media/vaapi_drm_picture.h"
14 #endif 14 #endif
15 15
16 namespace content { 16 namespace content {
17 17
18 // static 18 // static
19 linked_ptr<VaapiPicture> VaapiPicture::CreatePicture( 19 linked_ptr<VaapiPicture> VaapiPicture::CreatePicture(
20 VaapiWrapper* vaapi_wrapper, 20 const scoped_refptr<VaapiWrapper>& vaapi_wrapper,
21 const base::Callback<bool(void)> make_context_current, 21 const base::Callback<bool(void)> make_context_current,
22 int32 picture_buffer_id, 22 int32 picture_buffer_id,
23 uint32 texture_id, 23 uint32 texture_id,
24 const gfx::Size& size) { 24 const gfx::Size& size) {
25 linked_ptr<VaapiPicture> picture; 25 linked_ptr<VaapiPicture> picture;
26 #if defined(USE_X11) 26 #if defined(USE_X11)
27 picture.reset(new VaapiTFPPicture(vaapi_wrapper, make_context_current, 27 picture.reset(new VaapiTFPPicture(vaapi_wrapper, make_context_current,
28 picture_buffer_id, texture_id, size)); 28 picture_buffer_id, texture_id, size));
29 #elif defined(USE_OZONE) 29 #elif defined(USE_OZONE)
30 picture.reset(new VaapiDrmPicture(vaapi_wrapper, make_context_current, 30 picture.reset(new VaapiDrmPicture(vaapi_wrapper, make_context_current,
(...skipping 13 matching lines...) Expand all
44 // static 44 // static
45 uint32 VaapiPicture::GetGLTextureTarget() { 45 uint32 VaapiPicture::GetGLTextureTarget() {
46 #if defined(USE_OZONE) 46 #if defined(USE_OZONE)
47 return GL_TEXTURE_EXTERNAL_OES; 47 return GL_TEXTURE_EXTERNAL_OES;
48 #else 48 #else
49 return GL_TEXTURE_2D; 49 return GL_TEXTURE_2D;
50 #endif 50 #endif
51 } 51 }
52 52
53 } // namespace content 53 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/media/vaapi_picture.h ('k') | content/common/gpu/media/vaapi_tfp_picture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698