diff options
Diffstat (limited to 'chromium/media/base/video_decoder_config.h')
| -rw-r--r-- | chromium/media/base/video_decoder_config.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chromium/media/base/video_decoder_config.h b/chromium/media/base/video_decoder_config.h index 01ad01d48ca..5d04d524bad 100644 --- a/chromium/media/base/video_decoder_config.h +++ b/chromium/media/base/video_decoder_config.h @@ -20,13 +20,10 @@ #include "media/base/video_types.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" -#include "ui/gl/hdr_metadata.h" +#include "ui/gfx/hdr_metadata.h" namespace media { -MEDIA_EXPORT VideoCodec -VideoCodecProfileToVideoCodec(VideoCodecProfile profile); - // Describes the content of a video stream, as described by the media container // (or otherwise determined by the demuxer). class MEDIA_EXPORT VideoDecoderConfig { @@ -80,6 +77,7 @@ class MEDIA_EXPORT VideoDecoderConfig { VideoCodec codec() const { return codec_; } VideoCodecProfile profile() const { return profile_; } + void set_profile(VideoCodecProfile profile) { profile_ = profile; } AlphaMode alpha_mode() const { return alpha_mode_; } // Difference between encoded and display orientation. @@ -154,10 +152,10 @@ class MEDIA_EXPORT VideoDecoderConfig { const VideoColorSpace& color_space_info() const { return color_space_info_; } // Dynamic range of the image data. - void set_hdr_metadata(const gl::HDRMetadata& hdr_metadata) { + void set_hdr_metadata(const gfx::HDRMetadata& hdr_metadata) { hdr_metadata_ = hdr_metadata; } - const base::Optional<gl::HDRMetadata>& hdr_metadata() const { + const base::Optional<gfx::HDRMetadata>& hdr_metadata() const { return hdr_metadata_; } @@ -192,7 +190,7 @@ class MEDIA_EXPORT VideoDecoderConfig { EncryptionScheme encryption_scheme_ = EncryptionScheme::kUnencrypted; VideoColorSpace color_space_info_; - base::Optional<gl::HDRMetadata> hdr_metadata_; + base::Optional<gfx::HDRMetadata> hdr_metadata_; // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler // generated copy constructor and assignment operator. Since the extra data is |