diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-01 15:53:16 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-11-05 10:33:58 -0700 |
| commit | b371426ce4cf2fa6d8c3d1903b61322feb165d35 (patch) | |
| tree | ce2c36b33cf39e393b68d5feba1cb03d7ef0ed53 /media/libstagefright/FileSource.cpp | |
| parent | a935bc4696e4060c362b0f6913cc220331667a35 (diff) | |
| download | frameworks_av-b371426ce4cf2fa6d8c3d1903b61322feb165d35.zip frameworks_av-b371426ce4cf2fa6d8c3d1903b61322feb165d35.tar.gz frameworks_av-b371426ce4cf2fa6d8c3d1903b61322feb165d35.tar.bz2 | |
Add support for WV DRM
Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
Diffstat (limited to 'media/libstagefright/FileSource.cpp')
| -rw-r--r-- | media/libstagefright/FileSource.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/libstagefright/FileSource.cpp b/media/libstagefright/FileSource.cpp index e4f9a47..1c1a9c5 100644 --- a/media/libstagefright/FileSource.cpp +++ b/media/libstagefright/FileSource.cpp @@ -55,9 +55,6 @@ FileSource::~FileSource() { delete[] mDrmBuf; mDrmBuf = NULL; } - if (mDecryptHandle != NULL) { - mDrmManagerClient->closeDecryptSession(mDecryptHandle); - } } status_t FileSource::initCheck() const { @@ -113,7 +110,11 @@ status_t FileSource::getSize(off_t *size) { } DecryptHandle* FileSource::DrmInitialization(DrmManagerClient* client) { + if (client == NULL) { + return NULL; + } mDrmManagerClient = client; + if (mDecryptHandle == NULL) { mDecryptHandle = mDrmManagerClient->openDecryptSession( mFd, mOffset, mLength); |