[automerger] M3UParser: detect variant streams without EXT-X-STREAM-INF am:... (6e2df031) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/httplive/M3UParser.cpp

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -658,10 +658,13 @@ status_t M3UParser::parse(const void *_data, size_t size) {
	}		}

	if (!line.startsWith("#")) {		if (!line.startsWith("#")) {
			if (itemMeta == NULL) {
			ALOGV("itemMeta == NULL");
			return ERROR_MALFORMED;
			}
	if (!mIsVariantPlaylist) {		if (!mIsVariantPlaylist) {
	int64_t durationUs;		int64_t durationUs;
	if (itemMeta == NULL		if (!itemMeta->findInt64("durationUs", &durationUs)) {
	\|\| !itemMeta->findInt64("durationUs", &durationUs)) {
	return ERROR_MALFORMED;		return ERROR_MALFORMED;
	}		}
	itemMeta->setInt32("discontinuity-sequence",		itemMeta->setInt32("discontinuity-sequence",