commit a3db2b4c1ff1e4f5b0f57443a0ea2abee71a1c83
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 15 18:08:07 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 15 18:08:07 2019 +0000
tree 20d5eaee43fcd0aa41ea79d46b2be37cce759df9
parent 25b0f8dc2a5756f5c3484e097dc80eac8e20846f
parent 4bb320ab061fecb6dbf0c2ae9f37260d2b4ee2c4

Merge "Fix sw mpeg4 codec crash when p-vop of mp4-dp type  is at first after resubmit csd"

media/libstagefright/StagefrightMediaScanner.cpp

diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp
index 17187a8..c62603c 100644
--- a/media/libstagefright/StagefrightMediaScanner.cpp
+++ b/media/libstagefright/StagefrightMediaScanner.cpp
@@ -135,6 +135,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]);