Merge "handle empty NAL when looking for HEVC layerId" (9c29f6b2) · Commits · e / os / android_frameworks_av

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