commit cfa93539db72fd12cf1cf13ef5f09f86f1253cf9
author Robert Shih <robertshih@google.com> Tue Jun 05 13:36:05 2018 -0700
committer Robert Shih <robertshih@google.com> Tue Jun 05 15:15:03 2018 -0700
tree 76a6ca1e620a894fe05d431227603daa2201dfd4
parent da74fce85a25272e94341ed3fcb0fe22215d5d7c

MPEG4Extractor: ignore unknown crypto schemes

Bug: 109664294
Test: MediaPlayerDrmTests
Change-Id: I4b4815588a863581a1e2fc9d57c58f1df89493c9

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;
         }