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

Commit ba9a0506 authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "Verbosity and increase buffer limit"

parents a90aa4e3 6252c875

media/libmedia/IMediaSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -368,13 +368,13 @@ status_t BnMediaSource::onTransact( 
                        ALOGV("Use shared memory: %zu", length);

                        transferBuf = buf;

                    } else {

                        ALOGD("Large buffer %zu without IMemory!", length);

                        ALOGV("Large buffer %zu without IMemory!", length);

                        ret = mGroup->acquire_buffer(

                                (MediaBufferBase **)&transferBuf, false /* nonBlocking */, length);

                        if (ret != OK

                                || transferBuf == nullptr

                                || transferBuf->mMemory == nullptr) {

                            ALOGW("Failed to acquire shared memory, size %zu, ret %d",

                            ALOGV("Failed to acquire shared memory, size %zu, ret %d",

                                    length, ret);

                            if (transferBuf != nullptr) {

                                transferBuf->release();

media/libmedia/include/media/IMediaSource.h

+2 −1
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ public: 
        return false;

    }



    static const size_t kBinderMediaBuffers = 4; // buffers managed by BnMediaSource

    // align buffer count with video request size in NuMediaExtractor::selectTrack()

    static const size_t kBinderMediaBuffers = 8; // buffers managed by BnMediaSource

    static const size_t kTransferSharedAsSharedThreshold = 4 * 1024;  // if >= shared, else inline

    static const size_t kTransferInlineAsSharedThreshold = 8 * 1024; // if >= shared, else inline

    static const size_t kInlineMaxTransfer = 64 * 1024; // Binder size limited to BINDER_VM_SIZE.