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

Unified Diff: media/gpu/avda_codec_image.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/avda_codec_image.h
diff --git a/content/common/gpu/media/avda_codec_image.h b/media/gpu/avda_codec_image.h
similarity index 94%
rename from content/common/gpu/media/avda_codec_image.h
rename to media/gpu/avda_codec_image.h
index 8adb5fb4338c3da0200fd9483b6fcf5425dbcac2..95927d7d9b63ffd7e672f5751e078c16c7035c38 100644
--- a/content/common/gpu/media/avda_codec_image.h
+++ b/media/gpu/avda_codec_image.h
@@ -2,20 +2,20 @@
// 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_AVDA_CODEC_IMAGE_H_
-#define CONTENT_COMMON_GPU_MEDIA_AVDA_CODEC_IMAGE_H_
+#ifndef MEDIA_GPU_AVDA_CODEC_IMAGE_H_
+#define MEDIA_GPU_AVDA_CODEC_IMAGE_H_
#include <stdint.h>
#include "base/macros.h"
-#include "content/common/gpu/media/avda_shared_state.h"
#include "gpu/command_buffer/service/gl_stream_texture_image.h"
+#include "media/gpu/avda_shared_state.h"
namespace ui {
class ScopedMakeCurrent;
}
-namespace content {
+namespace media {
// GLImage that renders MediaCodec buffers to a SurfaceTexture or SurfaceView as
// needed in order to draw them.
@@ -127,6 +127,6 @@ class AVDACodecImage : public gpu::gles2::GLStreamTextureImage {
DISALLOW_COPY_AND_ASSIGN(AVDACodecImage);
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_COMMON_GPU_MEDIA_AVDA_CODEC_IMAGE_H_
+#endif // MEDIA_GPU_AVDA_CODEC_IMAGE_H_
« no previous file with comments | « media/gpu/args.gni ('k') | media/gpu/avda_codec_image.cc » ('j') | media/gpu/h264_decoder.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698