diff options
| author | Andreas Huber <andih@google.com> | 2011-01-19 11:24:39 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-01-19 11:24:39 -0800 |
| commit | 0cf2616faca9110a761f9d85c7e6cc5c1a5c689f (patch) | |
| tree | e76c999bd75aa3d437afe4e691a57484848d700c /media/libstagefright | |
| parent | 069ee21a2012e0b6fd355253ea81a84ea11138d2 (diff) | |
| download | frameworks_base-0cf2616faca9110a761f9d85c7e6cc5c1a5c689f.zip frameworks_base-0cf2616faca9110a761f9d85c7e6cc5c1a5c689f.tar.gz frameworks_base-0cf2616faca9110a761f9d85c7e6cc5c1a5c689f.tar.bz2 | |
Return a runtime error if decryption fails instead of asserting.
Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 5979be6..e731080 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -493,8 +493,14 @@ rinse_repeat: CHECK(buffer != NULL); - CHECK_EQ((status_t)OK, - decryptBuffer(mSeqNumber - firstSeqNumberInPlaylist, buffer)); + err = decryptBuffer(mSeqNumber - firstSeqNumberInPlaylist, buffer); + + if (err != OK) { + LOGE("decryptBuffer failed w/ error %d", err); + + mDataSource->queueEOS(err); + return; + } if (buffer->size() == 0 || buffer->data()[0] != 0x47) { // Not a transport stream??? |