diff options
| author | Gloria Wang <gwang@google.com> | 2010-10-29 10:09:47 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-11-01 16:12:16 -0700 |
| commit | eab18ea34dbd36b3f4e117d51ce5c1ea4b9f4fc4 (patch) | |
| tree | 16b2f4e6cddb7126e9d014e3fa902d4151bb2ba2 | |
| parent | b4ae2f1ba419212224d53db81c46ad242bebd17b (diff) | |
| download | frameworks_base-eab18ea34dbd36b3f4e117d51ce5c1ea4b9f4fc4.zip frameworks_base-eab18ea34dbd36b3f4e117d51ce5c1ea4b9f4fc4.tar.gz frameworks_base-eab18ea34dbd36b3f4e117d51ce5c1ea4b9f4fc4.tar.bz2 | |
- Move the business rule management down to DRM agents.
- Do not register DRM sniffer because drmserver is not enabled.
Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 29 | ||||
| -rw-r--r-- | media/libstagefright/DataSource.cpp | 9 |
2 files changed, 14 insertions, 24 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 7bbc9eb..9789e36 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -288,14 +288,9 @@ status_t AwesomePlayer::setDataSource_l( } dataSource->getDrmInfo(&mDecryptHandle, &mDrmManagerClient); - if (mDecryptHandle != NULL) { - if (RightsStatus::RIGHTS_VALID == mDecryptHandle->status) { - if (DecryptApiType::CONTAINER_BASED == mDecryptHandle->decryptApiType) { - mDrmManagerClient->consumeRights(mDecryptHandle, Action::PLAY, true); - } - } else { - notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE); - } + if (mDecryptHandle != NULL + && RightsStatus::RIGHTS_VALID != mDecryptHandle->status) { + notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE); } return setDataSource_l(extractor); @@ -328,11 +323,6 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) { } mExtractorFlags = extractor->flags(); - if (mDecryptHandle != NULL) { - if (DecryptApiType::ELEMENTARY_STREAM_BASED == mDecryptHandle->decryptApiType) { - mDrmManagerClient->consumeRights(mDecryptHandle, Action::PLAY, true); - } - } return OK; } @@ -346,8 +336,6 @@ void AwesomePlayer::reset_l() { if (mDecryptHandle != NULL) { mDrmManagerClient->setPlaybackStatus(mDecryptHandle, Playback::STOP, 0); - mDrmManagerClient->consumeRights(mDecryptHandle, - Action::PLAY, false); mDecryptHandle = NULL; mDrmManagerClient = NULL; } @@ -1190,14 +1178,9 @@ status_t AwesomePlayer::finishSetDataSource_l() { } dataSource->getDrmInfo(&mDecryptHandle, &mDrmManagerClient); - if (mDecryptHandle != NULL) { - if (RightsStatus::RIGHTS_VALID == mDecryptHandle->status) { - if (DecryptApiType::CONTAINER_BASED == mDecryptHandle->decryptApiType) { - mDrmManagerClient->consumeRights(mDecryptHandle, Action::PLAY, true); - } - } else { - notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE); - } + if (mDecryptHandle != NULL + && RightsStatus::RIGHTS_VALID != mDecryptHandle->status) { + notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE); } if (dataSource->flags() & DataSource::kWantsPrefetching) { diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index d7dd4e5..23c4790 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -28,6 +28,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) { @@ -95,7 +97,12 @@ void DataSource::RegisterDefaultSniffers() { RegisterSniffer(SniffAMR); RegisterSniffer(SniffWAV); RegisterSniffer(SniffOgg); - RegisterSniffer(SniffDRM); + + char value[PROPERTY_VALUE_MAX]; + if (property_get("drm.service.enabled", value, NULL) + && (!strcmp(value, "1") || !strcasecmp(value, "true"))) { + RegisterSniffer(SniffDRM); + } } // static |