Attach color space information to hardware decoded NV12 video frames.

media/filters/h264_parser.cc

Index: media/filters/h264_parser.cc
diff --git a/media/filters/h264_parser.cc b/media/filters/h264_parser.cc
index 991599e2accd577a09e05c85edb52b596e599ffb..9dee01b169bef14689f1d6b7748a0baf311d2084 100644
--- a/media/filters/h264_parser.cc
+++ b/media/filters/h264_parser.cc
@@ -68,7 +68,8 @@ base::Optional<gfx::Size> H264SPS::GetCodedSize() const {
                    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)
@@ -122,6 +123,23 @@ base::Optional<gfx::Rect> H264SPS::GetVisibleRect() const {
                    coded_size->height() - crop_top - crop_bottom);
 }
 
+// Comers from VUI section SPS. (E

[Pawel Osciak, 2016/09/27 07:01:21]

s/Comers/Comes/

"(E" ?

[hubbe, 2016/09/28 21:32:58]

Done.

+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));
 }
@@ -816,13 +834,17 @@ H264Parser::Result H264Parser::ParseVUIParameters(H264SPS* sps) {
   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);

[Pawel Osciak, 2016/09/27 07:01:21]

IN_RANGE_OR_RETURN(sps->colour_primaries, 0,
gfx::ColorSpace::PrimaryID::LAST_STANDARD_VALUE);

[hubbe, 2016/09/28 21:32:58]

I don't think that's a great way to do it. They keep adding new values all the
time, and when that happens I think we want to keep parsing but map the unknown
color component to gfx::ColorSpace::PrimaryID::UNKNOWN, which happens in the
gfx::ColorSpace constructor.

+      READ_BITS_OR_RETURN(8, &sps->transfer_characteristics);

[Pawel Osciak, 2016/09/27 07:01:21]

IN_RANGE_OR_RETURN(..., 0, gfx::ColorSpace::TransferID::LAST_STANDARD_VALUE)

[hubbe, 2016/09/28 21:32:58]

See previous comment.

+      READ_BITS_OR_RETURN(8, &sps->matrix_coefficients);

[Pawel Osciak, 2016/09/27 07:01:21]

And similarly here please.

[hubbe, 2016/09/28 21:32:58]

See previous comment.

+    }
   }
 
   READ_BOOL_OR_RETURN(&data);  // chroma_loc_info_present_flag