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

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

Merge "AudioRecord has no default sample rate"

parents fd87902a f0f33c4a

include/media/AudioRecord.h

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ class AudioRecord : public RefBase 
{

public:



    static const int DEFAULT_SAMPLE_RATE = 8000;



    /* Events used by AudioRecord callback function (callback_t).

     * Keep in sync with frameworks/base/media/java/android/media/AudioRecord.java NATIVE_EVENT_*.

     */

media/libmedia/AudioRecord.cpp

+2 −1
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ status_t AudioRecord::set( 
    }



    if (sampleRate == 0) {

        sampleRate = DEFAULT_SAMPLE_RATE;

        ALOGE("Invalid sample rate %u", sampleRate);

        return BAD_VALUE;

    }

    mSampleRate = sampleRate;