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

Commit 2b2e11f7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Retrieve maximum duration BLOB tags" into udc-dev am:... 

Merge "Camera: Retrieve maximum duration BLOB tags" into udc-dev am: 1fbc05b5 am: 7432c036 am: b39ffd8b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23591958



Change-Id: I787d79fbcfb0ed7847e4e1acf1897e5a5e3d75ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1f59990 b39ffd8b

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);