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

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

Merge "Use audio_source_t consistently"

parents c1f63ddb 0f0fbd94

core/jni/android_media_AudioRecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, 
    int frameSize = nbChannels * bytesPerSample;

    size_t frameCount = buffSizeInBytes / frameSize;

    

    if (source >= AUDIO_SOURCE_CNT) {

    if (uint32_t(source) >= AUDIO_SOURCE_CNT) {

        ALOGE("Error creating AudioRecord: unknown source.");

        return AUDIORECORD_ERROR_SETUP_INVALIDSOURCE;

    }
@@ -198,7 +198,7 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this, 
    // we use a weak reference so the AudioRecord object can be garbage collected.

    lpCallbackData->audioRecord_ref = env->NewGlobalRef(weak_this);

    

    lpRecorder->set(source,

    lpRecorder->set((audio_source_t) source,

        sampleRateInHertz,

        format,        // word length, PCM

        channels,

include/media/AudioRecord.h

+4 −5
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public: 
         RECORD_IIR_ENABLE = AUDIO_IN_ACOUSTICS_TX_IIR_ENABLE,

     };



                        AudioRecord(int inputSource,

                        AudioRecord(audio_source_t inputSource,

                                    uint32_t sampleRate = 0,

                                    audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                    uint32_t channelMask = AUDIO_CHANNEL_IN_MONO,
@@ -175,7 +175,7 @@ public: 
     *  - NO_INIT: audio server or audio hardware not initialized

     *  - PERMISSION_DENIED: recording is not allowed for the requesting process

     * */

            status_t    set(int inputSource     = 0,

            status_t    set(audio_source_t inputSource = AUDIO_SOURCE_DEFAULT,

                            uint32_t sampleRate = 0,

                            audio_format_t format = AUDIO_FORMAT_DEFAULT,

                            uint32_t channelMask = AUDIO_CHANNEL_IN_MONO,
@@ -208,7 +208,7 @@ public: 
            int         channels() const;

            uint32_t    frameCount() const;

            size_t      frameSize() const;

            int         inputSource() const;

            audio_source_t inputSource() const;





    /* After it's created the track is not active. Call start() to
@@ -367,8 +367,7 @@ private: 
    audio_track_cblk_t*     mCblk;

    audio_format_t          mFormat;

    uint8_t                 mChannelCount;

    uint8_t                 mInputSource;

    uint8_t                 mReserved[2];

    audio_source_t          mInputSource;

    status_t                mStatus;

    uint32_t                mLatency;

include/media/AudioSystem.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public: 
                               audio_stream_type_t stream,

                               int session = 0);

    static void releaseOutput(audio_io_handle_t output);

    static audio_io_handle_t getInput(int inputSource,

    static audio_io_handle_t getInput(audio_source_t inputSource,

                                    uint32_t samplingRate = 0,

                                    audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                    uint32_t channels = AUDIO_CHANNEL_IN_MONO,

include/media/IAudioPolicyService.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public: 
                                audio_stream_type_t stream,

                                int session = 0) = 0;

    virtual void releaseOutput(audio_io_handle_t output) = 0;

    virtual audio_io_handle_t getInput(int inputSource,

    virtual audio_io_handle_t getInput(audio_source_t inputSource,

                                    uint32_t samplingRate = 0,

                                    audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                    uint32_t channels = 0,

include/media/stagefright/AudioSource.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct AudioSource : public MediaSource, public MediaBufferObserver { 
    // Note that the "channels" parameter is _not_ the number of channels,

    // but a bitmask of audio_channels_t constants.

    AudioSource(

            int inputSource, uint32_t sampleRate,

            audio_source_t inputSource, uint32_t sampleRate,

            uint32_t channels = AUDIO_CHANNEL_IN_MONO);



    status_t initCheck() const;