diff options
author | Emilian Peev <epeev@google.com> | 2019-07-25 15:40:26 -0700 |
---|---|---|
committer | Emilian Peev <epeev@google.com> | 2019-07-25 15:40:26 -0700 |
commit | 8facf7af35ae12fb6b5eb159eccbbf3b2ca49c3c (patch) | |
tree | cd524d1c44ed5ba56e86e6ff9a0fbf7505cc0160 | |
parent | d2455c3e606688a0333cb32818d7e3a09ee55a5a (diff) | |
download | dynamic_depth-8facf7af35ae12fb6b5eb159eccbbf3b2ca49c3c.tar.gz |
Check Android container item MIME type
Android depth photos item mime type must be
according to the dynamic depth spec.
Bug: 138399780
Test: runtest -x
cts/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
-m testDynamicDepth
Change-Id: I6ad6a1c581ba8a12884785171bc2f9b7360a4fb4
-rw-r--r-- | internal/dynamic_depth/depth_jpeg.cc | 13 |
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) { |