aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/codec
diff options
context:
space:
mode:
authorGravatar Chong Zhang <chz@google.com>2017-10-03 13:16:06 -0700
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-11-01 20:16:30 +0000
commit3c2359397a3c586a9a49266e1d0a6990558debdd (patch)
tree5dbb951d56591e151a006239e722dc9e615898ca /src/codec
parent3054f9d1ec647b3c75b494d8c466576a9f9a439c (diff)
Allow bitmap extraction from HEIF image sequences
b/63633199 Change-Id: I0e86589a485830066fe52ae3a74c18ee7f333a7d Reviewed-on: https://skia-review.googlesource.com/65883 Reviewed-by: Leon Scroggins <scroggo@google.com> Reviewed-by: Chong Zhang <chz@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/codec')
-rw-r--r--src/codec/SkHeifCodec.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/codec/SkHeifCodec.cpp b/src/codec/SkHeifCodec.cpp
index 78f418f8c5..6e82904115 100644
--- a/src/codec/SkHeifCodec.cpp
+++ b/src/codec/SkHeifCodec.cpp
@@ -71,7 +71,8 @@ bool SkHeifCodec::IsHeif(const void* buffer, size_t bytesRead) {
}
auto* brandPtr = SkTAddOffset<const uint32_t>(buffer, offset + 4 * i);
uint32_t brand = SkEndian_SwapBE32(*brandPtr);
- if (brand == FOURCC('m', 'i', 'f', '1') || brand == FOURCC('h', 'e', 'i', 'c')) {
+ if (brand == FOURCC('m', 'i', 'f', '1') || brand == FOURCC('h', 'e', 'i', 'c')
+ || brand == FOURCC('m', 's', 'f', '1') || brand == FOURCC('h', 'e', 'v', 'c')) {
return true;
}
}