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

Unverified Commit a20b87fe authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.0.0_r12' into staging/lineage-19.0_merge-android-12.0.0_r12 

Android 12.0.0 release 12

* tag 'android-12.0.0_r12':
  CCodecBuffers: Update KEY_WIDTH and KEY_HEIGHT to correct values
  Revert "Codec2Buffer: vstride to match height"
  Codec2Buffer: vstride to match height
  VT: do not remove a rx session even if ECONNREFUSED occurred.
  AudioFlinger: Workaround for dumpsys stall
  DrmManagerClient: query drm service without blocking
  camera2: Document minimum pixel array size restriction for ultra high resolution sensors.
  CCodec: do not update frame size with buffer dimensions
  RELAND CCodec: fix dataspace configured for the input surfaces
  Revert "CCodec: handle dataspace update from GraphicBufferSource"
  Revert "Use system/audio to/from string converters in TypeConverter"

Change-Id: I2d795a0bcb0c089e5c84f430be68efab5a082769
parents 28c00563 f6f12366

media/codec2/sfplugin/CCodec.cpp

+26 −7
Original line number Diff line number Diff line
@@ -1566,15 +1566,36 @@ status_t CCodec::setupInputSurface(const std::shared_ptr<InputSurfaceWrapper> &s 
    // we are now using surface - apply default color aspects to input format - as well as

    // get dataspace

    bool inputFormatChanged = config->updateFormats(Config::IS_INPUT);

    ALOGD("input format %s to %s",

            inputFormatChanged ? "changed" : "unchanged",

            config->mInputFormat->debugString().c_str());



    // configure dataspace

    static_assert(sizeof(int32_t) == sizeof(android_dataspace), "dataspace size mismatch");

    android_dataspace dataSpace = HAL_DATASPACE_UNKNOWN;

    (void)config->mInputFormat->findInt32("android._dataspace", (int32_t*)&dataSpace);



    // The output format contains app-configured color aspects, and the input format

    // has the default color aspects. Use the default for the unspecified params.

    ColorAspects inputColorAspects, colorAspects;

    getColorAspectsFromFormat(config->mOutputFormat, colorAspects);

    getColorAspectsFromFormat(config->mInputFormat, inputColorAspects);

    if (colorAspects.mRange == ColorAspects::RangeUnspecified) {

        colorAspects.mRange = inputColorAspects.mRange;

    }

    if (colorAspects.mPrimaries == ColorAspects::PrimariesUnspecified) {

        colorAspects.mPrimaries = inputColorAspects.mPrimaries;

    }

    if (colorAspects.mTransfer == ColorAspects::TransferUnspecified) {

        colorAspects.mTransfer = inputColorAspects.mTransfer;

    }

    if (colorAspects.mMatrixCoeffs == ColorAspects::MatrixUnspecified) {

        colorAspects.mMatrixCoeffs = inputColorAspects.mMatrixCoeffs;

    }

    android_dataspace dataSpace = getDataSpaceForColorAspects(

            colorAspects, /* mayExtend = */ false);

    surface->setDataSpace(dataSpace);

    setColorAspectsIntoFormat(colorAspects, config->mInputFormat, /* force = */ true);

    config->mInputFormat->setInt32("android._dataspace", int32_t(dataSpace));



    ALOGD("input format %s to %s",

            inputFormatChanged ? "changed" : "unchanged",

            config->mInputFormat->debugString().c_str());



    status_t err = mChannel->setInputSurface(surface);

    if (err != OK) {
@@ -2262,8 +2283,6 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) { 
                            const C2ConstGraphicBlock &block = blocks[0];

                            updates.emplace_back(new C2StreamCropRectInfo::output(

                                    stream, block.crop()));

                            updates.emplace_back(new C2StreamPictureSizeInfo::output(

                                    stream, block.crop().width, block.crop().height));

                        }

                        ++stream;

                    }

media/codec2/sfplugin/CCodecBuffers.cpp

+4 −1
Original line number Diff line number Diff line
@@ -96,7 +96,10 @@ void CCodecBuffers::handleImageData(const sp<Codec2Buffer> &buffer) { 
        if (img->mNumPlanes > 0 && img->mType != img->MEDIA_IMAGE_TYPE_UNKNOWN) {

            int32_t stride = img->mPlane[0].mRowInc;

            mFormatWithImageData->setInt32(KEY_STRIDE, stride);

            ALOGD("[%s] updating stride = %d", mName, stride);

            mFormatWithImageData->setInt32(KEY_WIDTH, img->mWidth);

            mFormatWithImageData->setInt32(KEY_HEIGHT, img->mHeight);

            ALOGD("[%s] updating stride = %d, width: %d, height: %d",

                  mName, stride, img->mWidth, img->mHeight);

            if (img->mNumPlanes > 1 && stride > 0) {

                int64_t offsetDelta =

                    (int64_t)img->mPlane[1].mOffset - (int64_t)img->mPlane[0].mOffset;

media/libaudiohal/impl/DeviceHalHidl.cpp

+12 −0
Original line number Diff line number Diff line
@@ -463,6 +463,18 @@ status_t DeviceHalHidl::dump(int fd) { 
    hidlHandle->data[0] = fd;

    Return<void> ret = mDevice->debug(hidlHandle, {} /* options */);

    native_handle_delete(hidlHandle);



    // TODO(b/111997867, b/177271958)  Workaround - remove when fixed.

    // A Binder transmitted fd may not close immediately due to a race condition b/111997867

    // when the remote binder thread removes the last refcount to the fd blocks in the

    // kernel for binder activity. We send a Binder ping() command to unblock the thread

    // and complete the fd close / release.

    //

    // See DeviceHalHidl::dump(), EffectHalHidl::dump(), StreamHalHidl::dump(),

    //     EffectsFactoryHalHidl::dumpEffects().



    (void)mDevice->ping(); // synchronous Binder call



    return processReturn("dump", ret);

}

media/libaudiohal/impl/EffectHalHidl.cpp

+12 −0
Original line number Diff line number Diff line
@@ -239,6 +239,18 @@ status_t EffectHalHidl::dump(int fd) { 
    hidlHandle->data[0] = fd;

    Return<void> ret = mEffect->debug(hidlHandle, {} /* options */);

    native_handle_delete(hidlHandle);



    // TODO(b/111997867, b/177271958)  Workaround - remove when fixed.

    // A Binder transmitted fd may not close immediately due to a race condition b/111997867

    // when the remote binder thread removes the last refcount to the fd blocks in the

    // kernel for binder activity. We send a Binder ping() command to unblock the thread

    // and complete the fd close / release.

    //

    // See DeviceHalHidl::dump(), EffectHalHidl::dump(), StreamHalHidl::dump(),

    //     EffectsFactoryHalHidl::dumpEffects().



    (void)mEffect->ping(); // synchronous Binder call



    return ret.isOk() ? OK : FAILED_TRANSACTION;

}

media/libaudiohal/impl/EffectsFactoryHalHidl.cpp

+12 −0
Original line number Diff line number Diff line
@@ -149,6 +149,18 @@ status_t EffectsFactoryHalHidl::dumpEffects(int fd) { 
    hidlHandle->data[0] = fd;

    Return<void> ret = mEffectsFactory->debug(hidlHandle, {} /* options */);

    native_handle_delete(hidlHandle);



    // TODO(b/111997867, b/177271958)  Workaround - remove when fixed.

    // A Binder transmitted fd may not close immediately due to a race condition b/111997867

    // when the remote binder thread removes the last refcount to the fd blocks in the

    // kernel for binder activity. We send a Binder ping() command to unblock the thread

    // and complete the fd close / release.

    //

    // See DeviceHalHidl::dump(), EffectHalHidl::dump(), StreamHalHidl::dump(),

    //     EffectsFactoryHalHidl::dumpEffects().



    (void)mEffectsFactory->ping(); // synchronous Binder call



    return processReturn(__FUNCTION__, ret);

}