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

Commit ccc194cf authored by Ram Mohan M's avatar Ram Mohan M Committed by Zhuoyao Zhang
Browse files

Omx vts test. 

Bug:32023356
Test: make vts.

Merged-In: I83b454b999203fb94bc4cc50c91bd99f788131b3

secure buffer allocation for secure components

As of now, we see a crash in encoder test application on secure components
This is due to nullptr access. setting property media.mediadrmservice.enable
to 1 causes a different crash sigabrt(). In decoder securebufferallocation
call passes but we havent done anything with it. This commit needs more work.

Change-Id: I19127e39ad7daf66ac5277406e3857ec45c99e0a

add debug code

This can come in handy to view the decoded/encoded content or
for computation of psnr

Change-Id: I80e60349c76c02e5098df667223a0227f59b8324

video encoder test with anw input buffer

In this commit, anw buffers are provided as input for encoding
as opposed to byte buffers. In process IOmxNode, IGraphicBufferSource api
calls are tested

Change-Id: I7ec4af0746fe59221de42e56b344852d8fadc4f2

add support for additional color formats

Change-Id: Ia88ef9c95882958a68fee5cc68e146c3502a1b48

add eos and timestamp deviation test to video encoder

Change-Id: I9ebeaa53a986ec3f8a2ef55306877aec808d2add

add metamode support for video decoders

Change-Id: I7d6d6991cdc0ed36241d0e99c7a23675664acb10

add a timeout while processing input buffers

do not wait on input buffers processing to complete for an
indefinite amount of time. wait for a predefined duration and
leave

Change-Id: Icceaf0737a52e62f47bc052367e7ddbdc1868a46

move duplicate code to a library

move routines common across audio, video, component folders to a static
library

Change-Id: I55bf21e47571490e989b52b82c48c6e9a4b23745

add end of stream test for audio encoder

add eos test for audio encoder and some more code cleanup

Change-Id: I9d670ed53f6bba5802f919ec915e67bb0fa83518

Ensure all the buffers allocated are cycled

use all buffers provided by the component (even if it is greater than the
number of buffers needed by the bitstream)

Change-Id: I83b454b999203fb94bc4cc50c91bd99f788131b3

move duplicate code to a library - II

Change-Id: I375603feb9da303adc6a2d75ef59e43a11c3bd6d

Change-Id: I83b454b999203fb94bc4cc50c91bd99f788131b3
(cherry picked from commit 1da607c5)
parent 5b14a882

media/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ subdirs = [ 
    "1.0",

    "omx/1.0",

    "omx/1.0/vts/functional/audio",

    "omx/1.0/vts/functional/common",

    "omx/1.0/vts/functional/component",

    "omx/1.0/vts/functional/master",

    "omx/1.0/vts/functional/video",

media/omx/1.0/vts/functional/audio/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ cc_test { 
        "android.hidl.memory@1.0",

        "android.hardware.media.omx@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    static_libs: ["VtsHalHidlTargetTestBase",

                  "VtsHalMediaOmxV1_0CommonUtil"],

    cflags: [

        "-O0",

        "-g",
@@ -65,7 +66,8 @@ cc_test { 
        "android.hidl.memory@1.0",

        "android.hardware.media.omx@1.0",

    ],

    static_libs: ["VtsHalHidlTargetTestBase"],

    static_libs: ["VtsHalHidlTargetTestBase",

                  "VtsHalMediaOmxV1_0CommonUtil"],

    cflags: [

        "-O0",

        "-g",

media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp

+45 −50
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ using ::android::hardware::media::omx::V1_0::IOmxObserver; 
using ::android::hardware::media::omx::V1_0::IOmxNode;

using ::android::hardware::media::omx::V1_0::Message;

using ::android::hardware::media::omx::V1_0::CodecBuffer;

using ::android::hardware::media::omx::V1_0::PortMode;

using ::android::hidl::allocator::V1_0::IAllocator;

using ::android::hidl::memory::V1_0::IMemory;

using ::android::hidl::memory::V1_0::IMapper;
@@ -136,7 +137,9 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
            gEnv->getInstance());

        ASSERT_NE(omx, nullptr);

        observer =

            new CodecObserver([this](Message msg) { handleMessage(msg); });

            new CodecObserver([this](Message msg, const BufferInfo* buffer) {

                handleMessage(msg, buffer);

            });

        ASSERT_NE(observer, nullptr);

        if (strncmp(gEnv->getComponent().c_str(), "OMX.", 4) != 0)

            disableTest = true;
@@ -218,7 +221,8 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 


    // callback function to process messages received by onMessages() from IL

    // client.

    void handleMessage(Message msg) {

    void handleMessage(Message msg, const BufferInfo* buffer) {

        (void)buffer;

        if (msg.type == Message::Type::FILL_BUFFER_DONE) {

            if (msg.data.extendedBufferData.flags & OMX_BUFFERFLAG_EOS) {

                eosFlag = true;
@@ -254,12 +258,25 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
                        }

                    }

                }

#define WRITE_OUTPUT 0

#if WRITE_OUTPUT

                static int count = 0;

                FILE* ofp = nullptr;

                if (count)

                    ofp = fopen("out.bin", "ab");

                else

                    ofp = fopen("out.bin", "wb");

                if (ofp != nullptr) {

                    fwrite(static_cast<void*>(buffer->mMemory->getPointer()),

                           sizeof(char),

                           msg.data.extendedBufferData.rangeLength, ofp);

                    fclose(ofp);

                    count++;

                }

#endif

            }

        }

    }



    void testEOS(android::Vector<BufferInfo>* iBuffer,

                 android::Vector<BufferInfo>* oBuffer, bool signalEOS = false);



    enum standardComp {

        mp3,
@@ -294,44 +311,6 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
    }

};



// end of stream test for audio decoder components

void AudioDecHidlTest::testEOS(android::Vector<BufferInfo>* iBuffer,

                               android::Vector<BufferInfo>* oBuffer,

                               bool signalEOS) {

    android::hardware::media::omx::V1_0::Status status;

    size_t i = 0;

    if (signalEOS) {

        if ((i = getEmptyBufferID(iBuffer)) < iBuffer->size()) {

            // signal an empty buffer with flag set to EOS

            dispatchInputBuffer(omxNode, iBuffer, i, 0, OMX_BUFFERFLAG_EOS, 0);

        } else {

            ASSERT_TRUE(false);

        }

    }

    // Dispatch all client owned output buffers to recover remaining frames

    while (1) {

        if ((i = getEmptyBufferID(oBuffer)) < oBuffer->size()) {

            dispatchOutputBuffer(omxNode, oBuffer, i);

        } else {

            break;

        }

    }

    while (1) {

        Message msg;

        status =

            observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);

        EXPECT_EQ(status,

                  android::hardware::media::omx::V1_0::Status::TIMED_OUT);

        for (; i < iBuffer->size(); i++) {

            if ((*iBuffer)[i].owner != client) break;

        }

        if (i == iBuffer->size()) break;

    }

    // test for flag

    EXPECT_EQ(eosFlag, true);

    eosFlag = false;

}



// Set Default port param.

void setDefaultPortParam(

    sp<IOmxNode> omxNode, OMX_U32 portIndex, OMX_AUDIO_CODINGTYPE eEncoding,
@@ -580,8 +559,9 @@ void waitOnInputConsumption(sp<IOmxNode> omxNode, sp<CodecObserver> observer, 
                            OMX_U32 kPortIndexInput, OMX_U32 kPortIndexOutput) {

    android::hardware::media::omx::V1_0::Status status;

    Message msg;

    int timeOut = TIMEOUT_COUNTER;



    while (1) {

    while (timeOut--) {

        size_t i = 0;

        status =

            observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);
@@ -603,6 +583,7 @@ void waitOnInputConsumption(sp<IOmxNode> omxNode, sp<CodecObserver> observer, 
        if ((index = getEmptyBufferID(oBuffer)) < oBuffer->size()) {

            dispatchOutputBuffer(omxNode, oBuffer, index);

        }

        timeOut--;

    }

}
@@ -642,6 +623,8 @@ void decodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer, 
        frameID++;

    }



    int timeOut = TIMEOUT_COUNTER;

    bool stall = false;

    while (1) {

        status =

            observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);
@@ -672,9 +655,21 @@ void decodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer, 
                                (*Info)[frameID].bytesCount, flags,

                                (*Info)[frameID].timestamp);

            frameID++;

        }

            stall = false;

        } else

            stall = true;

        if ((index = getEmptyBufferID(oBuffer)) < oBuffer->size()) {

            dispatchOutputBuffer(omxNode, oBuffer, index);

            stall = false;

        } else

            stall = true;

        if (stall)

            timeOut--;

        else

            timeOut = TIMEOUT_COUNTER;

        if (timeOut == 0) {

            EXPECT_TRUE(false) << "Wait on Input/Output is found indefinite";

            break;

        }

    }

}
@@ -778,7 +773,7 @@ TEST_F(AudioDecHidlTest, DecodeTest) { 
    eleStream.close();

    waitOnInputConsumption(omxNode, observer, &iBuffer, &oBuffer, eEncoding,

                           kPortIndexInput, kPortIndexOutput);

    testEOS(&iBuffer, &oBuffer);

    testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag);

    EXPECT_EQ(timestampUslist.empty(), true);

    // set state to idle

    changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
@@ -825,7 +820,7 @@ TEST_F(AudioDecHidlTest, EOSTest_M) { 
    changeStateIdletoExecute(omxNode, observer);



    // request EOS at the start

    testEOS(&iBuffer, &oBuffer, true);

    testEOS(omxNode, observer, &iBuffer, &oBuffer, true, eosFlag);

    flushPorts(omxNode, observer, &iBuffer, &oBuffer, kPortIndexInput,

               kPortIndexOutput);

    EXPECT_GE(framesReceived, 0U);
@@ -908,7 +903,7 @@ TEST_F(AudioDecHidlTest, ThumbnailTest) { 
    eleStream.close();

    waitOnInputConsumption(omxNode, observer, &iBuffer, &oBuffer, eEncoding,

                           kPortIndexInput, kPortIndexOutput);

    testEOS(&iBuffer, &oBuffer);

    testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag);

    flushPorts(omxNode, observer, &iBuffer, &oBuffer, kPortIndexInput,

               kPortIndexOutput);

    EXPECT_GE(framesReceived, 1U);
@@ -924,7 +919,7 @@ TEST_F(AudioDecHidlTest, ThumbnailTest) { 
    eleStream.close();

    waitOnInputConsumption(omxNode, observer, &iBuffer, &oBuffer, eEncoding,

                           kPortIndexInput, kPortIndexOutput);

    testEOS(&iBuffer, &oBuffer, true);

    testEOS(omxNode, observer, &iBuffer, &oBuffer, true, eosFlag);

    flushPorts(omxNode, observer, &iBuffer, &oBuffer, kPortIndexInput,

               kPortIndexOutput);

    EXPECT_GE(framesReceived, 1U);
@@ -1004,7 +999,7 @@ TEST_F(AudioDecHidlTest, SimpleEOSTest) { 
    eleStream.close();

    waitOnInputConsumption(omxNode, observer, &iBuffer, &oBuffer, eEncoding,

                           kPortIndexInput, kPortIndexOutput);

    testEOS(&iBuffer, &oBuffer);

    testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag);

    flushPorts(omxNode, observer, &iBuffer, &oBuffer, kPortIndexInput,

               kPortIndexOutput);

    framesReceived = 0;

media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioEncTest.cpp

+98 −12
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ using ::android::hardware::media::omx::V1_0::IOmxObserver; 
using ::android::hardware::media::omx::V1_0::IOmxNode;

using ::android::hardware::media::omx::V1_0::Message;

using ::android::hardware::media::omx::V1_0::CodecBuffer;

using ::android::hardware::media::omx::V1_0::PortMode;

using ::android::hidl::allocator::V1_0::IAllocator;

using ::android::hidl::memory::V1_0::IMemory;

using ::android::hidl::memory::V1_0::IMapper;
@@ -135,7 +136,10 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        omx = ::testing::VtsHalHidlTargetTestBase::getService<IOmx>(

            gEnv->getInstance());

        ASSERT_NE(omx, nullptr);

        observer = new CodecObserver([this](Message msg) { (void)msg; });

        observer =

            new CodecObserver([this](Message msg, const BufferInfo* buffer) {

                handleMessage(msg, buffer);

            });

        ASSERT_NE(observer, nullptr);

        if (strncmp(gEnv->getComponent().c_str(), "OMX.", 4) != 0)

            disableTest = true;
@@ -191,6 +195,7 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
            }

        }

        if (i == kNumCompToCoding) disableTest = true;

        eosFlag = false;

        if (disableTest) std::cerr << "[          ] Warning !  Test Disabled\n";

    }
@@ -201,6 +206,36 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        }

    }



    // callback function to process messages received by onMessages() from IL

    // client.

    void handleMessage(Message msg, const BufferInfo* buffer) {

        (void)buffer;



        if (msg.type == Message::Type::FILL_BUFFER_DONE) {

            if (msg.data.extendedBufferData.flags & OMX_BUFFERFLAG_EOS) {

                eosFlag = true;

            }

            if (msg.data.extendedBufferData.rangeLength != 0) {

#define WRITE_OUTPUT 0

#if WRITE_OUTPUT

                static int count = 0;

                FILE* ofp = nullptr;

                if (count)

                    ofp = fopen("out.bin", "ab");

                else

                    ofp = fopen("out.bin", "wb");

                if (ofp != nullptr) {

                    fwrite(static_cast<void*>(buffer->mMemory->getPointer()),

                           sizeof(char),

                           msg.data.extendedBufferData.rangeLength, ofp);

                    fclose(ofp);

                    count++;

                }

#endif

            }

        }

    }



    enum standardComp {

        amrnb,

        amrwb,
@@ -215,6 +250,7 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
    standardComp compName;

    OMX_AUDIO_CODINGTYPE eEncoding;

    bool disableTest;

    bool eosFlag;



   protected:

    static void description(const std::string& description) {
@@ -289,12 +325,44 @@ void GetURLForComponent(AudioEncHidlTest::standardComp comp, char* mURL) { 
    }

}



// blocking call to ensures application to Wait till all the inputs are consumed

void waitOnInputConsumption(sp<IOmxNode> omxNode, sp<CodecObserver> observer,

                            android::Vector<BufferInfo>* iBuffer,

                            android::Vector<BufferInfo>* oBuffer) {

    android::hardware::media::omx::V1_0::Status status;

    Message msg;

    int timeOut = TIMEOUT_COUNTER;



    while (timeOut--) {

        size_t i = 0;

        status =

            observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);

        EXPECT_EQ(status,

                  android::hardware::media::omx::V1_0::Status::TIMED_OUT);

        // status == TIMED_OUT, it could be due to process time being large

        // than DEFAULT_TIMEOUT or component needs output buffers to start

        // processing.

        for (; i < iBuffer->size(); i++) {

            if ((*iBuffer)[i].owner != client) break;

        }

        if (i == iBuffer->size()) break;



        // Dispatch an output buffer assuming outQueue.empty() is true

        size_t index;

        if ((index = getEmptyBufferID(oBuffer)) < oBuffer->size()) {

            dispatchOutputBuffer(omxNode, oBuffer, index);

        }

        timeOut--;

    }

}



// Encode N Frames

void encodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer,

                   android::Vector<BufferInfo>* iBuffer,

                   android::Vector<BufferInfo>* oBuffer, uint32_t nFrames,

                   int32_t samplesPerFrame, int32_t nChannels,

                   int32_t nSampleRate, std::ifstream& eleStream) {

                   int32_t nSampleRate, std::ifstream& eleStream,

                   bool signalEOS = true) {

    android::hardware::media::omx::V1_0::Status status;

    Message msg;
@@ -307,6 +375,7 @@ void encodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer, 
    int32_t timestampIncr =

        (int)(((float)samplesPerFrame / nSampleRate) * 1000000);

    uint64_t timestamp = 0;

    uint32_t flags = 0;

    for (size_t i = 0; i < iBuffer->size() && nFrames != 0; i++) {

        char* ipBuffer = static_cast<char*>(

            static_cast<void*>((*iBuffer)[i].mMemory->getPointer()));
@@ -314,11 +383,14 @@ void encodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer, 
                  static_cast<int>((*iBuffer)[i].mMemory->getSize()));

        eleStream.read(ipBuffer, bytesCount);

        if (eleStream.gcount() != bytesCount) break;

        dispatchInputBuffer(omxNode, iBuffer, i, bytesCount, 0, timestamp);

        if (signalEOS && (nFrames == 1)) flags = OMX_BUFFERFLAG_EOS;

        dispatchInputBuffer(omxNode, iBuffer, i, bytesCount, flags, timestamp);

        timestamp += timestampIncr;

        nFrames--;

    }



    int timeOut = TIMEOUT_COUNTER;

    bool stall = false;

    while (1) {

        status =

            observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);
@@ -337,14 +409,27 @@ void encodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer, 
                      static_cast<int>((*iBuffer)[index].mMemory->getSize()));

            eleStream.read(ipBuffer, bytesCount);

            if (eleStream.gcount() != bytesCount) break;

            dispatchInputBuffer(omxNode, iBuffer, index, bytesCount, 0,

            if (signalEOS && (nFrames == 1)) flags = OMX_BUFFERFLAG_EOS;

            dispatchInputBuffer(omxNode, iBuffer, index, bytesCount, flags,

                                timestamp);

            timestamp += timestampIncr;

            nFrames--;

        }

            stall = false;

        } else

            stall = true;

        // Dispatch output buffer

        if ((index = getEmptyBufferID(oBuffer)) < oBuffer->size()) {

            dispatchOutputBuffer(omxNode, oBuffer, index);

            stall = false;

        } else

            stall = true;

        if (stall)

            timeOut--;

        else

            timeOut = TIMEOUT_COUNTER;

        if (timeOut == 0) {

            EXPECT_TRUE(false) << "Wait on Input/Output is found indefinite";

            break;

        }

    }

}
@@ -380,8 +465,8 @@ TEST_F(AudioEncHidlTest, EnumeratePortFormat) { 
}



// test raw stream encode

TEST_F(AudioEncHidlTest, EncodeTest) {

    description("Tests Encode");

TEST_F(AudioEncHidlTest, SimpleEncodeTest) {

    description("Tests Basic encoding and EOS");

    if (disableTest) return;

    android::hardware::media::omx::V1_0::Status status;

    uint32_t kPortIndexInput = 0, kPortIndexOutput = 1;
@@ -399,8 +484,6 @@ TEST_F(AudioEncHidlTest, EncodeTest) { 
    GetURLForComponent(compName, mURL);



    std::ifstream eleStream;

    eleStream.open(mURL, std::ifstream::binary);

    ASSERT_EQ(eleStream.is_open(), true);



    // Configure input port

    int32_t nChannels = 2;
@@ -449,16 +532,19 @@ TEST_F(AudioEncHidlTest, EncodeTest) { 
    // set state to executing

    changeStateIdletoExecute(omxNode, observer);



    encodeNFrames(omxNode, observer, &iBuffer, &oBuffer, 1024, samplesPerFrame,

    eleStream.open(mURL, std::ifstream::binary);

    ASSERT_EQ(eleStream.is_open(), true);

    encodeNFrames(omxNode, observer, &iBuffer, &oBuffer, 128, samplesPerFrame,

                  nChannels, nSampleRate, eleStream);

    eleStream.close();

    waitOnInputConsumption(omxNode, observer, &iBuffer, &oBuffer);

    testEOS(omxNode, observer, &iBuffer, &oBuffer, false, eosFlag);



    // set state to idle

    changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);

    // set state to executing

    changeStateIdletoLoaded(omxNode, observer, &iBuffer, &oBuffer,

                            kPortIndexInput, kPortIndexOutput);



    eleStream.close();

}



int main(int argc, char** argv) {

media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp

+1 −271

File changed.

Preview size limit exceeded, changes collapsed.