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

Commit 882c0a20 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Use audio_in_acoustics_t consistently 

Change-Id: I0a9dd668fb2e57b1c3ece3190588194974b99062
parent c1f63ddb

include/media/IAudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public: 
                                    uint32_t *pSamplingRate,

                                    audio_format_t *pFormat,

                                    uint32_t *pChannels,

                                    uint32_t acoustics) = 0;

                                    audio_in_acoustics_t acoustics) = 0;

    virtual status_t closeInput(int input) = 0;



    virtual status_t setStreamOutput(audio_stream_type_t stream, int output) = 0;

media/libmedia/IAudioFlinger.cpp

+4 −4
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ public: 
                            uint32_t *pSamplingRate,

                            audio_format_t *pFormat,

                            uint32_t *pChannels,

                            uint32_t acoustics)

                            audio_in_acoustics_t acoustics)

    {

        Parcel data, reply;

        uint32_t devices = pDevices ? *pDevices : 0;
@@ -445,7 +445,7 @@ public: 
        data.writeInt32(samplingRate);

        data.writeInt32(format);

        data.writeInt32(channels);

        data.writeInt32(acoustics);

        data.writeInt32((int32_t) acoustics);

        remote()->transact(OPEN_INPUT, data, &reply);

        int input = reply.readInt32();

        devices = reply.readInt32();
@@ -881,13 +881,13 @@ status_t BnAudioFlinger::onTransact( 
            uint32_t samplingRate = data.readInt32();

            audio_format_t format = (audio_format_t) data.readInt32();

            uint32_t channels = data.readInt32();

            uint32_t acoutics = data.readInt32();

            audio_in_acoustics_t acoustics = (audio_in_acoustics_t) data.readInt32();



            int input = openInput(&devices,

                                     &samplingRate,

                                     &format,

                                     &channels,

                                     acoutics);

                                     acoustics);

            reply->writeInt32(input);

            reply->writeInt32(devices);

            reply->writeInt32(samplingRate);

services/audioflinger/AudioFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -5089,7 +5089,7 @@ int AudioFlinger::openInput(uint32_t *pDevices, 
                                uint32_t *pSamplingRate,

                                audio_format_t *pFormat,

                                uint32_t *pChannels,

                                uint32_t acoustics)

                                audio_in_acoustics_t acoustics)

{

    status_t status;

    RecordThread *thread = NULL;
@@ -5114,7 +5114,7 @@ int AudioFlinger::openInput(uint32_t *pDevices, 


    status = inHwDev->open_input_stream(inHwDev, *pDevices, &format,

                                        &channels, &samplingRate,

                                        (audio_in_acoustics_t)acoustics,

                                        acoustics,

                                        &inStream);

    ALOGV("openInput() openInputStream returned input %p, SamplingRate %d, Format %d, Channels %x, acoustics %x, status %d",

            inStream,
@@ -5134,7 +5134,7 @@ int AudioFlinger::openInput(uint32_t *pDevices, 
        ALOGV("openInput() reopening with proposed sampling rate and channels");

        status = inHwDev->open_input_stream(inHwDev, *pDevices, &format,

                                            &channels, &samplingRate,

                                            (audio_in_acoustics_t)acoustics,

                                            acoustics,

                                            &inStream);

    }

services/audioflinger/AudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public: 
                            uint32_t *pSamplingRate,

                            audio_format_t *pFormat,

                            uint32_t *pChannels,

                            uint32_t acoustics);

                            audio_in_acoustics_t acoustics);



    virtual status_t closeInput(int input);

services/audioflinger/AudioPolicyService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ static audio_io_handle_t aps_open_input(void *service, 
                                            uint32_t *pSamplingRate,

                                            audio_format_t *pFormat,

                                            uint32_t *pChannels,

                                            uint32_t acoustics)

                                            audio_in_acoustics_t acoustics)

{

    sp<IAudioFlinger> af = AudioSystem::get_audio_flinger();

    if (af == NULL) {