Merge "- register DRM sniffer only when drmserver is up - notify DRM agents... (88c647bb) · Commits · e / os / android_frameworks_av

media/libstagefright/AwesomePlayer.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -1192,6 +1192,13 @@ void AwesomePlayer::finishSeekIfNecessary(int64_t videoTimeUs) {
		mFlags \|= FIRST_FRAME;
		mSeeking = false;
		mSeekNotificationSent = false;

		if (mDecryptHandle != NULL) {
		mDrmManagerClient->setPlaybackStatus(mDecryptHandle,
		Playback::PAUSE, 0);
		mDrmManagerClient->setPlaybackStatus(mDecryptHandle,
		Playback::START, videoTimeUs / 1000);
		}
		}

		void AwesomePlayer::onVideoEvent() {
		@@ -1295,13 +1302,6 @@ void AwesomePlayer::onVideoEvent() {

		TimeSource *ts = (mFlags & AUDIO_AT_EOS) ? &mSystemTimeSource : mTimeSource;

		if (mDecryptHandle != NULL) {
		mDrmManagerClient->setPlaybackStatus(mDecryptHandle,
		Playback::PAUSE, 0);
		mDrmManagerClient->setPlaybackStatus(mDecryptHandle,
		Playback::START, timeUs / 1000);
		}

		if (mFlags & FIRST_FRAME) {
		mFlags &= ~FIRST_FRAME;

+8 −1

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@
		#include <media/stagefright/MediaErrors.h>
		#include <utils/String8.h>

		#include <cutils/properties.h>

		namespace android {

		bool DataSource::getUInt16(off_t offset, uint16_t *x) {
		@@ -105,7 +107,12 @@ void DataSource::RegisterDefaultSniffers() {
		RegisterSniffer(SniffAMR);
		RegisterSniffer(SniffMPEG2TS);
		RegisterSniffer(SniffMP3);
		//RegisterSniffer(SniffDRM);

		char value[PROPERTY_VALUE_MAX];
		if (property_get("drm.service.enabled", value, NULL)
		&& (!strcmp(value, "1") \|\| !strcasecmp(value, "true"))) {
		RegisterSniffer(SniffDRM);
		}
		}

		// static