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

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

Snap for 12844825 from b43061b9 to 25Q2-release 

Change-Id: Idd3af7d6df005737cc4df47b5796577544eddeee
parents 42f25832 b43061b9

media/audio/aconfig/audio_framework.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -86,6 +86,14 @@ flag { 
    is_exported: true

}



flag {

    name: "sony_360ra_mpegh_3d_format"

    namespace: "media_audio"

    description: "360 Reality Audio MPEG-H 3D Format"

    is_fixed_read_only: true

    bug: "238402306"

}



# TODO remove

flag {

    name: "foreground_audio_control"

media/audioaidlconversion/AidlConversionCppNdk.cpp

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ const detail::AudioChannelPairs& getOutAudioChannelPairs() { 
        DEFINE_OUTPUT_LAYOUT(7POINT1),

        DEFINE_OUTPUT_LAYOUT(7POINT1POINT2),

        DEFINE_OUTPUT_LAYOUT(7POINT1POINT4),

        DEFINE_OUTPUT_LAYOUT(13POINT_360RA),

        DEFINE_OUTPUT_LAYOUT(13POINT0),

        DEFINE_OUTPUT_LAYOUT(22POINT2),

        DEFINE_OUTPUT_LAYOUT(MONO_HAPTIC_A),

        DEFINE_OUTPUT_LAYOUT(STEREO_HAPTIC_A),

media/libeffects/downmix/benchmark/downmix_benchmark.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static constexpr audio_channel_mask_t kChannelPositionMasks[] = { 
    AUDIO_CHANNEL_OUT_5POINT1POINT4,

    AUDIO_CHANNEL_OUT_7POINT1POINT2,

    AUDIO_CHANNEL_OUT_7POINT1POINT4,

    AUDIO_CHANNEL_OUT_13POINT_360RA,

    AUDIO_CHANNEL_OUT_13POINT0,

    AUDIO_CHANNEL_OUT_22POINT2,

};

media/libeffects/downmix/tests/downmix_tests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static constexpr audio_channel_mask_t kChannelPositionMasks[] = { 
    AUDIO_CHANNEL_OUT_5POINT1POINT4,

    AUDIO_CHANNEL_OUT_7POINT1POINT2,

    AUDIO_CHANNEL_OUT_7POINT1POINT4,

    AUDIO_CHANNEL_OUT_13POINT_360RA,

    AUDIO_CHANNEL_OUT_13POINT0,

    AUDIO_CHANNEL_OUT_22POINT2,

    audio_channel_mask_t(AUDIO_CHANNEL_OUT_22POINT2

            | AUDIO_CHANNEL_OUT_FRONT_WIDE_LEFT | AUDIO_CHANNEL_OUT_FRONT_WIDE_RIGHT),

services/audioflinger/IAfTrack.h

+1 −1
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ public: 
    virtual status_t getNextBuffer(AudioBufferProvider::Buffer* buffer) = 0;

    virtual void releaseBuffer(AudioBufferProvider::Buffer* buffer) = 0;



    virtual void signal() = 0;

    // Added for RecordTrack and OutputTrack

    virtual wp<IAfThreadBase> thread() const = 0;

    virtual const sp<ServerProxy>& serverProxy() const = 0;
@@ -323,7 +324,6 @@ public: 
    virtual float* mainBuffer() const = 0;

    virtual int auxEffectId() const = 0;

    virtual status_t getTimestamp(AudioTimestamp& timestamp) = 0;

    virtual void signal() = 0;

    virtual status_t getDualMonoMode(audio_dual_mono_mode_t* mode) const = 0;

    virtual status_t setDualMonoMode(audio_dual_mono_mode_t mode) = 0;

    virtual status_t getAudioDescriptionMixLevel(float* leveldB) const = 0;