Attach color space information to hardware decoded NV12 video frames.

media/filters/h264_parser.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/filters/h264_parser.h"
 
 #include <limits>
 #include <memory>
 
 #include "base/logging.h"
@@ skipping 50 matching lines @@
   if (pic_width_in_mbs_minus1 > max_mb_minus1 ||
       pic_height_in_map_units_minus1 > max_map_units_minus1) {
     DVLOG(1) << "Coded size is too large.";
     return base::nullopt;
   }
 
   return gfx::Size(mb_unit * (pic_width_in_mbs_minus1 + 1),
                    map_unit * (pic_height_in_map_units_minus1 + 1));
 }
 
-// Also based on section 7.4.2.1.1.
+// Based on T-REC-H.264 E.2.1, "VUI parameters semantics",
+// available from http://www.itu.int/rec/T-REC-H.264.
 base::Optional<gfx::Rect> H264SPS::GetVisibleRect() const {
   base::Optional<gfx::Size> coded_size = GetCodedSize();
   if (!coded_size)
     return base::nullopt;
 
   if (!frame_cropping_flag)
     return gfx::Rect(coded_size.value());
 
   int crop_unit_x;
   int crop_unit_y;
@@ skipping 33 matching lines @@
       coded_size->height() - crop_top <= crop_bottom) {
     DVLOG(1) << "Frame cropping excludes entire frame.";
     return base::nullopt;
   }
 
   return gfx::Rect(crop_left, crop_top,
                    coded_size->width() - crop_left - crop_right,
                    coded_size->height() - crop_top - crop_bottom);
 }
 
+// Comers from VUI section SPS. (E

[sandersd (OOO until July 31), 2016/09/23 00:33:50]

Comment seems to have gotten corrupted?

+gfx::ColorSpace H264SPS::GetColorSpace() const {
+  if (colour_description_present_flag) {
+    return gfx::ColorSpace(
+        colour_primaries, transfer_characteristics, matrix_coefficients,
+        video_full_range_flag ? gfx::ColorSpace::RangeID::FULL
+                              : gfx::ColorSpace::RangeID::LIMITED);
+  } else {
+    return gfx::ColorSpace(gfx::ColorSpace::PrimaryID::UNSPECIFIED,
+                           gfx::ColorSpace::TransferID::UNSPECIFIED,
+                           gfx::ColorSpace::MatrixID::UNSPECIFIED,
+                           video_full_range_flag
+                               ? gfx::ColorSpace::RangeID::FULL
+                               : gfx::ColorSpace::RangeID::LIMITED);
+  }
+}
+
 H264PPS::H264PPS() {
   memset(this, 0, sizeof(*this));
 }
 
 H264SliceHeader::H264SliceHeader() {
   memset(this, 0, sizeof(*this));
 }
 
 H264SEIMessage::H264SEIMessage() {
   memset(this, 0, sizeof(*this));
@@ skipping 674 matching lines @@
       sps->sar_height = kTableSarHeight[aspect_ratio_idc];
     }
   }
 
   int data;
   // Read and ignore overscan and video signal type info.
   READ_BOOL_OR_RETURN(&data);  // overscan_info_present_flag
   if (data)
     READ_BOOL_OR_RETURN(&data);  // overscan_appropriate_flag
 
-  READ_BOOL_OR_RETURN(&data);  // video_signal_type_present_flag
-  if (data) {
-    READ_BITS_OR_RETURN(3, &data);  // video_format
-    READ_BOOL_OR_RETURN(&data);  // video_full_range_flag
-    READ_BOOL_OR_RETURN(&data);  // colour_description_present_flag
-    if (data)
-      READ_BITS_OR_RETURN(24, &data);  // color description syntax elements
+  READ_BOOL_OR_RETURN(&sps->video_signal_type_present_flag);
+  if (sps->video_signal_type_present_flag) {
+    READ_BITS_OR_RETURN(3, &sps->video_format);
+    READ_BOOL_OR_RETURN(&sps->video_full_range_flag);
+    READ_BOOL_OR_RETURN(&sps->colour_description_present_flag);
+    if (sps->colour_description_present_flag) {
+      // color description syntax elements
+      READ_BITS_OR_RETURN(8, &sps->colour_primaries);
+      READ_BITS_OR_RETURN(8, &sps->transfer_characteristics);
+      READ_BITS_OR_RETURN(8, &sps->matrix_coefficients);
+    }
   }
 
   READ_BOOL_OR_RETURN(&data);  // chroma_loc_info_present_flag
   if (data) {
     READ_UE_OR_RETURN(&data);  // chroma_sample_loc_type_top_field
     READ_UE_OR_RETURN(&data);  // chroma_sample_loc_type_bottom_field
   }
 
   // Read and ignore timing info.
   READ_BOOL_OR_RETURN(&data);  // timing_info_present_flag
@@ skipping 622 matching lines @@
 
     default:
       DVLOG(4) << "Unsupported SEI message";
       break;
   }
 
   return kOk;
 }
 
 }  // namespace media