Commit c47d1d18 authored Mar 22, 2019 by Ray Essick

handle empty NAL when looking for HEVC layerId

parseHEVCLayerId() would CHECK() if there was no data, we now return
that there was no valid HEVC layer info. This was triggered by changes
so a bad NAL would be skipped rather than aborting.

Bug: 127833120
Bug: 122749422
Test: re-ran CTS
Change-Id: I239697f9d1f77995f9ccf5e8c77cfaa01994e326

parent b9df1597

media/extractors/mp4/MPEG4Extractor.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -5318,7 +5318,9 @@ size_t MPEG4Source::parseNALSize(const uint8_t *data) const {
		}

		int32_t MPEG4Source::parseHEVCLayerId(const uint8_t *data, size_t size) {
		CHECK(data != nullptr && size >= (mNALLengthSize + 2));
		if (data == nullptr \|\| size < mNALLengthSize + 2) {
		return -1;
		}

		// HEVC NAL-header (16-bit)
		// 1 6 6 3