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

Commit 5f80c6f5 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Handle error result from DrmManagerClient correctly" am: f0d7854e am: b84a4f9d 

am: 3f27a44e

* commit '3f27a44e':
  Handle error result from DrmManagerClient correctly
parents f4284584 3f27a44e

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
@@ -171,7 +171,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;
@@ -182,7 +182,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 {