Snap for 6916203 from 8cd9950a30d7123f94f31f64c35a1610843b052a to mainline-release
Change-Id: If4fdd61e7da84fd0f3c383ace2433bb2e42c43d0
diff --git a/README.android b/README.android
index 668d27f..2fad782 100644
--- a/README.android
+++ b/README.android
@@ -4,9 +4,9 @@
License: BSD
License File: libaom/LICENSE
-Date: Thursday November 29 2018
+Date: Friday March 29 2019
Branch: origin/master
-Commit: 250bc3a61c501344523eec07fec35f304767260b
+Commit: 978ab9e6cd19904cdd54b69a4c30b10c747eb55a
Description:
Contains the sources used to compile libaom.
diff --git a/README.version b/README.version
index 95519e8..8c3c02f 100644
--- a/README.version
+++ b/README.version
@@ -1,15 +1,7 @@
-URL: https://aomedia.googlesource.com/aom/+archive/250bc3a61c501344523eec07fec35f304767260b.tar.gz
+URL: https://aomedia.googlesource.com/aom/+archive/978ab9e6cd19904cdd54b69a4c30b10c747eb55a.tar.gz
Version: v1.0.0
Local Modifications:
- Rename files to avoid object collisions:
- aom_dsp/x86/highbd_intrapred_sse2.asm
- aom_dsp/x86/intrapred_sse2.asm
- 7ad847ac6 Seq header shouldn't change in the middle of frame
-Updates to libaom/examples/av1_dec_fuzzer.cc to include the following commits from upstream
-139efd2c8 av1_dec_fuzzer: get thread count from 1st byte of frame header
-adfc4b7f8 av1_dec_fuzzer: Remove fmemopen dependency
-338f1e688 av1_dec_fuzzer: Remove dependency on ivfdec.o and tools_common.o
-690a08a34 av1_dec_fuzzer: Updated fsanitize flags in build script
-c2632bb3f av1_dec_fuzzer: Fix missing field initializer for 'cfg'
-cherry-picks:
-0e07ea54d disable av1_(apply_|)selfguided_restoration_neon
+ Remove __clang__analyzer__ preprocessor directives (ag/7285842)
+ Cherry-pick 7ad847ac6 Seq header shouldn't change in the middle of frame
+ Cherry-pick 0e07ea54d disable av1_(apply_|)selfguided_restoration_neon
+ Cherry-pick 0a0368368 Check the conformance requirements in Sec. 6.8.1.
diff --git a/libaom/av1/decoder/obu.c b/libaom/av1/decoder/obu.c
index ac66df5..f34f30e 100644
--- a/libaom/av1/decoder/obu.c
+++ b/libaom/av1/decoder/obu.c
@@ -769,6 +769,18 @@
case OBU_FRAME_HEADER:
case OBU_REDUNDANT_FRAME_HEADER:
case OBU_FRAME:
+ if (obu_header.type == OBU_REDUNDANT_FRAME_HEADER) {
+ if (!pbi->seen_frame_header) {
+ cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+ return -1;
+ }
+ } else {
+ // OBU_FRAME_HEADER or OBU_FRAME.
+ if (pbi->seen_frame_header) {
+ cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
+ return -1;
+ }
+ }
// Only decode first frame header received
if (!pbi->seen_frame_header ||
(cm->large_scale_tile && !pbi->camera_frame_header_ready)) {
