commit 95eda13e8c9d0b013a3913a0a618c99652a827fc
author Chong Zhang <chz@google.com> Wed Oct 24 20:11:01 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 24 20:11:01 2018 -0700
tree f20b01a38e29605c435a832543ded5dfaa818541
parent ad6490fe985694201a5eaf60c339d4b371319efa
parent 34eb61ee6d4907016502b10f56bfcc8e08735098

Merge "Add color aspects keys" am: 8ecc7c198c
am: 34eb61ee6d

Change-Id: I86bbf7c32aba51acac1b87dbda3f2ac128c57561

media/libstagefright/StagefrightMediaScanner.cpp

diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp
index e010b3e..610b961 100644
--- a/media/libstagefright/StagefrightMediaScanner.cpp
+++ b/media/libstagefright/StagefrightMediaScanner.cpp
@@ -132,6 +132,9 @@
         { "date", METADATA_KEY_DATE },
         { "width", METADATA_KEY_VIDEO_WIDTH },
         { "height", METADATA_KEY_VIDEO_HEIGHT },
+        { "colorstandard", METADATA_KEY_COLOR_STANDARD },
+        { "colortransfer", METADATA_KEY_COLOR_TRANSFER },
+        { "colorrange", METADATA_KEY_COLOR_RANGE },
     };
     static const size_t kNumEntries = sizeof(kKeyMap) / sizeof(kKeyMap[0]);