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

Unified Diff: media/gpu/android_video_encode_accelerator.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/android_video_encode_accelerator.h
diff --git a/content/common/gpu/media/android_video_encode_accelerator.h b/media/gpu/android_video_encode_accelerator.h
similarity index 91%
rename from content/common/gpu/media/android_video_encode_accelerator.h
rename to media/gpu/android_video_encode_accelerator.h
index a708872cebcebee242bf9657b0bb35c0d73bf0df..cc13454e6b72d7432c536585c526e7bf692d8688 100644
--- a/content/common/gpu/media/android_video_encode_accelerator.h
+++ b/media/gpu/android_video_encode_accelerator.h
@@ -2,8 +2,8 @@
// 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_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_
-#define CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_
+#ifndef MEDIA_GPU_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_
+#define MEDIA_GPU_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_
#include <stddef.h>
#include <stdint.h>
@@ -17,22 +17,22 @@
#include "base/threading/thread_checker.h"
#include "base/timer/timer.h"
#include "base/tuple.h"
-#include "content/common/content_export.h"
#include "media/base/android/sdk_media_codec_bridge.h"
+#include "media/gpu/media_gpu_export.h"
#include "media/video/video_encode_accelerator.h"
namespace media {
class BitstreamBuffer;
} // namespace media
-namespace content {
+namespace media {
// Android-specific implementation of media::VideoEncodeAccelerator, enabling
// hardware-acceleration of video encoding, based on Android's MediaCodec class
// (http://developer.android.com/reference/android/media/MediaCodec.html). This
// class expects to live and be called on a single thread (the GPU process'
// ChildThread).
-class CONTENT_EXPORT AndroidVideoEncodeAccelerator
+class MEDIA_GPU_EXPORT AndroidVideoEncodeAccelerator
: public media::VideoEncodeAccelerator {
public:
AndroidVideoEncodeAccelerator();
@@ -109,6 +109,6 @@ class CONTENT_EXPORT AndroidVideoEncodeAccelerator
DISALLOW_COPY_AND_ASSIGN(AndroidVideoEncodeAccelerator);
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_
+#endif // MEDIA_GPU_ANDROID_VIDEO_ENCODE_ACCELERATOR_H_

Powered by Google App Engine
This is Rietveld 408576698