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

Unified Diff: media/gpu/vp9_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/vp9_decoder.h
diff --git a/content/common/gpu/media/vp9_decoder.h b/media/gpu/vp9_decoder.h
similarity index 90%
rename from content/common/gpu/media/vp9_decoder.h
rename to media/gpu/vp9_decoder.h
index c513a944a2ac5d637cd443092259368b9fa7a9f4..20e869e87bf269fbdc2df65ac5c65e364b5f272d 100644
--- a/content/common/gpu/media/vp9_decoder.h
+++ b/media/gpu/vp9_decoder.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_VP9_DECODER_H_
-#define CONTENT_COMMON_GPU_MEDIA_VP9_DECODER_H_
+#ifndef MEDIA_GPU_VP9_DECODER_H_
+#define MEDIA_GPU_VP9_DECODER_H_
#include <stddef.h>
#include <stdint.h>
@@ -13,11 +13,11 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "content/common/gpu/media/accelerated_video_decoder.h"
-#include "content/common/gpu/media/vp9_picture.h"
#include "media/filters/vp9_parser.h"
+#include "media/gpu/accelerated_video_decoder.h"
+#include "media/gpu/vp9_picture.h"
-namespace content {
+namespace media {
// This class implements an AcceleratedVideoDecoder for VP9 decoding.
// Clients of this class are expected to pass raw VP9 stream and are expected
@@ -26,9 +26,9 @@ namespace content {
//
// This class must be created, called and destroyed on a single thread, and
// does nothing internally on any other thread.
-class CONTENT_EXPORT VP9Decoder : public AcceleratedVideoDecoder {
+class MEDIA_GPU_EXPORT VP9Decoder : public AcceleratedVideoDecoder {
public:
- class CONTENT_EXPORT VP9Accelerator {
+ class MEDIA_GPU_EXPORT VP9Accelerator {
public:
VP9Accelerator();
virtual ~VP9Accelerator();
@@ -82,7 +82,7 @@ class CONTENT_EXPORT VP9Decoder : public AcceleratedVideoDecoder {
VP9Decoder(VP9Accelerator* accelerator);
~VP9Decoder() override;
- // content::AcceleratedVideoDecoder implementation.
+ // media::AcceleratedVideoDecoder implementation.
void SetStream(const uint8_t* ptr, size_t size) override;
bool Flush() override WARN_UNUSED_RESULT;
void Reset() override;
@@ -129,6 +129,6 @@ class CONTENT_EXPORT VP9Decoder : public AcceleratedVideoDecoder {
DISALLOW_COPY_AND_ASSIGN(VP9Decoder);
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_COMMON_GPU_MEDIA_VP9_DECODER_H_
+#endif // MEDIA_GPU_VP9_DECODER_H_

Powered by Google App Engine
This is Rietveld 408576698