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

Commit 2829428f authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Remove obsolete get/setSamplesPerFrame 

AAudioStream_getSamplesPerFrame
AAudioStream_setSamplesPerFrame

Test: builds OK
Change-Id: If87fa17e37f2cb847f8258682ee9bd38246e981d
parent 12852bd1

media/libaaudio/examples/input_monitor/src/input_monitor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ int main(int argc, char **argv) 
    }

    aaudioStream = recorder.getStream();



    actualSamplesPerFrame = AAudioStream_getSamplesPerFrame(aaudioStream);

    actualSamplesPerFrame = AAudioStream_getChannelCount(aaudioStream);

    printf("SamplesPerFrame = %d\n", actualSamplesPerFrame);

    actualSampleRate = AAudioStream_getSampleRate(aaudioStream);

    printf("SamplesPerFrame = %d\n", actualSampleRate);

media/libaaudio/examples/utils/AAudioSimpleRecorder.h

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public: 
        if (mStream == nullptr) {

            return AAUDIO_ERROR_INVALID_STATE;

        }

        return AAudioStream_getSamplesPerFrame(mStream);;

        return AAudioStream_getChannelCount(mStream);;

    }

    /**

     * Only call this after open() has been called.
@@ -140,7 +140,7 @@ public: 


    // Write zero data to fill up the buffer and prevent underruns.

    aaudio_result_t prime() {

        int32_t samplesPerFrame = AAudioStream_getSamplesPerFrame(mStream);

        int32_t samplesPerFrame = AAudioStream_getChannelCount(mStream);

        const int numFrames = 32; // arbitrary

        float zeros[numFrames * samplesPerFrame];

        memset(zeros, 0, sizeof(zeros));
@@ -214,7 +214,7 @@ aaudio_data_callback_result_t SimpleRecorderDataCallbackProc( 
    }

    PeakTrackerData_t *data = (PeakTrackerData_t *) userData;

    // printf("MyCallbackProc(): frameCount = %d\n", numFrames);

    int32_t samplesPerFrame = AAudioStream_getSamplesPerFrame(stream);

    int32_t samplesPerFrame = AAudioStream_getChannelCount(stream);

    float sample;

    // This code assume mono or stereo.

    switch (AAudioStream_getFormat(stream)) {

media/libaaudio/include/aaudio/AAudio.h

+0 −17
Original line number Diff line number Diff line
@@ -233,14 +233,6 @@ AAUDIO_API void AAudioStreamBuilder_setSampleRate(AAudioStreamBuilder* builder, 
AAUDIO_API void AAudioStreamBuilder_setChannelCount(AAudioStreamBuilder* builder,

                                                   int32_t channelCount);



/**

 *

 * @deprecated use AAudioStreamBuilder_setChannelCount()

 */

// TODO remove as soon as the NDK and OS are in sync, before RC1

AAUDIO_API void AAudioStreamBuilder_setSamplesPerFrame(AAudioStreamBuilder* builder,

                                                       int32_t samplesPerFrame);



/**

 * Request a sample data format, for example AAUDIO_FORMAT_PCM_I16.

 *
@@ -728,15 +720,6 @@ AAUDIO_API int32_t AAudioStream_getSampleRate(AAudioStream* stream); 
 */

AAUDIO_API int32_t AAudioStream_getChannelCount(AAudioStream* stream);



/**

 * The samplesPerFrame is also known as channelCount.

 *

 * @deprecated use AAudioStream_getChannelCount()

 * @param stream reference provided by AAudioStreamBuilder_openStream()

 * @return actual samples per frame

 */

AAUDIO_API int32_t AAudioStream_getSamplesPerFrame(AAudioStream* stream);



/**

 * @param stream reference provided by AAudioStreamBuilder_openStream()

 * @return actual device ID

media/libaaudio/libaaudio.map.txt

+0 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ LIBAAUDIO { 
    AAudioStreamBuilder_setErrorCallback;

    AAudioStreamBuilder_setFramesPerDataCallback;

    AAudioStreamBuilder_setSampleRate;

    AAudioStreamBuilder_setSamplesPerFrame;

    AAudioStreamBuilder_setChannelCount;

    AAudioStreamBuilder_setFormat;

    AAudioStreamBuilder_setSharingMode;
@@ -35,7 +34,6 @@ LIBAAUDIO { 
    AAudioStream_getBufferCapacityInFrames;

    AAudioStream_getXRunCount;

    AAudioStream_getSampleRate;

    AAudioStream_getSamplesPerFrame;

    AAudioStream_getChannelCount;

    AAudioStream_getPerformanceMode;

    AAudioStream_getDeviceId;

media/libaaudio/src/core/AAudioAudio.cpp

+0 −13
Original line number Diff line number Diff line
@@ -150,13 +150,6 @@ AAUDIO_API void AAudioStreamBuilder_setChannelCount(AAudioStreamBuilder* builder 
    streamBuilder->setSamplesPerFrame(channelCount);

}



AAUDIO_API void AAudioStreamBuilder_setSamplesPerFrame(AAudioStreamBuilder* builder,

                                                       int32_t samplesPerFrame)

{

    AudioStreamBuilder *streamBuilder = convertAAudioBuilderToStreamBuilder(builder);

    streamBuilder->setSamplesPerFrame(samplesPerFrame);

}



AAUDIO_API void AAudioStreamBuilder_setDirection(AAudioStreamBuilder* builder,

                                             aaudio_direction_t direction)

{
@@ -355,12 +348,6 @@ AAUDIO_API int32_t AAudioStream_getChannelCount(AAudioStream* stream) 
    return audioStream->getSamplesPerFrame();

}



AAUDIO_API int32_t AAudioStream_getSamplesPerFrame(AAudioStream* stream)

{

    AudioStream *audioStream = convertAAudioStreamToAudioStream(stream);

    return audioStream->getSamplesPerFrame();

}



AAUDIO_API aaudio_stream_state_t AAudioStream_getState(AAudioStream* stream)

{

    AudioStream *audioStream = convertAAudioStreamToAudioStream(stream);