Add color metadata info to VideoDecoderConfig.

media/formats/webm/webm_video_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/formats/webm/webm_video_client.h"
 
 #include "media/base/video_decoder_config.h"
 #include "media/formats/webm/webm_constants.h"
 
 namespace media {
@@ skipping 10 matching lines @@
   pixel_width_ = -1;
   pixel_height_ = -1;
   crop_bottom_ = -1;
   crop_top_ = -1;
   crop_left_ = -1;
   crop_right_ = -1;
   display_width_ = -1;
   display_height_ = -1;
   display_unit_ = -1;
   alpha_mode_ = -1;
+  colour_parsed_ = false;
 }
 
 bool WebMVideoClient::InitializeConfig(
     const std::string& codec_id,
     const std::vector<uint8_t>& codec_private,
     const EncryptionScheme& encryption_scheme,
     VideoDecoderConfig* config) {
   DCHECK(config);
 
   VideoCodec video_codec = kUnknownVideoCodec;
@@ skipping 48 matching lines @@
   } else {
     MEDIA_LOG(ERROR, media_log_) << "Unsupported display unit type "
                                  << display_unit_;
     return false;
   }
   gfx::Size natural_size = gfx::Size(display_width_, display_height_);
 
   config->Initialize(video_codec, profile, format, COLOR_SPACE_HD_REC709,
                      coded_size, visible_rect, natural_size, codec_private,
                      encryption_scheme);
+  if (colour_parsed_) {
+    WebMColorMetadata color_metadata = colour_parser_.GetWebMColorMetadata();
+    config->set_color_space_info(color_metadata.color_space);
+    config->set_hdr_metadata(color_metadata.hdr_metadata);
+  }
   return config->IsValidConfig();
 }
 
+WebMParserClient* WebMVideoClient::OnListStart(int id) {
+  if (id == kWebMIdColour) {
+    colour_parsed_ = false;
+    return &colour_parser_;
+  }
+
+  return this;
+}
+
+bool WebMVideoClient::OnListEnd(int id) {
+  if (id == kWebMIdColour)
+    colour_parsed_ = true;
+  return true;
+}
+
 bool WebMVideoClient::OnUInt(int id, int64_t val) {
   int64_t* dst = NULL;
 
   switch (id) {
     case kWebMIdPixelWidth:
       dst = &pixel_width_;
       break;
     case kWebMIdPixelHeight:
       dst = &pixel_height_;
       break;
@@ skipping 40 matching lines @@
   // Accept binary fields we don't care about for now.
   return true;
 }
 
 bool WebMVideoClient::OnFloat(int id, double val) {
   // Accept float fields we don't care about for now.
   return true;
 }
 
 }  // namespace media