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

Commit c868efc2 authored by Glenn Kasten's avatar Glenn Kasten Committed by android-build-merger
Browse files

Merge "aaudio: remove deprecated aaudio_audio_format_t" into oc-dev 

am: 897011a9

Change-Id: Ie816ea986457d444272b6cab13a6a23569714785
parents 77b455cf 897011a9

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

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ int main(int argc, char **argv) 
    AAudioSimpleRecorder recorder;

    int actualSamplesPerFrame;

    int actualSampleRate;

    const aaudio_audio_format_t requestedDataFormat = AAUDIO_FORMAT_PCM_I16;

    aaudio_audio_format_t actualDataFormat;

    const aaudio_format_t requestedDataFormat = AAUDIO_FORMAT_PCM_I16;

    aaudio_format_t actualDataFormat;



    const int requestedInputChannelCount = 1; // Can affect whether we get a FAST path.

media/libaaudio/examples/loopback/src/loopback.cpp

+4 −4
Original line number Diff line number Diff line
@@ -339,10 +339,10 @@ int main(int argc, const char **argv) 
    const int requestedOutputChannelCount = AAUDIO_UNSPECIFIED;

    const int requestedSampleRate = SAMPLE_RATE;

    int actualSampleRate = 0;

    const aaudio_audio_format_t requestedInputFormat = AAUDIO_FORMAT_PCM_I16;

    const aaudio_audio_format_t requestedOutputFormat = AAUDIO_FORMAT_PCM_FLOAT;

    aaudio_audio_format_t actualInputFormat;

    aaudio_audio_format_t actualOutputFormat;

    const aaudio_format_t requestedInputFormat = AAUDIO_FORMAT_PCM_I16;

    const aaudio_format_t requestedOutputFormat = AAUDIO_FORMAT_PCM_FLOAT;

    aaudio_format_t actualInputFormat;

    aaudio_format_t actualOutputFormat;



    const aaudio_sharing_mode_t requestedSharingMode = AAUDIO_SHARING_MODE_EXCLUSIVE;

    //const aaudio_sharing_mode_t requestedSharingMode = AAUDIO_SHARING_MODE_SHARED;

media/libaaudio/examples/write_sine/src/write_sine.cpp

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ int main(int argc, char **argv) 
    int actualChannelCount = 0;

    const int requestedSampleRate = SAMPLE_RATE;

    int actualSampleRate = 0;

    aaudio_audio_format_t requestedDataFormat = REQUESTED_FORMAT;

    aaudio_audio_format_t actualDataFormat = AAUDIO_FORMAT_UNSPECIFIED;

    aaudio_format_t requestedDataFormat = REQUESTED_FORMAT;

    aaudio_format_t actualDataFormat = AAUDIO_FORMAT_UNSPECIFIED;

    aaudio_sharing_mode_t actualSharingMode = AAUDIO_SHARING_MODE_SHARED;



    AAudioStream *aaudioStream = nullptr;

media/libaaudio/include/aaudio/AAudio.h

+2 −8
Original line number Diff line number Diff line
@@ -58,12 +58,6 @@ enum { 
};

typedef int32_t aaudio_format_t;



/**

 * @deprecated use aaudio_format_t instead

 * TODO remove when tests and examples are updated

 */

typedef int32_t aaudio_audio_format_t;



enum {

    AAUDIO_OK,

    AAUDIO_ERROR_BASE = -900, // TODO review
@@ -263,7 +257,7 @@ AAUDIO_API void AAudioStreamBuilder_setSamplesPerFrame(AAudioStreamBuilder* buil 
 * @param format common formats are AAUDIO_FORMAT_PCM_FLOAT and AAUDIO_FORMAT_PCM_I16.

 */

AAUDIO_API void AAudioStreamBuilder_setFormat(AAudioStreamBuilder* builder,

                                                   aaudio_audio_format_t format);

                                                   aaudio_format_t format);



/**

 * Request a mode for sharing the device.
@@ -754,7 +748,7 @@ AAUDIO_API int32_t AAudioStream_getDeviceId(AAudioStream* stream); 
 * @param stream reference provided by AAudioStreamBuilder_openStream()

 * @return actual data format

 */

AAUDIO_API aaudio_audio_format_t AAudioStream_getFormat(AAudioStream* stream);

AAUDIO_API aaudio_format_t AAudioStream_getFormat(AAudioStream* stream);



/**

 * Provide actual sharing mode.

media/libaaudio/src/binding/AAudioStreamConfiguration.cpp

+2 −5
Original line number Diff line number Diff line
@@ -55,19 +55,16 @@ error: 
}



status_t AAudioStreamConfiguration::readFromParcel(const Parcel* parcel) {

    int32_t temp;

    status_t status = parcel->readInt32(&mDeviceId);

    if (status != NO_ERROR) goto error;

    status = parcel->readInt32(&mSampleRate);

    if (status != NO_ERROR) goto error;

    status = parcel->readInt32(&mSamplesPerFrame);

    if (status != NO_ERROR) goto error;

    status = parcel->readInt32(&temp);

    status = parcel->readInt32(&mSharingMode);

    if (status != NO_ERROR) goto error;

    mSharingMode = (aaudio_sharing_mode_t) temp;

    status = parcel->readInt32(&temp);

    status = parcel->readInt32(&mAudioFormat);

    if (status != NO_ERROR) goto error;

    mAudioFormat = (aaudio_audio_format_t) temp;

    status = parcel->readInt32(&mBufferCapacity);

    if (status != NO_ERROR) goto error;

    return NO_ERROR;