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

Unified Diff: content/common/gpu/media/vaapi_picture.cc

Issue 1882373004: Migrate content/common/gpu/media code to media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix several more bot-identified build issues Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/media/vaapi_picture.cc
diff --git a/content/common/gpu/media/vaapi_picture.cc b/content/common/gpu/media/vaapi_picture.cc
deleted file mode 100644
index cdf8c355974c815a7ce7b198bfaff91f72c3d633..0000000000000000000000000000000000000000
--- a/content/common/gpu/media/vaapi_picture.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/common/gpu/media/vaapi_picture.h"
-#include "content/common/gpu/media/vaapi_wrapper.h"
-#include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_implementation.h"
-
-#if defined(USE_X11)
-#include "content/common/gpu/media/vaapi_tfp_picture.h"
-#elif defined(USE_OZONE)
-#include "content/common/gpu/media/vaapi_drm_picture.h"
-#endif
-
-namespace content {
-
-// static
-linked_ptr<VaapiPicture> VaapiPicture::CreatePicture(
- const scoped_refptr<VaapiWrapper>& vaapi_wrapper,
- const MakeGLContextCurrentCallback& make_context_current_cb,
- int32_t picture_buffer_id,
- uint32_t texture_id,
- const gfx::Size& size) {
- linked_ptr<VaapiPicture> picture;
-#if defined(USE_X11)
- picture.reset(new VaapiTFPPicture(vaapi_wrapper, make_context_current_cb,
- picture_buffer_id, texture_id, size));
-#elif defined(USE_OZONE)
- picture.reset(new VaapiDrmPicture(vaapi_wrapper, make_context_current_cb,
- picture_buffer_id, texture_id, size));
-#endif // USE_X11
-
- if (picture.get() && !picture->Initialize())
- picture.reset();
-
- return picture;
-}
-
-bool VaapiPicture::AllowOverlay() const {
- return false;
-}
-
-// static
-uint32_t VaapiPicture::GetGLTextureTarget() {
-#if defined(USE_OZONE)
- return GL_TEXTURE_EXTERNAL_OES;
-#else
- return GL_TEXTURE_2D;
-#endif
-}
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698