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

Commit 99698ccc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5698755 from 265eb995 to qt-qpr1-release 

Change-Id: I8b46f37260df1011d52119529a896d2dcae4cb3e
parents 0ed7dbdc 265eb995

camera/ndk/include/camera/NdkCameraMetadataTags.h

+9 −9
Original line number Diff line number Diff line
@@ -7689,14 +7689,14 @@ typedef enum acamera_metadata_enum_acamera_request_available_capabilities { 
     * case, when the application configures a RAW stream, the camera device will make sure

     * the active physical camera will remain active to ensure consistent RAW output

     * behavior, and not switch to other physical cameras.</p>

     * <p>To maintain backward compatibility, the capture request and result metadata tags

     * required for basic camera functionalities will be solely based on the

     * logical camera capabiltity. Other request and result metadata tags, on the other

     * hand, will be based on current active physical camera. For example, the physical

     * cameras' sensor sensitivity and lens capability could be different from each other.

     * So when the application manually controls sensor exposure time/gain, or does manual

     * focus control, it must checks the current active physical camera's exposure, gain,

     * and focus distance range.</p>

     * <p>The capture request and result metadata tags required for backward compatible camera

     * functionalities will be solely based on the logical camera capabiltity. On the other

     * hand, the use of manual capture controls (sensor or post-processing) with a

     * logical camera may result in unexpected behavior when the HAL decides to switch

     * between physical cameras with different characteristics under the hood. For example,

     * when the application manually sets exposure time and sensitivity while zooming in,

     * the brightness of the camera images may suddenly change because HAL switches from one

     * physical camera to the other.</p>

     *

     * @see ACAMERA_LENS_DISTORTION

     * @see ACAMERA_LENS_INFO_FOCUS_DISTANCE_CALIBRATION
@@ -8330,7 +8330,7 @@ typedef enum acamera_metadata_enum_acamera_info_supported_hardware_level { 
     * fire the flash for flash power metering during precapture, and then fire the flash

     * for the final capture, if a flash is available on the device and the AE mode is set to

     * enable the flash.</p>

     * <p>Devices that initially shipped with Android version <a href="https://developer.android.com/reference/android/os/Build.VERSION_CODES.html#Q">Q</a> or newer will not include any LEGACY-level devices.</p>

     * <p>Devices that initially shipped with Android version <a href="https://developer.android.com/reference/android/os/Build/VERSION_CODES.html#Q">Q</a> or newer will not include any LEGACY-level devices.</p>

     *

     * @see ACAMERA_CONTROL_AE_PRECAPTURE_TRIGGER

     * @see ACAMERA_REQUEST_AVAILABLE_CAPABILITIES

media/codec2/components/vpx/C2SoftVpxEnc.cpp

+5 −5
Original line number Diff line number Diff line
@@ -127,13 +127,13 @@ status_t C2SoftVpxEnc::initEncoder() { 
    }



    switch (mBitrateMode->value) {

        case C2Config::BITRATE_VARIABLE:

            mBitrateControlMode = VPX_VBR;

            break;

        case C2Config::BITRATE_CONST:

        default:

            mBitrateControlMode = VPX_CBR;

            break;

        case C2Config::BITRATE_VARIABLE:

        [[fallthrough]];

        default:

            mBitrateControlMode = VPX_VBR;

            break;

    }

media/codec2/components/vpx/C2SoftVpxEnc.h

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ class C2SoftVpxEnc::IntfImpl : public SimpleInterface<void>::BaseParams { 
        addParameter(

            DefineParam(mBitrateMode, C2_PARAMKEY_BITRATE_MODE)

                .withDefault(new C2StreamBitrateModeTuning::output(

                        0u, C2Config::BITRATE_CONST))

                        0u, C2Config::BITRATE_VARIABLE))

                .withFields({

                    C2F(mBitrateMode, value).oneOf({

                        C2Config::BITRATE_CONST, C2Config::BITRATE_VARIABLE })

media/codec2/hidl/1.0/vts/functional/audio/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -15,19 +15,19 @@ 
 */



cc_test {

    name: "VtsHidlC2V1_0TargetAudioDecTest",

    defaults: ["VtsMediaC2V1_0Defaults"],

    name: "VtsHalMediaC2V1_0TargetAudioDecTest",

    defaults: ["VtsHalMediaC2V1_0Defaults"],

    srcs: [

        "VtsHidlC2V1_0TargetAudioDecTest.cpp",

        "VtsHalMediaC2V1_0TargetAudioDecTest.cpp",

        //"media_audio_hidl_test_common.cpp"

    ],

}



cc_test {

    name: "VtsHidlC2V1_0TargetAudioEncTest",

    defaults: ["VtsMediaC2V1_0Defaults"],

    name: "VtsHalMediaC2V1_0TargetAudioEncTest",

    defaults: ["VtsHalMediaC2V1_0Defaults"],

    srcs: [

        "VtsHidlC2V1_0TargetAudioEncTest.cpp",

        "VtsHalMediaC2V1_0TargetAudioEncTest.cpp",

        //"media_audio_hidl_test_common.cpp"

    ],

}