commit eb23624d682c062c28df9fe0ef0922c446262a89
author Robert Shih <robertshih@google.com> Tue Jun 05 18:13:26 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 05 18:13:26 2018 -0700
tree 18739bdc218aab8462c2bae07fb4852dd25bbe0e
parent 6fddec7de70d1154aa11ffc48ba5affe46295539
parent cfa93539db72fd12cf1cf13ef5f09f86f1253cf9

MPEG4Extractor: ignore unknown crypto schemes
am: cfa93539db

Change-Id: I492650e3b500766a160f8a0751b0009e9d8efa87

media/extractors/mp4/MPEG4Extractor.cpp

diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp
index 1a56edc..7b3b81d 100644
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -1023,7 +1023,9 @@
                     break;
                 }
             }
-            mLastTrack->meta.setInt32(kKeyCryptoMode, mode);
+            if (mode != kCryptoModeUnencrypted) {
+                mLastTrack->meta.setInt32(kKeyCryptoMode, mode);
+            }
             break;
         }