diff options
| author | James Zern <jzern@google.com> | 2020-10-07 17:56:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 17:56:48 +0000 |
| commit | 8cd9950a30d7123f94f31f64c35a1610843b052a (patch) | |
| tree | d07db4d7f012a0d7d8a5b13a22cbb214c19e9ad1 | |
| parent | 0b03f288d3290833848daa727a8e1b8d8860fbee (diff) | |
| parent | 4e1c2a54e6b1b45861caa38b55655da91b9b4e94 (diff) | |
| download | libaom-8cd9950a30d7123f94f31f64c35a1610843b052a.tar.gz | |
resolve merge conflicts of 26957fb8e6b761837a499431d79ffcc7b4be9af4 to rvc-dev am: 4e1c2a54e6android-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libaom/+/12778800
Change-Id: I4d9633a26054aa427c4f75a8b61a2f580221cbd9
| -rw-r--r-- | README.android | 4 | ||||
| -rw-r--r-- | README.version | 18 | ||||
| -rw-r--r-- | libaom/av1/decoder/obu.c | 12 |
3 files changed, 19 insertions, 15 deletions
diff --git a/README.android b/README.android index 668d27f25..2fad782be 100644 --- a/README.android +++ b/README.android @@ -4,9 +4,9 @@ Version: v1.0.0 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 95519e8c3..8c3c02fbd 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 ac66df56e..f34f30efc 100644 --- a/libaom/av1/decoder/obu.c +++ b/libaom/av1/decoder/obu.c @@ -769,6 +769,18 @@ int aom_decode_frame_from_obus(struct AV1Decoder *pbi, const uint8_t *data, 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)) { |