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

Unified Diff: media/gpu/vaapi_jpeg_decoder.h

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: media/gpu/vaapi_jpeg_decoder.h
diff --git a/content/common/gpu/media/vaapi_jpeg_decoder.h b/media/gpu/vaapi_jpeg_decoder.h
similarity index 79%
rename from content/common/gpu/media/vaapi_jpeg_decoder.h
rename to media/gpu/vaapi_jpeg_decoder.h
index 30400164e7ee7ece321d8e026d49ba8af0e03057..1db06820878459ecc770115277c9bc47f6d62dd1 100644
--- a/content/common/gpu/media/vaapi_jpeg_decoder.h
+++ b/media/gpu/vaapi_jpeg_decoder.h
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_JPEG_DECODER_H_
-#define CONTENT_COMMON_GPU_MEDIA_VAAPI_JPEG_DECODER_H_
+#ifndef MEDIA_GPU_VAAPI_JPEG_DECODER_H_
+#define MEDIA_GPU_VAAPI_JPEG_DECODER_H_
#include "base/macros.h"
-#include "content/common/content_export.h"
-#include "content/common/gpu/media/vaapi_wrapper.h"
+#include "media/gpu/media_gpu_export.h"
+#include "media/gpu/vaapi_wrapper.h"
namespace media {
struct JpegParseResult;
} // namespace media
-namespace content {
+namespace media {
// A JPEG decoder that utilizes VA-API hardware video decode acceleration on
// Intel systems. Provides functionality to allow plugging VAAPI HW
@@ -22,7 +22,7 @@ namespace content {
// Clients of this class are expected to manage VA surfaces created via
// VaapiWrapper, parse JPEG picture via media::ParseJpegPicture, and then pass
// them to this class.
-class CONTENT_EXPORT VaapiJpegDecoder {
+class MEDIA_GPU_EXPORT VaapiJpegDecoder {
public:
// Decode a JPEG picture. It will fill VA-API parameters and call
// corresponding VA-API methods according to parsed JPEG result
@@ -40,6 +40,6 @@ class CONTENT_EXPORT VaapiJpegDecoder {
DISALLOW_IMPLICIT_CONSTRUCTORS(VaapiJpegDecoder);
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_COMMON_GPU_MEDIA_VAAPI_JPEG_DECODER_H_
+#endif // MEDIA_GPU_VAAPI_JPEG_DECODER_H_

Powered by Google App Engine
This is Rietveld 408576698