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

Side by Side Diff: media/gpu/vaapi_video_decode_accelerator.cc

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 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 "media/gpu/vaapi_video_decode_accelerator.h" 5 #include "media/gpu/vaapi_video_decode_accelerator.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 client_ptr_factory_.reset(new base::WeakPtrFactory<Client>(client)); 338 client_ptr_factory_.reset(new base::WeakPtrFactory<Client>(client));
339 client_ = client_ptr_factory_->GetWeakPtr(); 339 client_ = client_ptr_factory_->GetWeakPtr();
340 340
341 media::VideoCodecProfile profile = config.profile; 341 media::VideoCodecProfile profile = config.profile;
342 342
343 base::AutoLock auto_lock(lock_); 343 base::AutoLock auto_lock(lock_);
344 DCHECK_EQ(state_, kUninitialized); 344 DCHECK_EQ(state_, kUninitialized);
345 DVLOG(2) << "Initializing VAVDA, profile: " << profile; 345 DVLOG(2) << "Initializing VAVDA, profile: " << profile;
346 346
347 #if defined(USE_X11) 347 #if defined(USE_X11)
348 if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) { 348 if (gl::GetGLImplementation() != gl::kGLImplementationDesktopGL) {
349 DVLOG(1) << "HW video decode acceleration not available without " 349 DVLOG(1) << "HW video decode acceleration not available without "
350 "DesktopGL (GLX)."; 350 "DesktopGL (GLX).";
351 return false; 351 return false;
352 } 352 }
353 #elif defined(USE_OZONE) 353 #elif defined(USE_OZONE)
354 if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) { 354 if (gl::GetGLImplementation() != gl::kGLImplementationEGLGLES2) {
355 DVLOG(1) << "HW video decode acceleration not available without " 355 DVLOG(1) << "HW video decode acceleration not available without "
356 << "EGLGLES2."; 356 << "EGLGLES2.";
357 return false; 357 return false;
358 } 358 }
359 #endif // USE_X11 359 #endif // USE_X11
360 360
361 vaapi_wrapper_ = VaapiWrapper::CreateForVideoCodec( 361 vaapi_wrapper_ = VaapiWrapper::CreateForVideoCodec(
362 VaapiWrapper::kDecode, profile, base::Bind(&ReportToUMA, VAAPI_ERROR)); 362 VaapiWrapper::kDecode, profile, base::Bind(&ReportToUMA, VAAPI_ERROR));
363 363
364 if (!vaapi_wrapper_.get()) { 364 if (!vaapi_wrapper_.get()) {
(...skipping 1467 matching lines...) Expand 10 before | Expand all | Expand 10 after
1832 return vaapi_pic->dec_surface(); 1832 return vaapi_pic->dec_surface();
1833 } 1833 }
1834 1834
1835 // static 1835 // static
1836 media::VideoDecodeAccelerator::SupportedProfiles 1836 media::VideoDecodeAccelerator::SupportedProfiles
1837 VaapiVideoDecodeAccelerator::GetSupportedProfiles() { 1837 VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
1838 return VaapiWrapper::GetSupportedDecodeProfiles(); 1838 return VaapiWrapper::GetSupportedDecodeProfiles();
1839 } 1839 }
1840 1840
1841 } // namespace media 1841 } // namespace media
OLDNEW
« no previous file with comments | « media/gpu/vaapi_tfp_picture.cc ('k') | ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698