Merge \"HLS: allow audio/subtitles to appear after bitrate variants\" into nyc-dev (2dd12498) · Commits · e / os / android_frameworks_av

media/libstagefright/httplive/M3UParser.cpp

+16 −9

Original line number	Diff line number	Diff line
		@@ -701,6 +701,22 @@ status_t M3UParser::parse(const void *_data, size_t size) {
		mLastSeqNumber = mFirstSeqNumber + mItems.size() - 1;
		}

		for (size_t i = 0; i < mItems.size(); ++i) {
		sp<AMessage> meta = mItems.itemAt(i).mMeta;
		const char *keys[] = {"audio", "video", "subtitles"};
		for (size_t j = 0; j < sizeof(keys) / sizeof(const char *); ++j) {
		AString groupID;
		if (meta->findString(keys[j], &groupID)) {
		ssize_t groupIndex = mMediaGroups.indexOfKey(groupID);
		if (groupIndex < 0) {
		ALOGE("Undefined media group '%s' referenced in stream info.",
		groupID.c_str());
		return ERROR_MALFORMED;
		}
		}
		}
		}

		return OK;
		}

		@@ -873,15 +889,6 @@ status_t M3UParser::parseStreamInf(
		}

		const AString &groupID = unquoteString(val);
		ssize_t groupIndex = mMediaGroups.indexOfKey(groupID);

		if (groupIndex < 0) {
		ALOGE("Undefined media group '%s' referenced in stream info.",
		groupID.c_str());

		return ERROR_MALFORMED;
		}

		key.tolower();
		if (meta->get() == NULL) {
		*meta = new AMessage;