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

Unified Diff: media/base/video_decoder_config.h

Issue 2746013006: use VideoColorSpace in decoder configuration (Closed)
Patch Set: oops, win compile fix reapplied Created 3 years, 9 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
« no previous file with comments | « media/base/video_color_space.cc ('k') | media/base/video_decoder_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_decoder_config.h
diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h
index 3ed8d4ce5646fcc4b7b51f5f17ff948f61c57d4c..ae406fbe8e77bab86c3b6bad3631a44e94930a61 100644
--- a/media/base/video_decoder_config.h
+++ b/media/base/video_decoder_config.h
@@ -16,8 +16,8 @@
#include "media/base/hdr_metadata.h"
#include "media/base/media_export.h"
#include "media/base/video_codecs.h"
+#include "media/base/video_color_space.h"
#include "media/base/video_types.h"
-#include "ui/gfx/color_space.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
@@ -113,8 +113,8 @@ class MEDIA_EXPORT VideoDecoderConfig {
return encryption_scheme_;
}
- void set_color_space_info(const gfx::ColorSpace& color_space_info);
- gfx::ColorSpace color_space_info() const;
+ void set_color_space_info(const VideoColorSpace& color_space_info);
+ VideoColorSpace color_space_info() const;
void set_hdr_metadata(const HDRMetadata& hdr_metadata);
base::Optional<HDRMetadata> hdr_metadata() const;
@@ -144,7 +144,7 @@ class MEDIA_EXPORT VideoDecoderConfig {
EncryptionScheme encryption_scheme_;
- gfx::ColorSpace color_space_info_;
+ VideoColorSpace color_space_info_;
base::Optional<HDRMetadata> hdr_metadata_;
// Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
« no previous file with comments | « media/base/video_color_space.cc ('k') | media/base/video_decoder_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698