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

Commit f0d7854e authored by Marco Nelissen's avatar Marco Nelissen Committed by Gerrit Code Review
Browse files

Merge "Handle error result from DrmManagerClient correctly"

parents 9cd5f811 d066bc8f

include/media/stagefright/FileSource.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ private: 
    sp<DecryptHandle> mDecryptHandle;

    DrmManagerClient *mDrmManagerClient;

    int64_t mDrmBufOffset;

    size_t mDrmBufSize;

    ssize_t mDrmBufSize;

    unsigned char *mDrmBuf;



    ssize_t readAtDRM(off64_t offset, void *data, size_t size);

media/libstagefright/FileSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ ssize_t FileSource::readAtDRM(off64_t offset, void *data, size_t size) { 
    }



    if (mDrmBuf != NULL && mDrmBufSize > 0 && (offset + mOffset) >= mDrmBufOffset

            && (offset + mOffset + size) <= (mDrmBufOffset + mDrmBufSize)) {

            && (offset + mOffset + size) <= static_cast<size_t>(mDrmBufOffset + mDrmBufSize)) {

        /* Use buffered data */

        memcpy(data, (void*)(mDrmBuf+(offset+mOffset-mDrmBufOffset)), size);

        return size;
@@ -177,7 +177,7 @@ ssize_t FileSource::readAtDRM(off64_t offset, void *data, size_t size) { 
                DRM_CACHE_SIZE, offset + mOffset);

        if (mDrmBufSize > 0) {

            int64_t dataRead = 0;

            dataRead = size > mDrmBufSize ? mDrmBufSize : size;

            dataRead = size > static_cast<size_t>(mDrmBufSize) ? mDrmBufSize : size;

            memcpy(data, (void*)mDrmBuf, dataRead);

            return dataRead;

        } else {