Merge "HTTPLiveSource: fix non timed id3 track selection" into mnc-dev (89cf8946) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp

+11 −13

Original line number	Diff line number	Diff line
		@@ -161,13 +161,12 @@ status_t NuPlayer::HTTPLiveSource::selectTrack(size_t trackIndex, bool select, i

		status_t err = INVALID_OPERATION;
		bool postFetchMsg = false, isSub = false;
		if (trackIndex != mLiveSession->getTrackCount() - 1) {
		if (!mHasMetadata \|\| trackIndex != mLiveSession->getTrackCount() - 1) {
		err = mLiveSession->selectTrack(trackIndex, select);
		postFetchMsg = select;
		isSub = true;
		} else {
		// metadata track
		if (mHasMetadata) {
		// metadata track; i.e. (mHasMetadata && trackIndex == mLiveSession->getTrackCount() - 1)
		if (mMetadataSelected && !select) {
		err = OK;
		} else if (!mMetadataSelected && select) {
		@@ -179,7 +178,6 @@ status_t NuPlayer::HTTPLiveSource::selectTrack(size_t trackIndex, bool select, i

		mMetadataSelected = select;
		}
		}

		if (err == OK) {
		int32_t &generation = isSub ? mFetchSubtitleDataGeneration : mFetchMetaDataGeneration;