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

Commit 454b5603 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4759746 from 70376b12 to pi-release 

Change-Id: I123dd5d91c79b309216a3e37dcfcce2f518e74fa
parents d2ed1224 70376b12

media/ndk/NdkMediaDrm.cpp

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ media_status_t AMediaDrm_setOnEventListener(AMediaDrm *mObj, AMediaDrmEventListe 


static bool findId(AMediaDrm *mObj, const AMediaDrmByteArray &id, List<idvec_t>::iterator &iter) {

    for (iter = mObj->mIds.begin(); iter != mObj->mIds.end(); ++iter) {

        if (iter->array() == id.ptr && iter->size() == id.length) {

        if (id.length == iter->size() && memcmp(iter->array(), id.ptr, iter->size()) == 0) {

            return true;

        }

    }

services/audioflinger/RecordTracks.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public: 


    virtual bool        isFastTrack() const { return (mFlags & AUDIO_INPUT_FLAG_FAST) != 0; }



            void        setSilenced(bool silenced) { mSilenced = silenced; }

            void        setSilenced(bool silenced) { if (!isPatchTrack()) mSilenced = silenced; }

            bool        isSilenced() const { return mSilenced; }



            status_t    getActiveMicrophones(std::vector<media::MicrophoneInfo>* activeMicrophones);

services/audioflinger/Threads.cpp

+10 −5
Original line number Diff line number Diff line
@@ -6614,11 +6614,16 @@ reacquire_wakelock: 
                if (framesRead != OVERRUN) break;

            }



            // since pipe is non-blocking, simulate blocking input by waiting for 1/2 of

            // buffer size or at least for 20ms.

            size_t sleepFrames = max(

                    min(mPipeFramesP2, mRsmpInFramesP2) / 2, FMS_20 * mSampleRate / 1000);

            if (framesRead <= (ssize_t) sleepFrames) {

            const ssize_t availableToRead = mPipeSource->availableToRead();

            if (availableToRead >= 0) {

                // PipeSource is the master clock.  It is up to the AudioRecord client to keep up.

                LOG_ALWAYS_FATAL_IF((size_t)availableToRead > mPipeFramesP2,

                        "more frames to read than fifo size, %zd > %zu",

                        availableToRead, mPipeFramesP2);

                const size_t pipeFramesFree = mPipeFramesP2 - availableToRead;

                const size_t sleepFrames = min(pipeFramesFree, mRsmpInFramesP2) / 2;

                ALOGVV("mPipeFramesP2:%zu mRsmpInFramesP2:%zu sleepFrames:%zu availableToRead:%zd",

                        mPipeFramesP2, mRsmpInFramesP2, sleepFrames, availableToRead);

                sleepUs = (sleepFrames * 1000000LL) / mSampleRate;

            }

            if (framesRead < 0) {

services/audioflinger/Tracks.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1663,7 +1663,8 @@ AudioFlinger::RecordThread::RecordTrack::RecordTrack( 
        mFramesToDrop(0),

        mResamplerBufferProvider(NULL), // initialize in case of early constructor exit

        mRecordBufferConverter(NULL),

        mFlags(flags)

        mFlags(flags),

        mSilenced(false)

{

    if (mCblk == NULL) {

        return;

services/camera/libcameraservice/device3/Camera3Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4325,9 +4325,9 @@ bool Camera3Device::RequestThread::sendRequestsBatch() { 
    uint32_t numRequestProcessed = 0;

    for (size_t i = 0; i < batchSize; i++) {

        requests[i] = &mNextRequests.editItemAt(i).halRequest;

        ATRACE_ASYNC_BEGIN("frame capture", mNextRequests[i].halRequest.frame_number);

    }



    ATRACE_ASYNC_BEGIN("batch frame capture", mNextRequests[0].halRequest.frame_number);

    res = mInterface->processBatchCaptureRequests(requests, &numRequestProcessed);



    bool triggerRemoveFailed = false;