diff options
| author | Gloria Wang <gwang@google.com> | 2011-04-29 10:44:46 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-04-29 11:01:36 -0700 |
| commit | 7340743ce30766af6334bbd9acf813eb66dd5a60 (patch) | |
| tree | c31894af54e1767278fa9d7ff856753f8c6ca68d /media/libstagefright/DRMExtractor.cpp | |
| parent | d0675ede6de2249256d20271a19ccbf9f11745b8 (diff) | |
| download | frameworks_av-7340743ce30766af6334bbd9acf813eb66dd5a60.zip frameworks_av-7340743ce30766af6334bbd9acf813eb66dd5a60.tar.gz frameworks_av-7340743ce30766af6334bbd9acf813eb66dd5a60.tar.bz2 | |
Add DRM errors in the DRM frameworks to MediaErrors also.
For bug 4350156.
Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
Diffstat (limited to 'media/libstagefright/DRMExtractor.cpp')
| -rw-r--r-- | media/libstagefright/DRMExtractor.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/media/libstagefright/DRMExtractor.cpp b/media/libstagefright/DRMExtractor.cpp index c4ed516..1f3d581 100644 --- a/media/libstagefright/DRMExtractor.cpp +++ b/media/libstagefright/DRMExtractor.cpp @@ -146,18 +146,14 @@ status_t DRMSource::read(MediaBuffer **buffer, const ReadOptions *options) { DrmBuffer *pDecryptedDrmBuffer = &decryptedDrmBuffer; if ((err = mDrmManagerClient->decrypt(mDecryptHandle, mTrackId, - &encryptedDrmBuffer, &pDecryptedDrmBuffer)) != DRM_NO_ERROR) { + &encryptedDrmBuffer, &pDecryptedDrmBuffer)) != NO_ERROR) { if (decryptedDrmBuffer.data) { delete [] decryptedDrmBuffer.data; decryptedDrmBuffer.data = NULL; } - if (err == DRM_ERROR_LICENSE_EXPIRED) { - return ERROR_NO_LICENSE; - } else { - return ERROR_IO; - } + return err; } CHECK(pDecryptedDrmBuffer == &decryptedDrmBuffer); |