commit 8292a716361d0f02de2b79242aec4630664bc770
author Marco Nelissen <marcone@google.com> Mon Jan 14 13:04:14 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Jan 14 13:04:14 2019 -0800
tree f20868fe70d8c19bd2d0c6d3e69325ee6c041cdf
parent 937dba18c32af5030999daf8d4e9aa3d4cf3b705
parent 842c1a748de0ec938bf27629bee950e69bb2fcb4

Merge "Add samplerate and bitspersample keys" am: 25b0f8dc2a am: 69b22687b8
am: 842c1a748d

Change-Id: Id52dab8294a5bc3a8c4187688e0fe1719df585fa

media/libstagefright/StagefrightMediaScanner.cpp

diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp
index 74b7340..cf4edae 100644
--- a/media/libstagefright/StagefrightMediaScanner.cpp
+++ b/media/libstagefright/StagefrightMediaScanner.cpp
@@ -127,6 +127,8 @@
         { "colorstandard", METADATA_KEY_COLOR_STANDARD },
         { "colortransfer", METADATA_KEY_COLOR_TRANSFER },
         { "colorrange", METADATA_KEY_COLOR_RANGE },
+        { "samplerate", METADATA_KEY_SAMPLERATE },
+        { "bitspersample", METADATA_KEY_BITS_PER_SAMPLE },
     };
     static const size_t kNumEntries = sizeof(kKeyMap) / sizeof(kKeyMap[0]);