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

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

Snap for 10296977 from 3677ce91 to udc-release 

Change-Id: If3934ca4d271f6e24e192d87c2940202d52a9b24
parents db73c8dc 3677ce91

media/codec2/sfplugin/CCodecBufferChannel.cpp

+3 −3
Original line number Diff line number Diff line
@@ -150,11 +150,10 @@ CCodecBufferChannel::CCodecBufferChannel( 
      mFirstValidFrameIndex(0u),

      mIsSurfaceToDisplay(false),

      mHasPresentFenceTimes(false),

      mRenderingDepth(0u),

      mRenderingDepth(3u),

      mMetaMode(MODE_NONE),

      mInputMetEos(false),

      mSendEncryptedInfoBuffer(false) {

    mOutputSurface.lock()->maxDequeueBuffers = kSmoothnessFactor;

    {

        Mutexed<Input>::Locked input(mInput);

        input->buffers.reset(new DummyInputBuffers(""));
@@ -176,8 +175,9 @@ CCodecBufferChannel::CCodecBufferChannel( 
        pools->outputPoolId = C2BlockPool::BASIC_LINEAR;

    }

    std::string value = server_configurable_flags::GetServerConfigurableFlag(

            "media_native", "ccodec_rendering_depth", "0");

            "media_native", "ccodec_rendering_depth", "3");

    android::base::ParseInt(value, &mRenderingDepth);

    mOutputSurface.lock()->maxDequeueBuffers = kSmoothnessFactor + mRenderingDepth;

}



CCodecBufferChannel::~CCodecBufferChannel() {

services/camera/libcameraservice/common/CameraProviderManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1127,8 +1127,8 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::deriveJpegRTags(bool 
    const int32_t scalerSizesTag =

              SessionConfigurationUtils::getAppropriateModeTag(

                      ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS, maxResolution);

    const int32_t scalerMinFrameDurationsTag =

            ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS;

    const int32_t scalerMinFrameDurationsTag = SessionConfigurationUtils::getAppropriateModeTag(

            ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS, maxResolution);

    const int32_t scalerStallDurationsTag =

                 SessionConfigurationUtils::getAppropriateModeTag(

                        ANDROID_SCALER_AVAILABLE_STALL_DURATIONS, maxResolution);