commit de34b121178fa74e7690861bc0abeb9f7c70d66a
author Edwin Wong <edwinwong@google.com> Thu Sep 01 14:16:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 01 14:16:41 2016 +0000
tree 61228b2ff6c6ca6fd8d25000a2f53362ba73db0c
parent 6c185f5ddbcef3509cfd5a7a44d53ba1119c7c61
parent 73fb5495297f645709b7ddba9d8e32a5921f4a2d

Fix AMediaExtractor_getSampleCryptoInfo returning iv as key. am: b2fb3c9787
am: 73fb549529

Change-Id: Ia75e1b37a37ee8ad5f6e59f5a1a6323deb0bb713

media/ndk/NdkMediaExtractor.cpp

diff --git a/media/ndk/NdkMediaExtractor.cpp b/media/ndk/NdkMediaExtractor.cpp
index 1118959..face727 100644
--- a/media/ndk/NdkMediaExtractor.cpp
+++ b/media/ndk/NdkMediaExtractor.cpp
@@ -343,9 +343,9 @@
 
     const void *key;
     size_t keysize;
-    if (meta->findData(kKeyCryptoIV, &type, &key, &keysize)) {
+    if (meta->findData(kKeyCryptoKey, &type, &key, &keysize)) {
         if (keysize != 16) {
-            // IVs must be 16 bytes in length.
+            // Keys must be 16 bytes in length.
             return NULL;
         }
     }