commit 4e3f14e827fc026fab22575c9eb41ad81f85759b
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 09 05:13:03 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 05:13:03 2018 +0000
tree dd4d5fb1f59b0fb18bb8ea9da0147b2969ea88cd
parent 40459502597bfca51f86401024231a2944a44b4a
parent 237dc91c546cf5e39737812f49460b552a529f7d

Merge "heic content_encoding field is optional"

media/extractors/mp4/ItemTable.cpp

diff --git a/media/extractors/mp4/ItemTable.cpp b/media/extractors/mp4/ItemTable.cpp
index cef5f4a..d13f0dd 100644
--- a/media/extractors/mp4/ItemTable.cpp
+++ b/media/extractors/mp4/ItemTable.cpp
@@ -1060,9 +1060,12 @@
                 return ERROR_MALFORMED;
             }
 
-            String8 content_encoding;
-            if (!parseNullTerminatedString(&offset, &size, &content_encoding)) {
-                return ERROR_MALFORMED;
+            // content_encoding is optional; can be omitted if would be empty
+            if (size > 0) {
+                String8 content_encoding;
+                if (!parseNullTerminatedString(&offset, &size, &content_encoding)) {
+                    return ERROR_MALFORMED;
+                }
             }
         } else if (item_type == FOURCC('u', 'r', 'i', ' ')) {
             String8 item_uri_type;