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

Commit b795eed3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename AAudioStream_releaseTags to AAudioStream_destroyTags." into main

parents 945cd0a1 9e708930

media/libaaudio/fuzzer/libaaudio_fuzzer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ void LibAaudioFuzzer::process(const uint8_t *data, size_t size) { 
            [&]() {

                char** tags = nullptr;

                (void)AAudioStream_obtainTags(mAaudioStream, &tags);

                AAudioStream_releaseTags(mAaudioStream, tags);

                AAudioStream_destroyTags(mAaudioStream, tags);

            },

            [&]() {

                (void)AAudioStream_isMMapUsed(mAaudioStream);

media/libaaudio/include/system/aaudio/AAudio.h

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ void AAudioStreamBuilder_clearTags(AAudioStreamBuilder* _Nonnull builder); 
/**

 * Allocate and read the audio attributes' tags for the stream into a buffer.

 * The client is responsible to free the memory for tags by calling

 * {@link #AAudioStream_releaseTags} unless the number of tags is 0.

 * {@link #AAudioStream_destroyTags} unless the number of tags is 0.

 *

 * @param stream reference provided by AAudioStreamBuilder_openStream()

 * @param tags a pointer to a variable that will be set to a pointer to an array of char* pointers
@@ -82,7 +82,7 @@ int32_t AAudioStream_obtainTags(AAudioStream* _Nonnull stream, 
 * @param stream reference provided by AAudioStreamBuilder_openStream()

 * @param tags reference provided by AAudioStream_obtainTags()

 */

void AAudioStream_releaseTags(AAudioStream* _Nonnull stream, char* _Nonnull * _Nullable tags);

void AAudioStream_destroyTags(AAudioStream* _Nonnull stream, char* _Nonnull * _Nullable tags);



#ifdef __cplusplus

}

media/libaaudio/src/core/AAudioAudio.cpp

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ AAUDIO_API int32_t AAudioStream_obtainTags(AAudioStream* stream, char*** tags) 
    return aaTags.size();

}



AAUDIO_API void AAudioStream_releaseTags(AAudioStream* stream, char** tags) {

AAUDIO_API void AAudioStream_destroyTags(AAudioStream* stream, char** tags) {

    if (tags == nullptr) {

        return;

    }

media/libaaudio/src/libaaudio.map.txt

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ LIBAAUDIO { 
    AAudioStreamBuilder_addTag; # systemapi

    AAudioStreamBuilder_clearTags; # systemapi

    AAudioStream_obtainTags; # systemapi

    AAudioStream_releaseTags; #systemapi

    AAudioStream_destroyTags; #systemapi

  local:

    *;

};

media/libaaudio/tests/test_attributes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static void checkAttributes(aaudio_performance_mode_t perfMode, 
        readTagsSet.insert(readTags[i]);

    }

    EXPECT_EQ(addedTags, readTagsSet);

    AAudioStream_releaseTags(aaudioStream, readTags);

    AAudioStream_destroyTags(aaudioStream, readTags);



    aaudio_input_preset_t expectedPreset =

            (preset == DONT_SET || preset == AAUDIO_UNSPECIFIED)