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

Commit 4807106b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Better return value checking" am: 8fc16d0e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2377385



Change-Id: Ie4620834d7b1e8d939b89276360535243ae678a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c32b186e 8fc16d0e

cmds/stagefright/SineSource.cpp

+4 −1
Original line number Diff line number Diff line
@@ -63,12 +63,15 @@ status_t SineSource::read( 
        MediaBufferBase **out, const ReadOptions * /* options */) {

    *out = NULL;



    MediaBufferBase *buffer;

    MediaBufferBase *buffer = nullptr;

    status_t err = mGroup->acquire_buffer(&buffer);



    if (err != OK) {

        return err;

    }

    if (buffer == nullptr) {

        return AMEDIA_ERROR_UNKNOWN;

    }



    size_t frameSize = mNumChannels * sizeof(int16_t);

    size_t numFramesPerBuffer = buffer->size() / frameSize;

cmds/stagefright/record.cpp

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ public: 
        if (err != OK) {

            return err;

        }

        if (buffer == nullptr) {

            return AMEDIA_ERROR_UNKNOWN;

        }



        char x = (char)((double)rand() / RAND_MAX * 255);

        memset((*buffer)->data(), x, mSize);

media/module/extractors/aac/AACExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -310,9 +310,9 @@ media_status_t AACSource::read( 
        return AMEDIA_ERROR_END_OF_STREAM;

    }



    MediaBufferHelper *buffer;

    MediaBufferHelper *buffer = nullptr;

    status_t err = mBufferGroup->acquire_buffer(&buffer);

    if (err != OK) {

    if (err != OK || buffer == nullptr) {

        return AMEDIA_ERROR_UNKNOWN;

    }

media/module/extractors/amr/AMRExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -341,9 +341,9 @@ media_status_t AMRSource::read( 
        return AMEDIA_ERROR_MALFORMED;

    }



    MediaBufferHelper *buffer;

    MediaBufferHelper *buffer = nullptr;

    status_t err = mBufferGroup->acquire_buffer(&buffer);

    if (err != OK) {

    if (err != OK || buffer == nullptr) {

        return AMEDIA_ERROR_UNKNOWN;

    }

media/module/extractors/flac/FLACExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -614,9 +614,9 @@ MediaBufferHelper *FLACParser::readBuffer(bool doSeek, FLAC__uint64 sample) 
    }

    // acquire a media buffer

    CHECK(mGroup != NULL);

    MediaBufferHelper *buffer;

    MediaBufferHelper *buffer = nullptr;

    status_t err = mGroup->acquire_buffer(&buffer);

    if (err != OK) {

    if (err != OK || buffer == nullptr) {

        return NULL;

    }

    const size_t bufferSize = blocksize * getChannels() * getOutputSampleSize();