Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I9eb4a24c05895e2d7453ec5ca4fad8329c11ca9a
Merged-In: I26e13dd88b006577b73f2528aaa5940492f45f7c

1 files changed, 13 insertions, 0 deletions

diff --git a/internal/dynamic_depth/depth_jpeg.cc b/internal/dynamic_depth/depth_jpeg.cc
index 396a41e..af2ead9 100644
--- a/internal/dynamic_depth/depth_jpeg.cc
+++ b/internal/dynamic_depth/depth_jpeg.cc
@@ -19,6 +19,7 @@ namespace dynamic_depth {
 
 int32_t ValidateAndroidDynamicDepthBuffer(const char* buffer, size_t buffer_length) {
   XmpData xmp_data;
+  std::string itemMime("image/jpeg");
   const string image_data(buffer, buffer_length);
   ReadXmpFromMemory(image_data, /*XmpSkipExtended*/ false, &xmp_data);
 
@@ -29,6 +30,18 @@ int32_t ValidateAndroidDynamicDepthBuffer(const char* buffer, size_t buffer_leng
     return -1;
   }
 
+  // Check the container items mime type
+  if ((device->GetContainer() == nullptr) || (device->GetContainer()->GetItems().empty())) {
+    LOG(ERROR) << "No container or container items found!";
+    return -1;
+  }
+  auto items = device->GetContainer()->GetItems();
+  for (const auto& item : items) {
+    if (item->GetMime() != itemMime) {
+      LOG(ERROR) << "Item MIME type doesn't match the expected value: " << itemMime;
+      return -1;
+    }
+  }
   // Check profiles
   const Profiles* profiles = device->GetProfiles();
   if (profiles == nullptr) {