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

Commit 91a7b145 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "More audio_stream_type_t"

parents ca050ab2 b7cffb41

include/media/AudioSystem.h

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ private: 
    static sp<IAudioPolicyService> gAudioPolicyService;



    // mapping between stream types and outputs

    static DefaultKeyedVector<int, audio_io_handle_t> gStreamOutputMap;

    static DefaultKeyedVector<audio_stream_type_t, audio_io_handle_t> gStreamOutputMap;

    // list of output descriptors containing cached parameters

    // (sampling rate, framecount, channel count...)

    static DefaultKeyedVector<audio_io_handle_t, OutputDescriptor *> gOutputs;

media/libmedia/AudioSystem.cpp

+4 −3
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ sp<IAudioFlinger> AudioSystem::gAudioFlinger; 
sp<AudioSystem::AudioFlingerClient> AudioSystem::gAudioFlingerClient;

audio_error_callback AudioSystem::gAudioErrorCallback = NULL;

// Cached values

DefaultKeyedVector<int, audio_io_handle_t> AudioSystem::gStreamOutputMap(0);



DefaultKeyedVector<audio_stream_type_t, audio_io_handle_t> AudioSystem::gStreamOutputMap(0);

DefaultKeyedVector<audio_io_handle_t, AudioSystem::OutputDescriptor *> AudioSystem::gOutputs(0);



// Cached values for recording queries, all protected by gLock
@@ -404,7 +405,7 @@ void AudioSystem::AudioFlingerClient::binderDied(const wp<IBinder>& who) { 
void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, int ioHandle, void *param2) {

    ALOGV("ioConfigChanged() event %d", event);

    OutputDescriptor *desc;

    uint32_t stream;

    audio_stream_type_t stream;



    if (ioHandle == 0) return;
@@ -413,7 +414,7 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, int ioHandle, v 
    switch (event) {

    case STREAM_CONFIG_CHANGED:

        if (param2 == 0) break;

        stream = *(uint32_t *)param2;

        stream = *(audio_stream_type_t *)param2;

        ALOGV("ioConfigChanged() STREAM_CONFIG_CHANGED stream %d, output %d", stream, ioHandle);

        if (gStreamOutputMap.indexOfKey(stream) >= 0) {

            gStreamOutputMap.replaceValueFor(stream, ioHandle);