Merge "libmediaplayerservice: queue discontinuity when seek to eos." into mnc-dev (5a8422a0) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+17 −11

Original line number	Diff line number	Diff line
		@@ -1510,17 +1510,7 @@ void NuPlayer::GenericSource::readBuffer(
		mVideoTimeUs = timeUs;
		}

		// formatChange && seeking: track whose source is changed during selection
		// formatChange && !seeking: track whose source is not changed during selection
		// !formatChange: normal seek
		if ((seeking \|\| formatChange)
		&& (trackType == MEDIA_TRACK_TYPE_AUDIO
		\|\| trackType == MEDIA_TRACK_TYPE_VIDEO)) {
		ATSParser::DiscontinuityType type = (formatChange && seeking)
		? ATSParser::DISCONTINUITY_FORMATCHANGE
		: ATSParser::DISCONTINUITY_NONE;
		track->mPackets->queueDiscontinuity( type, NULL, true /* discard */);
		}
		queueDiscontinuityIfNeeded(seeking, formatChange, trackType, track);

		sp<ABuffer> buffer = mediaBufferToABuffer(
		mbuf, trackType, seekTimeUs, actualTimeUs);
		@@ -1538,10 +1528,26 @@ void NuPlayer::GenericSource::readBuffer(
		false /* discard */);
		#endif
		} else {
		queueDiscontinuityIfNeeded(seeking, formatChange, trackType, track);
		track->mPackets->signalEOS(err);
		break;
		}
		}
		}

		void NuPlayer::GenericSource::queueDiscontinuityIfNeeded(
		bool seeking, bool formatChange, media_track_type trackType, Track *track) {
		// formatChange && seeking: track whose source is changed during selection
		// formatChange && !seeking: track whose source is not changed during selection
		// !formatChange: normal seek
		if ((seeking \|\| formatChange)
		&& (trackType == MEDIA_TRACK_TYPE_AUDIO
		\|\| trackType == MEDIA_TRACK_TYPE_VIDEO)) {
		ATSParser::DiscontinuityType type = (formatChange && seeking)
		? ATSParser::DISCONTINUITY_FORMATCHANGE
		: ATSParser::DISCONTINUITY_NONE;
		track->mPackets->queueDiscontinuity(type, NULL /* extra /, true / discard */);
		}
		}

		} // namespace android

media/libmediaplayerservice/nuplayer/GenericSource.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -200,6 +200,9 @@ private:
		media_track_type trackType,
		int64_t seekTimeUs = -1ll, int64_t *actualTimeUs = NULL, bool formatChange = false);

		void queueDiscontinuityIfNeeded(
		bool seeking, bool formatChange, media_track_type trackType, Track *track);

		void schedulePollBuffering();
		void cancelPollBuffering();
		void restartPollBuffering();