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

Commit 1dc2091f authored by Atneya Nair's avatar Atneya Nair
Browse files

Update test code to use refactored ctor/set 

Test: Compiles
Bug: 199156212
Change-Id: I6435a61e42ef3b7db15deae42441fb2b32885352
parent 9de98cca

media/libaudioclient/fuzzer/audioflinger_fuzzer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ void AudioFlingerFuzzer::invokeAudioRecord() { 
    attributionSource.packageName = std::string(mFdp.ConsumeRandomLengthString().c_str());

    attributionSource.token = sp<BBinder>::make();

    sp<AudioRecord> record = new AudioRecord(attributionSource);

    record->set(AUDIO_SOURCE_DEFAULT, sampleRate, format, channelMask, frameCount, nullptr, nullptr,

    record->set(AUDIO_SOURCE_DEFAULT, sampleRate, format, channelMask, frameCount, nullptr,

                notificationFrames, false, sessionId,

                fast ? AudioRecord::TRANSFER_CALLBACK : AudioRecord::TRANSFER_DEFAULT, flags,

                getuid(), getpid(), &attributes, AUDIO_PORT_HANDLE_NONE);

media/libaudioclient/tests/test_create_audiorecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -98,14 +98,14 @@ int testRecord(FILE *inputFile, int outputFileFd) 
        attributes.source = inputSource;



        sp<AudioRecord> record = new AudioRecord(attributionSource);

        const auto emptyCallback = sp<AudioRecord::IAudioRecordCallback>::make();



        record->set(AUDIO_SOURCE_DEFAULT,

                   sampleRate,

                   format,

                   channelMask,

                   frameCount,

                   fast ? callback : nullptr,

                   nullptr,

                   fast ? emptyCallback : nullptr,

                   notificationFrames,

                   false,

                   sessionId,

media/libaudioclient/tests/test_create_audiotrack.cpp

+4 −6
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <string.h>

#include <unistd.h>



#include <android/content/AttributionSourceState.h>

#include <binder/MemoryBase.h>

#include <binder/MemoryDealer.h>

#include <binder/MemoryHeapBase.h>
@@ -108,17 +109,15 @@ int testTrack(FILE *inputFile, int outputFileFd) 
        memset(&attributes, 0, sizeof(attributes));

        attributes.content_type = contentType;

        attributes.usage = usage;



        sp<AudioTrack> track = new AudioTrack();



        const auto emptyCallback = sp<AudioTrack::IAudioTrackCallback>::make();

        track->set(AUDIO_STREAM_DEFAULT,

                   sampleRate,

                   format,

                   channelMask,

                   frameCount,

                   flags,

                   (fast || offload) ? callback : nullptr,

                   nullptr,

                   (fast || offload) ? emptyCallback : nullptr,

                   notificationFrames,

                   sharedBuffer,

                   false,
@@ -126,8 +125,7 @@ int testTrack(FILE *inputFile, int outputFileFd) 
                   ((fast && sharedBuffer == 0) || offload) ?

                           AudioTrack::TRANSFER_CALLBACK : AudioTrack::TRANSFER_DEFAULT,

                   offload ? &offloadInfo : nullptr,

                   getuid(),

                   getpid(),

                   AttributionSourceState(),

                   &attributes,

                   false,

                   1.0f,

media/libaudioclient/tests/test_create_utils.cpp

+0 −4
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ bool checkVersion(FILE *inputFile, const char *version) 
    return true;

}



void callback(int event __unused, void* user __unused, void *info __unused)

{

}



int main(int argc, char **argv, test_func_t testFunc)

{

    FILE *inputFile = nullptr;

media/libaudioclient/tests/test_create_utils.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ int readLine(FILE *inputFile, char *line, int size); 


bool checkVersion(FILE *inputFile, const char *version);



void callback(int event, void* user, void *info);



typedef int (*test_func_t)(FILE *inputFile, int outputFileFd);