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

Commit 2e2d634c authored by Phil Burk's avatar Phil Burk Committed by android-build-merger
Browse files

Merge "aaudio: restore _get and _setSamplesPerFrame()" into oc-mr1-dev 

am: d75cc634

Change-Id: I1bc1f5335d81f63bfffc6c6f42857e7b04ef5189
parents bc5ce871 d75cc634

media/libaaudio/include/aaudio/AAudio.h

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

                                                   int32_t channelCount);



/**

 * Identical to AAudioStreamBuilder_setChannelCount().

 *

 * @param builder reference provided by AAudio_createStreamBuilder()

 * @param samplesPerFrame Number of samples in a frame.

 */

AAUDIO_API void AAudioStreamBuilder_setSamplesPerFrame(AAudioStreamBuilder* builder,

                                                       int32_t samplesPerFrame);



/**

 * Request a sample data format, for example AAUDIO_FORMAT_PCM_I16.

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

AAUDIO_API int32_t AAudioStream_getChannelCount(AAudioStream* stream);



/**

 * Identical to AAudioStream_getChannelCount().

 *

 * @param stream reference provided by AAudioStreamBuilder_openStream()

 * @return actual number of samples 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

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

    AAudioStreamBuilder_setFramesPerDataCallback;

    AAudioStreamBuilder_setSampleRate;

    AAudioStreamBuilder_setSamplesPerFrame;

    AAudioStreamBuilder_setChannelCount;

    AAudioStreamBuilder_setFormat;

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

    AAudioStream_getXRunCount;

    AAudioStream_getSampleRate;

    AAudioStream_getSamplesPerFrame;

    AAudioStream_getChannelCount;

    AAudioStream_getPerformanceMode;

    AAudioStream_getDeviceId;

media/libaaudio/src/core/AAudioAudio.cpp

+12 −2
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ AAUDIO_API const char * AAudio_convertStreamStateToText(aaudio_stream_state_t st 
 */

static aaudio_policy_t s_MMapPolicy = AAUDIO_UNSPECIFIED;





static AudioStream *convertAAudioStreamToAudioStream(AAudioStream* stream)

{

    return (AudioStream*) stream;
@@ -150,6 +149,12 @@ AAUDIO_API void AAudioStreamBuilder_setChannelCount(AAudioStreamBuilder* builder 
    streamBuilder->setSamplesPerFrame(channelCount);

}



AAUDIO_API void AAudioStreamBuilder_setSamplesPerFrame(AAudioStreamBuilder* builder,

                                                       int32_t channelCount)

{

    AAudioStreamBuilder_setChannelCount(builder, channelCount);

}



AAUDIO_API void AAudioStreamBuilder_setDirection(AAudioStreamBuilder* builder,

                                             aaudio_direction_t direction)

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

}



AAUDIO_API int32_t AAudioStream_getSamplesPerFrame(AAudioStream* stream)

{

    return AAudioStream_getChannelCount(stream);

}



AAUDIO_API aaudio_stream_state_t AAudioStream_getState(AAudioStream* stream)

{

    AudioStream *audioStream = convertAAudioStreamToAudioStream(stream);