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

Unverified Commit 44880aa3 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r11' into staging/lineage-20.0_merge-android-13.0.0_r11 

Android 13.0.0 release 11

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCY0jiTAAKCRDorT+BmrEO
# eJt0AJ9lgf51yM13uGnct8ztCdyl3znJiwCfQvQtwLyJXQyu7d5e44zpb1QLx7c=
# =uF0x
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Oct 14 07:15:08 2022 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1352 signatures in the past
#      11 months.  Encrypted 4 messages in the past 9 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Eric Laurent (5) and others
# Via Android Build Coastguard Worker (289) and others
* tag 'android-13.0.0_r11': (28 commits)
  MediaPlayer: fix channel mask handling
  Add missing bounds checks
  Cache MMAP client silenced state.
  Cache MMAP client silenced state.
  Cache MMAP client silenced state.
  Update torch brightness max level description.
  Update torch  brightness max level description.
  NuPlayerRenderer: extend offload pause wakelock duration
  Revert "NuPlayer: use acquireWakeLockAsync in AWakeLock"
  cameraservice: Clean up tag monitoring output
  Camera: Generate tombstone when watchdog bites
  NuPlayer: use acquireWakeLockAsync in AWakeLock
  codec2: declare 10-bit support for all AV1 codecs
  AudioFlinger: avoid doing balance before downmixing
  Remove Hermitian tone-mapping curve for HLG
  cameraserver: Exit watchdog for disconnect call
  cameraservice: Check for watchdog initialization before timing disconnect.
  CCodecConfig: skip subscribing to optional params until requested
  [RESTRICT AUTOMERGE] cameraserver: Add watchdog timer for disconnect.
  ToneGenerator: add tones for New Zealand
  ...

Change-Id: I3fbf789f742204692d40b3697fe3b8c2e520190b
parents 7935d121 8051a196

camera/CaptureResult.cpp

+8 −1
Original line number Diff line number Diff line
@@ -52,7 +52,10 @@ status_t CaptureResultExtras::readFromParcel(const android::Parcel *parcel) { 
    parcel->readInt64(&lastCompletedRegularFrameNumber);

    parcel->readInt64(&lastCompletedReprocessFrameNumber);

    parcel->readInt64(&lastCompletedZslFrameNumber);



    parcel->readBool(&hasReadoutTimestamp);

    if (hasReadoutTimestamp) {

        parcel->readInt64(&readoutTimestamp);

    }

    return OK;

}
@@ -82,6 +85,10 @@ status_t CaptureResultExtras::writeToParcel(android::Parcel *parcel) const { 
    parcel->writeInt64(lastCompletedRegularFrameNumber);

    parcel->writeInt64(lastCompletedReprocessFrameNumber);

    parcel->writeInt64(lastCompletedZslFrameNumber);

    parcel->writeBool(hasReadoutTimestamp);

    if (hasReadoutTimestamp) {

        parcel->writeInt64(readoutTimestamp);

    }



    return OK;

}

camera/include/camera/CaptureResult.h

+14 −1
Original line number Diff line number Diff line
@@ -103,6 +103,17 @@ struct CaptureResultExtras : public android::Parcelable { 
     */

    int64_t lastCompletedZslFrameNumber;



    /**

     * Whether the readoutTimestamp variable is valid and should be used.

     */

    bool hasReadoutTimestamp;



    /**

     * The readout timestamp of the capture. Its value is equal to the

     * start-of-exposure timestamp plus the exposure time (and a possible fixed

     * offset due to sensor crop).

     */

    int64_t readoutTimestamp;



    /**

     * Constructor initializes object as invalid by setting requestId to be -1.
@@ -118,7 +129,9 @@ struct CaptureResultExtras : public android::Parcelable { 
          errorPhysicalCameraId(),

          lastCompletedRegularFrameNumber(-1),

          lastCompletedReprocessFrameNumber(-1),

          lastCompletedZslFrameNumber(-1) {

          lastCompletedZslFrameNumber(-1),

          hasReadoutTimestamp(false),

          readoutTimestamp(0) {

    }



    /**

camera/include/camera/camera2/OutputConfiguration.h

+3 −1
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ public: 
        TIMESTAMP_BASE_SENSOR = 1,

        TIMESTAMP_BASE_MONOTONIC = 2,

        TIMESTAMP_BASE_REALTIME = 3,

        TIMESTAMP_BASE_CHOREOGRAPHER_SYNCED = 4

        TIMESTAMP_BASE_CHOREOGRAPHER_SYNCED = 4,

        TIMESTAMP_BASE_READOUT_SENSOR = 5,

        TIMESTAMP_BASE_MAX = TIMESTAMP_BASE_READOUT_SENSOR,

    };

    enum MirrorModeType {

        MIRROR_MODE_AUTO = 0,

camera/ndk/include/camera/NdkCameraMetadataTags.h

+4 −0
Original line number Diff line number Diff line
@@ -2198,6 +2198,10 @@ typedef enum acamera_metadata_tag { 
     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraManager.html#turnOnTorchWithStrengthLevel">CameraManager#turnOnTorchWithStrengthLevel</a>.

     * If this value is equal to 1, flashlight brightness control is not supported.

     * The value for this key will be null for devices with no flash unit.</p>

     * <p>The maximum value is guaranteed to be safe to use for an indefinite duration in

     * terms of device flashlight lifespan, but may be too bright for comfort for many

     * use cases. Use the default torch brightness value to avoid problems with an

     * over-bright flashlight.</p>

     */

    ACAMERA_FLASH_INFO_STRENGTH_MAXIMUM_LEVEL =                 // int32

            ACAMERA_FLASH_INFO_START + 2,

media/libstagefright/renderfright/gl/ProgramCache.cpp

+10 −3
Original line number Diff line number Diff line
@@ -299,8 +299,8 @@ void ProgramCache::generateToneMappingProcess(Formatter& fs, const Key& needs) { 
                highp vec3 ScaleLuminance(highp vec3 color) {

                    // The formula is:

                    // alpha * pow(Y, gamma - 1.0) * color + beta;

                    // where alpha is 1000.0, gamma is 1.2, beta is 0.0.

                    return color * 1000.0 * pow(color.y, 0.2);

                    // where alpha is displayMaxLuminance, gamma is 1.2, beta is 0.0.

                    return color * displayMaxLuminance * pow(color.y, 0.2);

                }

            )__SHADER__";

            break;
@@ -316,7 +316,6 @@ void ProgramCache::generateToneMappingProcess(Formatter& fs, const Key& needs) { 
    // Tone map absolute light to display luminance range.

    switch (needs.getInputTF()) {

        case Key::INPUT_TF_ST2084:

        case Key::INPUT_TF_HLG:

            switch (needs.getOutputTF()) {

                case Key::OUTPUT_TF_HLG:

                    // Right now when mixed PQ and HLG contents are presented,
@@ -396,6 +395,14 @@ void ProgramCache::generateToneMappingProcess(Formatter& fs, const Key& needs) { 
                    break;

            }

            break;

        case Key::INPUT_TF_HLG:

            // HLG OOTF is already applied as part of ScaleLuminance

            fs << R"__SHADER__(

                 highp vec3 ToneMap(highp vec3 color) {

                     return color;

                 }

             )__SHADER__";

            break;

        default:

            // inverse tone map; the output luminance can be up to maxOutLumi.

            fs << R"__SHADER__(