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

Commit 42c58096 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10113759 from 6037baff to udc-release 

Change-Id: Ic8f98f082741fd7ee75437bdc6c90f1a86f61376
parents 1439d483 6037baff

media/codec2/hal/plugin/samples/SampleFilterPlugin.cpp

+0 −4
Original line number Diff line number Diff line
@@ -710,10 +710,6 @@ private: 
                layerSettings.source.buffer.fence = Fence::NO_FENCE;

                layerSettings.source.buffer.textureName = textureName;

                layerSettings.source.buffer.usePremultipliedAlpha = false;

                layerSettings.source.buffer.isY410BT2020 =

                    (layerSettings.sourceDataspace == ui::Dataspace::BT2020_ITU_PQ ||

                     layerSettings.sourceDataspace == ui::Dataspace::BT2020_ITU_HLG) &&

                    format == HAL_PIXEL_FORMAT_RGBA_1010102;

                layerSettings.source.buffer.maxMasteringLuminance =

                    (hdrStaticInfo && *hdrStaticInfo &&

                     hdrStaticInfo->mastering.maxLuminance > 0 &&

media/codec2/sfplugin/CCodecBufferChannel.cpp

+8 −4
Original line number Diff line number Diff line
@@ -1801,8 +1801,6 @@ void CCodecBufferChannel::flush(const std::list<std::unique_ptr<C2Work>> &flushe 
            output->buffers->flushStash();

        }

    }

    // reset the frames that are being tracked for onFrameRendered callbacks

    mTrackedFrames.clear();

}



void CCodecBufferChannel::onWorkDone(
@@ -2113,7 +2111,10 @@ bool CCodecBufferChannel::handleWork( 
            outBuffer->meta()->setInt32("flags", BUFFER_FLAG_CODEC_CONFIG);

            ALOGV("[%s] onWorkDone: csd index = %zu [%p]", mName, index, outBuffer.get());



            output.unlock();

            // TRICKY: we want popped buffers reported in order, so sending

            // the callback while holding the lock here. This assumes that

            // onOutputBufferAvailable() does not block. onOutputBufferAvailable()

            // callbacks are always sent with the Output lock held.

            mCallback->onOutputBufferAvailable(index, outBuffer);

        } else {

            ALOGD("[%s] onWorkDone: unable to register csd", mName);
@@ -2203,7 +2204,10 @@ void CCodecBufferChannel::sendOutputBuffers() { 
        case OutputBuffers::DISCARD:

            break;

        case OutputBuffers::NOTIFY_CLIENT:

            output.unlock();

            // TRICKY: we want popped buffers reported in order, so sending

            // the callback while holding the lock here. This assumes that

            // onOutputBufferAvailable() does not block. onOutputBufferAvailable()

            // callbacks are always sent with the Output lock held.

            mCallback->onOutputBufferAvailable(index, outBuffer);

            break;

        case OutputBuffers::REALLOCATE:

media/libstagefright/FrameCaptureLayer.cpp

+0 −9
Original line number Diff line number Diff line
@@ -64,14 +64,6 @@ ui::Dataspace translateDataspace(ui::Dataspace dataspace) { 
    return updatedDataspace;

}



bool isHdrY410(const BufferItem &bi) {

    ui::Dataspace dataspace = translateDataspace(static_cast<ui::Dataspace>(bi.mDataSpace));

    // pixel format is HDR Y410 masquerading as RGBA_1010102

    return ((dataspace == ui::Dataspace::BT2020_ITU_PQ ||

            dataspace == ui::Dataspace::BT2020_ITU_HLG) &&

            bi.mGraphicBuffer->getPixelFormat() == HAL_PIXEL_FORMAT_RGBA_1010102);

}



struct FrameCaptureLayer::BufferLayer : public FrameCaptureProcessor::Layer {

    BufferLayer(const BufferItem &bi) : mBufferItem(bi) {}

    void getLayerSettings(
@@ -95,7 +87,6 @@ void FrameCaptureLayer::BufferLayer::getLayerSettings( 
    layerSettings->source.buffer.fence = mBufferItem.mFence;

    layerSettings->source.buffer.textureName = textureName;

    layerSettings->source.buffer.usePremultipliedAlpha = false;

    layerSettings->source.buffer.isY410BT2020 = isHdrY410(mBufferItem);

    bool hasSmpte2086 = mBufferItem.mHdrMetadata.validTypes & HdrMetadata::SMPTE2086;

    bool hasCta861_3 = mBufferItem.mHdrMetadata.validTypes & HdrMetadata::CTA861_3;

    layerSettings->source.buffer.maxMasteringLuminance = hasSmpte2086

services/audiopolicy/service/AudioPolicyService.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1843,14 +1843,12 @@ void AudioPolicyService::UidPolicy::dumpInternals(int fd) { 
void AudioPolicyService::SensorPrivacyPolicy::registerSelf() {

    SensorPrivacyManager spm;

    mSensorPrivacyEnabled = spm.isSensorPrivacyEnabled();

    (void)spm.addToggleSensorPrivacyListener(this);

    spm.addSensorPrivacyListener(this);

}



void AudioPolicyService::SensorPrivacyPolicy::unregisterSelf() {

    SensorPrivacyManager spm;

    spm.removeSensorPrivacyListener(this);

    spm.removeToggleSensorPrivacyListener(this);

}



bool AudioPolicyService::SensorPrivacyPolicy::isSensorPrivacyEnabled() {

services/tuner/TunerService.cpp

+5 −2
Original line number Diff line number Diff line
@@ -100,8 +100,11 @@ binder_status_t TunerService::instantiate() { 


    if (fallBackToOpenDemux) {

        auto status = mTuner->openDemux(&ids, &demux);

        return ::ndk::ScopedAStatus::fromServiceSpecificError(

                static_cast<int32_t>(Result::UNAVAILABLE));

        if (status.isOk()) {

            *_aidl_return = ::ndk::SharedRefBase::make<TunerDemux>(demux, ids[0],

                                                                   this->ref<TunerService>());

        }

        return status;

    } else {

        int id = TunerHelper::getResourceIdFromHandle(in_demuxHandle, DEMUX);

        auto status = mTuner->openDemuxById(id, &demux);