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

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

Snap for 12664851 from 55a32238 to 25Q1-release 

Change-Id: Id8b0026295d9ed94ac62e2c59190577895cdfa42
parents 8002e15d 55a32238

camera/camera_platform.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -246,3 +246,13 @@ flag { 
        purpose: PURPOSE_FEATURE

    }

}



flag {

    namespace: "camera_platform"

    name: "query_process_state"

    description: "In opChanged, query the process state from AM instead of relying on mUidPolicy"

    bug: "378016494"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

media/janitors/media_solutions_OWNERS

+5 −0
Original line number Diff line number Diff line
@@ -17,3 +17,8 @@ tonihei@google.com 


# MediaRouter and native mirroring only:

aquilescanta@google.com



# Emergency rollbacks and fixes outside LON timezone

jmtrivi@google.com # US-MTV

lajos@google.com # US-MTV

scottnien@google.com # TW-NTC

media/libaudioclient/AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ sp<CaptureStateListenerImpl> AudioSystem::gSoundTriggerCaptureStateListener; 
// Such an audioserver failure is considered benign as the ground truth is stored in

// the Java AudioService and can be restored once audioserver has finished initialization.

//

// TODO(b/375691003) We use 10s as a conservative timeout value, and will tune closer to 3s.

// TODO(b/375691003) We use 5s as a conservative timeout value, and will tune closer to 3s.

// Too small a value (i.e. less than 1s would churn repeated calls to get the service).

// The value can be tuned by the property audio.service.client_wait_ms.

static constexpr int32_t kServiceClientWaitMs = 10'000;

static constexpr int32_t kServiceClientWaitMs = 5'000;



static constexpr const char kServiceWaitProperty[] = "audio.service.client_wait_ms";

media/libstagefright/data/media_codecs_google_c2_video.xml

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
            <Feature name="adaptive-playback" />

            <Attribute name="software-codec" />

        </MediaCodec>

        <MediaCodec name="c2.android.apv.decoder" type="video/apv">

        <MediaCodec name="c2.android.apv.decoder" type="video/apv" enabled="false" minsdk="36" variant="!slow-cpu">

            <Limit name="size" min="16x16" max="1920x1920"/>

            <Limit name="alignment" value="2x2"/>

            <Limit name="bitrate" range="1-240000000"/>
@@ -168,7 +168,7 @@ 
            <Limit name="bitrate" range="1-40000000" />

            <Feature name="bitrate-modes" value="VBR,CBR" />

        </MediaCodec>

        <MediaCodec name="c2.android.apv.encoder" type="video/apv">

        <MediaCodec name="c2.android.apv.encoder" type="video/apv" enabled="false" minsdk="36" variant="!slow-cpu">

            <Limit name="size" min="2x2" max="1920x1920" />

            <Limit name="alignment" value="2x2" />

            <Limit name="block-size" value="16x16" />

media/libstagefright/data/media_codecs_sw.xml

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ 
            <Feature name="adaptive-playback" />

            <Attribute name="software-codec" />

        </MediaCodec>

        <MediaCodec name="c2.android.apv.decoder" type="video/apv">

        <MediaCodec name="c2.android.apv.decoder" type="video/apv" enabled="false" minsdk="36" variant="!slow-cpu">

            <Limit name="size" min="16x16" max="1920x1920"/>

            <Limit name="alignment" value="2x2"/>

            <Limit name="bitrate" range="1-240000000"/>
@@ -417,7 +417,7 @@ 
            <Feature name="qp-bounds" />

            <Attribute name="software-codec" />

        </MediaCodec>

        <MediaCodec name="c2.android.apv.encoder" type="video/apv" variant="!slow-cpu">

        <MediaCodec name="c2.android.apv.encoder" type="video/apv" enabled="false" minsdk="36" variant="!slow-cpu">

            <Limit name="size" min="2x2" max="1920x1920" />

            <Limit name="alignment" value="2x2" />

            <Limit name="block-size" value="16x16" />