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

Unified Diff: media/base/video_decoder_config.cc

Issue 2333663003: Add color metadata info to VideoDecoderConfig. (Closed)
Patch Set: Commented the RangeID comment as suggested Created 4 years, 3 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_decoder_config.h ('k') | media/formats/webm/webm_colour_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_decoder_config.cc
diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc
index ddceabb4357c2a75844b76b197c1bd36ae31f8ef..9bd7e555b4af27eda0a968e1e9461120b7158b96 100644
--- a/media/base/video_decoder_config.cc
+++ b/media/base/video_decoder_config.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "media/base/video_frame.h"
+#include "media/base/video_types.h"
namespace media {
@@ -67,6 +68,23 @@ VideoDecoderConfig::VideoDecoderConfig(const VideoDecoderConfig& other) =
VideoDecoderConfig::~VideoDecoderConfig() {}
+void VideoDecoderConfig::set_color_space_info(
+ const gfx::ColorSpace& color_space_info) {
+ color_space_info_ = color_space_info;
+}
+
+gfx::ColorSpace VideoDecoderConfig::color_space_info() const {
+ return color_space_info_;
+}
+
+void VideoDecoderConfig::set_hdr_metadata(const HDRMetadata& hdr_metadata) {
+ hdr_metadata_ = hdr_metadata;
+}
+
+base::Optional<HDRMetadata> VideoDecoderConfig::hdr_metadata() const {
+ return hdr_metadata_;
+}
+
void VideoDecoderConfig::Initialize(VideoCodec codec,
VideoCodecProfile profile,
VideoPixelFormat format,
@@ -85,6 +103,21 @@ void VideoDecoderConfig::Initialize(VideoCodec codec,
natural_size_ = natural_size;
extra_data_ = extra_data;
encryption_scheme_ = encryption_scheme;
+
+ switch (color_space) {
+ case ColorSpace::COLOR_SPACE_JPEG:
+ color_space_info_ = gfx::ColorSpace::CreateJpeg();
+ break;
+ case ColorSpace::COLOR_SPACE_HD_REC709:
+ color_space_info_ = gfx::ColorSpace::CreateREC709();
+ break;
+ case ColorSpace::COLOR_SPACE_SD_REC601:
+ color_space_info_ = gfx::ColorSpace::CreateREC601();
+ break;
+ case ColorSpace::COLOR_SPACE_UNSPECIFIED:
+ default:
+ break;
+ }
}
bool VideoDecoderConfig::IsValidConfig() const {
« no previous file with comments | « media/base/video_decoder_config.h ('k') | media/formats/webm/webm_colour_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698