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

Commit 2f9e81b9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6473661 from 2464cd70 to rvc-release 

Change-Id: Ia57344df417784ae4f6ebed4623be984304d9fca
parents 141613e1 2464cd70

media/audioserver/audioserver.rc

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,14 @@ on property:init.svc.audioserver=stopped 
    # Keep the original service names for backward compatibility

    stop vendor.audio-hal-2-0

    stop audio-hal-2-0

    # See b/155364397. Need to have HAL service running for VTS.

    # Can't use 'restart' because then HAL service would restart

    # audioserver bringing it back into running state.

    start vendor.audio-hal

    start vendor.audio-hal-4-0-msd

    # Keep the original service names for backward compatibility

    start vendor.audio-hal-2-0

    start audio-hal-2-0



on property:init.svc.audioserver=running

    start vendor.audio-hal

media/codec2/sfplugin/CCodecBufferChannel.cpp

+12 −7
Original line number Diff line number Diff line
@@ -868,15 +868,20 @@ status_t CCodecBufferChannel::renderOutputBuffer( 
                .minLuminance = hdrStaticInfo->mastering.minLuminance,

            };



            hdr.validTypes = HdrMetadata::SMPTE2086;

            hdr.smpte2086 = smpte2086_meta;



            // If the content light level fields are 0, do not use them, it

            // indicates the value may not be present in the stream.

            if (hdrStaticInfo->maxCll > 0.0f && hdrStaticInfo->maxFall > 0.0f) {

                struct android_cta861_3_metadata cta861_meta = {

                    .maxContentLightLevel = hdrStaticInfo->maxCll,

                    .maxFrameAverageLightLevel = hdrStaticInfo->maxFall,

                };



            hdr.validTypes = HdrMetadata::SMPTE2086 | HdrMetadata::CTA861_3;

            hdr.smpte2086 = smpte2086_meta;

                hdr.validTypes |= HdrMetadata::CTA861_3;

                hdr.cta8613 = cta861_meta;

            }

        }

        if (hdr10PlusInfo) {

            hdr.validTypes |= HdrMetadata::HDR10PLUS;

            hdr.hdr10plus.assign(

media/extractors/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ cc_defaults { 
        "libmediandk#29",

    ],



    // extractors are supposed to work on Q(29)

    min_sdk_version: "29",



    relative_install_path: "extractors",



    compile_multilib: "first",

media/libmediametrics/include/MediaMetricsConstants.h

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
#define AMEDIAMETRICS_PROP_SUFFIX_CHAR_DUPLICATES_ALLOWED '#'



#define AMEDIAMETRICS_PROP_ALLOWUID       "_allowUid"      // int32_t, allow client uid to post

#define AMEDIAMETRICS_PROP_AUDIOMODE      "audioMode"      // string (audio.flinger)

#define AMEDIAMETRICS_PROP_AUXEFFECTID    "auxEffectId"    // int32 (AudioTrack)

#define AMEDIAMETRICS_PROP_BUFFERSIZEFRAMES "bufferSizeFrames" // int32

#define AMEDIAMETRICS_PROP_BUFFERCAPACITYFRAMES "bufferCapacityFrames" // int32
@@ -146,6 +147,7 @@ 
#define AMEDIAMETRICS_PROP_UNDERRUN       "underrun"       // int32

#define AMEDIAMETRICS_PROP_UNDERRUNFRAMES "underrunFrames" // int64_t from Thread

#define AMEDIAMETRICS_PROP_USAGE          "usage"          // string attributes (ATrack)

#define AMEDIAMETRICS_PROP_VOICEVOLUME    "voiceVolume"    // double (audio.flinger)

#define AMEDIAMETRICS_PROP_VOLUME_LEFT    "volume.left"    // double (AudioTrack)

#define AMEDIAMETRICS_PROP_VOLUME_RIGHT   "volume.right"   // double (AudioTrack)

#define AMEDIAMETRICS_PROP_WHERE          "where"          // string value
@@ -170,7 +172,9 @@ 
#define AMEDIAMETRICS_PROP_EVENT_VALUE_PAUSE      "pause"  // AudioTrack

#define AMEDIAMETRICS_PROP_EVENT_VALUE_READPARAMETERS "readParameters" // Thread

#define AMEDIAMETRICS_PROP_EVENT_VALUE_RESTORE    "restore"

#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETMODE    "setMode" // AudioFlinger

#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETPLAYBACKPARAM "setPlaybackParam" // AudioTrack

#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETVOICEVOLUME "setVoiceVolume" // AudioFlinger

#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETVOLUME  "setVolume"  // AudioTrack

#define AMEDIAMETRICS_PROP_EVENT_VALUE_START      "start"  // AudioTrack, AudioRecord

#define AMEDIAMETRICS_PROP_EVENT_VALUE_STOP       "stop"   // AudioTrack, AudioRecord

media/libstagefright/codecs/amrnb/common/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ cc_library { 
    name: "libstagefright_amrnb_common",

    vendor_available: true,

    host_supported: true,

    min_sdk_version: "29",



    srcs: [

        "src/add.cpp",