commit f7a3e19bcbe2436ebcd7f324032e9775064a45ce
author Marco Nelissen <marcone@google.com> Tue Nov 20 20:58:45 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 20 20:58:45 2018 +0000
tree 5f2b329f8490f9b7a2ed4ce1a4e28c7d87c7478a
parent 3dbc150f86a748703424e190b3ee647ba7f99ef5
parent f22dc8bf477546268155f6616a97cb8823f24dd4

Merge "MPEG4Extractor: fix CTS test failure"

media/extractors/mp4/MPEG4Extractor.cpp

diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp
index a11acc1..c3bdc92 100644
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -3642,7 +3642,7 @@
             if (year < 10000) {
                 sprintf(tmp, "%u", year);
 
-                AMediaFormat_setString(mFileMetaData, "year", tmp);
+                AMediaFormat_setString(mFileMetaData, AMEDIAFORMAT_KEY_YEAR, tmp);
             }
             break;
         }
@@ -4716,7 +4716,7 @@
         off64_t offset, bool isSubsampleEncryption, uint32_t flags) {
 
     int32_t ivlength;
-    CHECK(AMediaFormat_getInt32(mFormat, "crypto-defaultivsize", &ivlength));
+    CHECK(AMediaFormat_getInt32(mFormat, AMEDIAFORMAT_KEY_CRYPTO_DEFAULT_IV_SIZE, &ivlength));
 
     // only 0, 8 and 16 byte initialization vectors are supported
     if (ivlength != 0 && ivlength != 8 && ivlength != 16) {