Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bfb9ea1 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 71bb6a2a: Merge "Return a runtime error if decryption fails instead of... 

am 71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb

* commit '71bb6a2a3eb668fe7459cd8fff1f65a15804c3be':
  Return a runtime error if decryption fails instead of asserting.
parents d64d6261 88b34891

media/libstagefright/httplive/LiveSession.cpp

+8 −2
Original line number Diff line number Diff line
@@ -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???