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

Commit 434ff75c authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "C2 VTS: Add support for C2StreamAudioFrameSizeInfo" am: 752aa7eb am:... 

Merge "C2 VTS: Add support for C2StreamAudioFrameSizeInfo" am: 752aa7eb am: bc1f1c82 am: 52adde62 am: 0f2d4dd2 am: 8a43e449

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1793632

Change-Id: Ia5acd0b48520283ed089173fd6918c7fd4651cd6
parents 1728c00c 8a43e449

media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioEncTest.cpp

+15 −5
Original line number Diff line number Diff line
@@ -301,13 +301,23 @@ c2_status_t Codec2AudioEncHidlTestBase::getSampleRate(int32_t* nSampleRate) { 
c2_status_t Codec2AudioEncHidlTestBase::getSamplesPerFrame(int32_t nChannels,

                                                           int32_t* samplesPerFrame) {

    std::vector<std::unique_ptr<C2Param>> queried;

    c2_status_t c2err = mComponent->query({}, {C2StreamMaxBufferSizeInfo::input::PARAM_TYPE},

    c2_status_t c2err = mComponent->query({}, {C2StreamAudioFrameSizeInfo::input::PARAM_TYPE},

                                          C2_DONT_BLOCK, &queried);

    size_t offset = sizeof(C2Param);

    uint32_t maxInputSize = 0;

    if (c2err == C2_OK && queried.size()) {

        C2Param* param = queried[0].get();

        maxInputSize = *(uint32_t*)((uint8_t*)param + offset);

    }



    if (0 == maxInputSize) {

        c2err = mComponent->query({}, {C2StreamMaxBufferSizeInfo::input::PARAM_TYPE}, C2_DONT_BLOCK,

                                  &queried);

        if (c2err != C2_OK || queried.size() == 0) return c2err;



    size_t offset = sizeof(C2Param);

        C2Param* param = queried[0].get();

    uint32_t maxInputSize = *(uint32_t*)((uint8_t*)param + offset);

        maxInputSize = *(uint32_t*)((uint8_t*)param + offset);

    }

    *samplesPerFrame = std::min((maxInputSize / (nChannels * 2)), kMaxSamplesPerFrame);



    return C2_OK;