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

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

Snap for 6338078 from f4cabacb to rvc-release 

Change-Id: I708d5469091a0593b10ea4cdbdeca43dc9125072
parents f4377ba8 f4cabacb

drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp

+5 −0
Original line number Diff line number Diff line
@@ -356,6 +356,11 @@ Return<void> DrmPlugin::provideKeyResponse( 


    Status status = Status::OK;

    bool isOfflineLicense = responseString.find(kOfflineLicense) != std::string::npos;

    if (scopeId.size() < kKeySetIdPrefix.size()) {

        android_errorWriteLog(0x534e4554, "144507096");

        _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, hidl_vec<uint8_t>());

        return Void();

    }

    bool isRelease = (memcmp(scopeId.data(), kKeySetIdPrefix.data(), kKeySetIdPrefix.size()) == 0);

    if (isRelease) {

        keySetId.assign(scopeId.begin(), scopeId.end());

media/codec2/sfplugin/CCodecBuffers.cpp

+10 −4
Original line number Diff line number Diff line
@@ -127,20 +127,26 @@ void OutputBuffers::initSkipCutBuffer( 
    mDelay = delay;

    mPadding = padding;

    mSampleRate = sampleRate;

    setSkipCutBuffer(delay, padding, channelCount);

    mChannelCount = channelCount;

    setSkipCutBuffer(delay, padding);

}



void OutputBuffers::updateSkipCutBuffer(int32_t sampleRate, int32_t channelCount) {

    if (mSkipCutBuffer == nullptr) {

        return;

    }

    if (mSampleRate == sampleRate && mChannelCount == channelCount) {

        return;

    }

    int32_t delay = mDelay;

    int32_t padding = mPadding;

    if (sampleRate != mSampleRate) {

        delay = ((int64_t)delay * sampleRate) / mSampleRate;

        padding = ((int64_t)padding * sampleRate) / mSampleRate;

    }

    setSkipCutBuffer(delay, padding, channelCount);

    mSampleRate = sampleRate;

    mChannelCount = channelCount;

    setSkipCutBuffer(delay, padding);

}



void OutputBuffers::submit(const sp<MediaCodecBuffer> &buffer) {
@@ -153,14 +159,14 @@ void OutputBuffers::transferSkipCutBuffer(const sp<SkipCutBuffer> &scb) { 
    mSkipCutBuffer = scb;

}



void OutputBuffers::setSkipCutBuffer(int32_t skip, int32_t cut, int32_t channelCount) {

void OutputBuffers::setSkipCutBuffer(int32_t skip, int32_t cut) {

    if (mSkipCutBuffer != nullptr) {

        size_t prevSize = mSkipCutBuffer->size();

        if (prevSize != 0u) {

            ALOGD("[%s] Replacing SkipCutBuffer holding %zu bytes", mName, prevSize);

        }

    }

    mSkipCutBuffer = new SkipCutBuffer(skip, cut, channelCount);

    mSkipCutBuffer = new SkipCutBuffer(skip, cut, mChannelCount);

}



// LocalBufferPool

media/codec2/sfplugin/CCodecBuffers.h

+2 −1
Original line number Diff line number Diff line
@@ -228,8 +228,9 @@ private: 
    int32_t mDelay;

    int32_t mPadding;

    int32_t mSampleRate;

    int32_t mChannelCount;



    void setSkipCutBuffer(int32_t skip, int32_t cut, int32_t channelCount);

    void setSkipCutBuffer(int32_t skip, int32_t cut);



    DISALLOW_EVIL_CONSTRUCTORS(OutputBuffers);

};

media/libstagefright/MediaCodecSource.cpp

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ void MediaCodecSource::Puller::pause() { 


void MediaCodecSource::Puller::resume() {

    Mutexed<Queue>::Locked queue(mQueue);

    queue->flush();

    queue->mPaused = false;

}

media/utils/TimeCheck.cpp

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ void TimeCheck::TimeCheckThread::stopMonitoring(nsecs_t endTimeNs) { 
bool TimeCheck::TimeCheckThread::threadLoop()

{

    status_t status = TIMED_OUT;

    const char *tag;

    {

        AutoMutex _l(mMutex);
@@ -109,6 +108,7 @@ bool TimeCheck::TimeCheckThread::threadLoop() 
        }



        nsecs_t endTimeNs = INT64_MAX;

        const char *tag = "<unspecified>";

        // KeyedVector mMonitorRequests is ordered so take first entry as next timeout

        if (mMonitorRequests.size() != 0) {

            endTimeNs = mMonitorRequests.keyAt(0);