Index: media/gpu/android_video_decode_accelerator.h |
diff --git a/content/common/gpu/media/android_video_decode_accelerator.h b/media/gpu/android_video_decode_accelerator.h |
similarity index 96% |
rename from content/common/gpu/media/android_video_decode_accelerator.h |
rename to media/gpu/android_video_decode_accelerator.h |
index 6728270817a87e0e6362cf9caa8a24043d0d6183..66c2829f574816b5c3a49213fe246b4f52ccf076 100644 |
--- a/content/common/gpu/media/android_video_decode_accelerator.h |
+++ b/media/gpu/android_video_decode_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_DECODE_ACCELERATOR_H_ |
-#define CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ |
+#ifndef MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ |
+#define MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ |
#include <stdint.h> |
@@ -16,14 +16,14 @@ |
#include "base/compiler_specific.h" |
#include "base/threading/thread_checker.h" |
#include "base/timer/timer.h" |
-#include "content/common/content_export.h" |
-#include "content/common/gpu/media/avda_state_provider.h" |
-#include "content/common/gpu/media/gpu_video_decode_accelerator_helpers.h" |
#include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
#include "gpu/command_buffer/service/gpu_preferences.h" |
#include "media/base/android/media_drm_bridge_cdm_context.h" |
#include "media/base/android/sdk_media_codec_bridge.h" |
#include "media/base/media_keys.h" |
+#include "media/gpu/avda_state_provider.h" |
+#include "media/gpu/gpu_video_decode_accelerator_helpers.h" |
+#include "media/gpu/media_gpu_export.h" |
#include "media/video/video_decode_accelerator.h" |
#include "ui/gl/android/scoped_java_surface.h" |
@@ -31,14 +31,14 @@ namespace gfx { |
class SurfaceTexture; |
} |
-namespace content { |
+namespace media { |
// A VideoDecodeAccelerator implementation for Android. |
// This class decodes the input encoded stream by using Android's MediaCodec |
// class. http://developer.android.com/reference/android/media/MediaCodec.html |
// It delegates attaching pictures to PictureBuffers to a BackingStrategy, but |
// otherwise handles the work of transferring data to / from MediaCodec. |
-class CONTENT_EXPORT AndroidVideoDecodeAccelerator |
+class MEDIA_GPU_EXPORT AndroidVideoDecodeAccelerator |
: public media::VideoDecodeAccelerator, |
public AVDAStateProvider { |
public: |
@@ -388,6 +388,6 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator |
friend class AndroidVideoDecodeAcceleratorTest; |
}; |
-} // namespace content |
+} // namespace media |
-#endif // CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ |
+#endif // MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ |