diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-02 14:05:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-02 14:05:13 -0700 |
| commit | cf393faaa871333496a63c13196fdbc0f2bd9118 (patch) | |
| tree | e28d98df57c560119ad98e90c1b3cf939d168583 | |
| parent | fcea62a64cba3422ae7d0c1eeee529fd49485984 (diff) | |
| parent | 35a4f21bd6c6aa82b88e53798131f0a0ff6976c4 (diff) | |
| download | frameworks_base-cf393faaa871333496a63c13196fdbc0f2bd9118.zip frameworks_base-cf393faaa871333496a63c13196fdbc0f2bd9118.tar.gz frameworks_base-cf393faaa871333496a63c13196fdbc0f2bd9118.tar.bz2 | |
Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp
| -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 6eeab05..e0bcdc3 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -301,14 +301,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); @@ -376,11 +371,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; } @@ -394,8 +384,6 @@ void AwesomePlayer::reset_l() { if (mDecryptHandle != NULL) { mDrmManagerClient->setPlaybackStatus(mDecryptHandle, Playback::STOP, 0); - mDrmManagerClient->consumeRights(mDecryptHandle, - Action::PLAY, false); mDecryptHandle = NULL; mDrmManagerClient = NULL; } @@ -1607,14 +1595,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); } return setDataSource_l(extractor); diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index be23c60..0b8997c 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -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 |