Merge "Notify the playback status to DRM agents before the playback starts" (c533edc9) · Commits · e / os / android_frameworks_av

media/libstagefright/AwesomePlayer.cpp

+12 −7

Original line number	Diff line number	Diff line
		@@ -526,6 +526,13 @@ status_t AwesomePlayer::play_l() {

		bool deferredAudioSeek = false;

		if (mDecryptHandle != NULL) {
		int64_t position;
		getPosition(&position);
		mDrmManagerClient->setPlaybackStatus(mDecryptHandle,
		Playback::START, position / 1000);
		}

		if (mAudioSource != NULL) {
		if (mAudioPlayer == NULL) {
		if (mAudioSink != NULL) {
		@@ -543,6 +550,11 @@ status_t AwesomePlayer::play_l() {

		mFlags &= ~(PLAYING \| FIRST_FRAME);

		if (mDecryptHandle != NULL) {
		mDrmManagerClient->setPlaybackStatus(mDecryptHandle,
		Playback::STOP, 0);
		}

		return err;
		}

		@@ -582,13 +594,6 @@ status_t AwesomePlayer::play_l() {
		seekTo_l(0);
		}

		if (mDecryptHandle != NULL) {
		int64_t position;
		getPosition(&position);
		mDrmManagerClient->setPlaybackStatus(mDecryptHandle,
		Playback::START, position / 1000);
		}

		return OK;
		}