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

Commit 58f30210 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Use audio_format_t consistently, continued 

Was int or uint32_t.

When AudioFlinger::format can't determine the correct format,
return INVALID rather than DEFAULT.

Init mFormat to INVALID rather than DEFAULT in the constructor.
Subclass constructors will set mFormat to the correct value.

Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
parent 9bf3a2f6

include/media/AudioRecord.h

+7 −7
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public: 
        };

        uint32_t    flags;

        int         channelCount;

        int         format;

        audio_format_t format;

        size_t      frameCount;

        size_t      size;

        union {
@@ -112,7 +112,7 @@ public: 


     static status_t getMinFrameCount(int* frameCount,

                                      uint32_t sampleRate,

                                      int format,

                                      audio_format_t format,

                                      int channelCount);



    /* Constructs an uninitialized AudioRecord. No connection with
@@ -151,7 +151,7 @@ public: 


                        AudioRecord(int inputSource,

                                    uint32_t sampleRate = 0,

                                    int format          = 0,

                                    audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                    uint32_t channelMask = AUDIO_CHANNEL_IN_MONO,

                                    int frameCount      = 0,

                                    uint32_t flags      = 0,
@@ -177,7 +177,7 @@ public: 
     * */

            status_t    set(int inputSource     = 0,

                            uint32_t sampleRate = 0,

                            int format          = 0,

                            audio_format_t format = AUDIO_FORMAT_DEFAULT,

                            uint32_t channelMask = AUDIO_CHANNEL_IN_MONO,

                            int frameCount      = 0,

                            uint32_t flags      = 0,
@@ -203,7 +203,7 @@ public: 


   /* getters, see constructor */



            int         format() const;

            audio_format_t format() const;

            int         channelCount() const;

            int         channels() const;

            uint32_t    frameCount() const;
@@ -349,7 +349,7 @@ private: 


            bool processAudioBuffer(const sp<ClientRecordThread>& thread);

            status_t openRecord_l(uint32_t sampleRate,

                                uint32_t format,

                                audio_format_t format,

                                uint32_t channelMask,

                                int frameCount,

                                uint32_t flags,
@@ -365,7 +365,7 @@ private: 
    uint32_t                mFrameCount;



    audio_track_cblk_t*     mCblk;

    uint32_t                mFormat;

    audio_format_t          mFormat;

    uint8_t                 mChannelCount;

    uint8_t                 mInputSource;

    uint8_t                 mReserved[2];

include/media/AudioSystem.h

+5 −5
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public: 


    static bool routedToA2dpOutput(audio_stream_type_t streamType);



    static status_t getInputBufferSize(uint32_t sampleRate, int format, int channelCount,

    static status_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount,

        size_t* buffSize);



    static status_t setVoiceVolume(float volume);
@@ -134,7 +134,7 @@ public: 
    class OutputDescriptor {

    public:

        OutputDescriptor()

        : samplingRate(0), format(0), channels(0), frameCount(0), latency(0)  {}

        : samplingRate(0), format(AUDIO_FORMAT_DEFAULT), channels(0), frameCount(0), latency(0)  {}



        uint32_t samplingRate;

        int32_t format;
@@ -153,7 +153,7 @@ public: 
    static audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage);

    static audio_io_handle_t getOutput(audio_stream_type_t stream,

                                        uint32_t samplingRate = 0,

                                        uint32_t format = AUDIO_FORMAT_DEFAULT,

                                        audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                        uint32_t channels = AUDIO_CHANNEL_OUT_STEREO,

                                        audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_INDIRECT);

    static status_t startOutput(audio_io_handle_t output,
@@ -165,7 +165,7 @@ public: 
    static void releaseOutput(audio_io_handle_t output);

    static audio_io_handle_t getInput(int inputSource,

                                    uint32_t samplingRate = 0,

                                    uint32_t format = AUDIO_FORMAT_DEFAULT,

                                    audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                    uint32_t channels = AUDIO_CHANNEL_IN_MONO,

                                    audio_in_acoustics_t acoustics = (audio_in_acoustics_t)0,

                                    int sessionId = 0);
@@ -242,7 +242,7 @@ private: 
    static size_t gInBuffSize;

    // previous parameters for recording buffer size queries

    static uint32_t gPrevInSamplingRate;

    static int gPrevInFormat;

    static audio_format_t gPrevInFormat;

    static int gPrevInChannelCount;



    static sp<IAudioPolicyService> gAudioPolicyService;

include/media/IAudioFlinger.h

+6 −6
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public: 
                                pid_t pid,

                                audio_stream_type_t streamType,

                                uint32_t sampleRate,

                                uint32_t format,

                                audio_format_t format,

                                uint32_t channelMask,

                                int frameCount,

                                uint32_t flags,
@@ -61,7 +61,7 @@ public: 
                                pid_t pid,

                                int input,

                                uint32_t sampleRate,

                                uint32_t format,

                                audio_format_t format,

                                uint32_t channelMask,

                                int frameCount,

                                uint32_t flags,
@@ -73,7 +73,7 @@ public: 
     */

    virtual     uint32_t    sampleRate(int output) const = 0;

    virtual     int         channelCount(int output) const = 0;

    virtual     uint32_t    format(int output) const = 0;

    virtual     audio_format_t format(int output) const = 0;

    virtual     size_t      frameCount(int output) const = 0;

    virtual     uint32_t    latency(int output) const = 0;
@@ -109,11 +109,11 @@ public: 
    virtual void registerClient(const sp<IAudioFlingerClient>& client) = 0;



    // retrieve the audio recording buffer size

    virtual size_t getInputBufferSize(uint32_t sampleRate, int format, int channelCount) = 0;

    virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount) = 0;



    virtual int openOutput(uint32_t *pDevices,

                                    uint32_t *pSamplingRate,

                                    uint32_t *pFormat,

                                    audio_format_t *pFormat,

                                    uint32_t *pChannels,

                                    uint32_t *pLatencyMs,

                                    uint32_t flags) = 0;
@@ -124,7 +124,7 @@ public: 


    virtual int openInput(uint32_t *pDevices,

                                    uint32_t *pSamplingRate,

                                    uint32_t *pFormat,

                                    audio_format_t *pFormat,

                                    uint32_t *pChannels,

                                    uint32_t acoustics) = 0;

    virtual status_t closeInput(int input) = 0;

include/media/IAudioPolicyService.h

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public: 
    virtual audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage) = 0;

    virtual audio_io_handle_t getOutput(audio_stream_type_t stream,

                                        uint32_t samplingRate = 0,

                                        uint32_t format = AUDIO_FORMAT_DEFAULT,

                                        audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                        uint32_t channels = 0,

                                        audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_INDIRECT) = 0;

    virtual status_t startOutput(audio_io_handle_t output,
@@ -62,7 +62,7 @@ public: 
    virtual void releaseOutput(audio_io_handle_t output) = 0;

    virtual audio_io_handle_t getInput(int inputSource,

                                    uint32_t samplingRate = 0,

                                    uint32_t format = AUDIO_FORMAT_DEFAULT,

                                    audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                    uint32_t channels = 0,

                                    audio_in_acoustics_t acoustics = (audio_in_acoustics_t)0,

                                    int audioSession = 0) = 0;

media/libmedia/AudioRecord.cpp

+6 −6
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ namespace android { 
status_t AudioRecord::getMinFrameCount(

        int* frameCount,

        uint32_t sampleRate,

        int format,

        audio_format_t format,

        int channelCount)

{

    size_t size = 0;
@@ -86,7 +86,7 @@ AudioRecord::AudioRecord() 
AudioRecord::AudioRecord(

        int inputSource,

        uint32_t sampleRate,

        int format,

        audio_format_t format,

        uint32_t channelMask,

        int frameCount,

        uint32_t flags,
@@ -121,7 +121,7 @@ AudioRecord::~AudioRecord() 
status_t AudioRecord::set(

        int inputSource,

        uint32_t sampleRate,

        int format,

        audio_format_t format,

        uint32_t channelMask,

        int frameCount,

        uint32_t flags,
@@ -148,7 +148,7 @@ status_t AudioRecord::set( 
        sampleRate = DEFAULT_SAMPLE_RATE;

    }

    // these below should probably come from the audioFlinger too...

    if (format == 0) {

    if (format == AUDIO_FORMAT_DEFAULT) {

        format = AUDIO_FORMAT_PCM_16_BIT;

    }

    // validate parameters
@@ -248,7 +248,7 @@ uint32_t AudioRecord::latency() const 
    return mLatency;

}



int AudioRecord::format() const

audio_format_t AudioRecord::format() const

{

    return mFormat;

}
@@ -448,7 +448,7 @@ unsigned int AudioRecord::getInputFramesLost() 
// must be called with mLock held

status_t AudioRecord::openRecord_l(

        uint32_t sampleRate,

        uint32_t format,

        audio_format_t format,

        uint32_t channelMask,

        int frameCount,

        uint32_t flags,