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 | 88b348910a607ae399bcd693dd42a231d98da2c9 (patch) | |
| tree | 25c690dee1142a36924392b7899e447f663129f7 /media/libstagefright/httplive | |
| parent | 662cb2487ed513ff3ac26b104b5715c01d78419c (diff) | |
| download | frameworks_av-88b348910a607ae399bcd693dd42a231d98da2c9.zip frameworks_av-88b348910a607ae399bcd693dd42a231d98da2c9.tar.gz frameworks_av-88b348910a607ae399bcd693dd42a231d98da2c9.tar.bz2 | |
Return a runtime error if decryption fails instead of asserting.
Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
Diffstat (limited to 'media/libstagefright/httplive')
| -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??? |