| commit | b5a851ae941bc3c83e2cbb99c5edc948ba42f596 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 14 00:37:34 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 14 00:37:34 2016 +0000 |
| tree | 1c73b162c5fb2f022454eae1c1d02d2d8961d1a0 | |
| parent | 94a82dcdb9f7bc3027b4cfbda8990a4e4c47e163 [diff] | |
| parent | de6afd7dcc484bc867de6a0438ae4be9f2c6aacc [diff] |
Merge "stagefright: Add HLG in ISO transfer table" into nyc-mr1-dev
diff --git a/media/libstagefright/foundation/ColorUtils.cpp b/media/libstagefright/foundation/ColorUtils.cpp index e329766..d7439b2 100644 --- a/media/libstagefright/foundation/ColorUtils.cpp +++ b/media/libstagefright/foundation/ColorUtils.cpp
@@ -286,6 +286,7 @@ { 15, ColorAspects::TransferSMPTE170M }, { 16, ColorAspects::TransferST2084 }, { 17, ColorAspects::TransferST428 }, + { 18, ColorAspects::TransferHLG }, } };