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

Commit d781906b authored by Jeffrey Kardatzke's avatar Jeffrey Kardatzke Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect buffer size in NuPlayer" am: aaaad880 am: 35c6d786 

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



Change-Id: I3a3a3e3fc965fd7a5396f71284b5907314fe7891
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 295eb472 35c6d786

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -1104,14 +1104,14 @@ bool NuPlayer::Decoder::onInputBufferFetched(const sp<AMessage> &msg) { 
                        static_cast<MediaBufferHolder*>(holder.get())->mediaBuffer() : nullptr;

                        static_cast<MediaBufferHolder*>(holder.get())->mediaBuffer() : nullptr;

                }

                }

                if (mediaBuf != NULL) {

                if (mediaBuf != NULL) {

                    if (mediaBuf->size() > codecBuffer->capacity()) {

                    if (mediaBuf->range_length() > codecBuffer->capacity()) {

                        handleError(ERROR_BUFFER_TOO_SMALL);

                        handleError(ERROR_BUFFER_TOO_SMALL);

                        mDequeuedInputBuffers.push_back(bufferIx);

                        mDequeuedInputBuffers.push_back(bufferIx);

                        return false;

                        return false;

                    }

                    }





                    codecBuffer->setRange(0, mediaBuf->size());

                    codecBuffer->setRange(0, mediaBuf->range_length());

                    memcpy(codecBuffer->data(), mediaBuf->data(), mediaBuf->size());

                    memcpy(codecBuffer->data(), mediaBuf->data(), mediaBuf->range_length());





                    MetaDataBase &meta_data = mediaBuf->meta_data();

                    MetaDataBase &meta_data = mediaBuf->meta_data();

                    cryptInfo = NuPlayerDrm::getSampleCryptoInfo(meta_data);

                    cryptInfo = NuPlayerDrm::getSampleCryptoInfo(meta_data);