diff options
| author | Gloria Wang <gwang@google.com> | 2011-02-08 14:12:02 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-08 14:12:02 -0800 |
| commit | 6b8ef4762a26cb828e0a597719764d3d0404e2b1 (patch) | |
| tree | 4dd7682f0152b62efbdaaee6abacd55c72029394 /media | |
| parent | eeffad65d2db4879593c1d4806824ef5b4dcb3e1 (diff) | |
| parent | 8f64134f749e4f7861a08a3063450fc714c4651d (diff) | |
| download | frameworks_av-6b8ef4762a26cb828e0a597719764d3d0404e2b1.zip frameworks_av-6b8ef4762a26cb828e0a597719764d3d0404e2b1.tar.gz frameworks_av-6b8ef4762a26cb828e0a597719764d3d0404e2b1.tar.bz2 | |
Merge "Add more check before using the DRM manager client."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 9 | ||||
| -rw-r--r-- | media/libstagefright/DRMExtractor.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/FileSource.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/NuHTTPDataSource.cpp | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 5a43c6a..2f5a202 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -291,9 +291,11 @@ status_t AwesomePlayer::setDataSource_l( } dataSource->getDrmInfo(&mDecryptHandle, &mDrmManagerClient); - if (mDecryptHandle != NULL - && RightsStatus::RIGHTS_VALID != mDecryptHandle->status) { - notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE); + if (mDecryptHandle != NULL) { + CHECK(mDrmManagerClient); + if (RightsStatus::RIGHTS_VALID != mDecryptHandle->status) { + notifyListener_l(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, ERROR_NO_LICENSE); + } } return setDataSource_l(extractor); @@ -1738,6 +1740,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { dataSource->getDrmInfo(&mDecryptHandle, &mDrmManagerClient); if (mDecryptHandle != NULL) { + CHECK(mDrmManagerClient); if (RightsStatus::RIGHTS_VALID == mDecryptHandle->status) { if (DecryptApiType::WV_BASED == mDecryptHandle->decryptApiType) { LOGD("Setting mCachedSource to NULL for WVM\n"); diff --git a/media/libstagefright/DRMExtractor.cpp b/media/libstagefright/DRMExtractor.cpp index 4b83568..647cf43 100644 --- a/media/libstagefright/DRMExtractor.cpp +++ b/media/libstagefright/DRMExtractor.cpp @@ -79,6 +79,7 @@ DRMSource::DRMSource(const sp<MediaSource> &mediaSource, mTrackId(trackId), mNALLengthSize(0), mWantsNALFragments(false) { + CHECK(mDrmManagerClient); mDrmManagerClient->initializeDecryptUnit( mDecryptHandle, trackId, ipmpBox); diff --git a/media/libstagefright/FileSource.cpp b/media/libstagefright/FileSource.cpp index b8e75fd..02a78c9 100644 --- a/media/libstagefright/FileSource.cpp +++ b/media/libstagefright/FileSource.cpp @@ -63,6 +63,7 @@ FileSource::~FileSource() { if (mDecryptHandle != NULL) { // To release mDecryptHandle + CHECK(mDrmManagerClient); mDrmManagerClient->closeDecryptSession(mDecryptHandle); mDecryptHandle = NULL; } diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp index af04f93..0376e1c 100644 --- a/media/libstagefright/NuHTTPDataSource.cpp +++ b/media/libstagefright/NuHTTPDataSource.cpp @@ -81,6 +81,7 @@ NuHTTPDataSource::NuHTTPDataSource() NuHTTPDataSource::~NuHTTPDataSource() { if (mDecryptHandle != NULL) { // To release mDecryptHandle + CHECK(mDrmManagerClient); mDrmManagerClient->closeDecryptSession(mDecryptHandle); mDecryptHandle = NULL; } |