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

Commit cb80256b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Writer Test: add assert for atest" am: 8d38c0af am: d1d4f0f9 

Change-Id: I4c8626e455eb9cce67a296fe817f39a9ecf1bdb5
parents 2d69231f d1d4f0f9

media/libstagefright/tests/writer/README.md

+3 −2
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ To test 32-bit binary push binaries from nativetest. 


adb push ${OUT}/data/nativetest/writerTest/writerTest /data/local/tmp/



The resource file for the tests is taken from Codec2 VTS resource folder. Push these files into device for testing.

The resource file for the tests is taken from [here](https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/tests/writer/writerTestRes.zip).

Download and extract the folder. Push all the files in this folder to /data/local/tmp/ on the device.

```

adb push  $ANDROID_BUILD_TOP/frameworks/av/media/codec2/hidl/1.0/vts/functional/res /sdcard/

adb push writerTestRes /data/local/tmp/

```



usage: writerTest -P \<path_to_res_folder\>

media/libstagefright/tests/writer/WriterTest.cpp

+76 −71
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ 


#include <media/stagefright/AACWriter.h>

#include <media/stagefright/AMRWriter.h>

#include <media/stagefright/OggWriter.h>

#include <media/stagefright/MPEG4Writer.h>

#include <media/stagefright/MPEG2TSWriter.h>

#include <media/stagefright/MPEG4Writer.h>

#include <media/stagefright/OggWriter.h>

#include <webm/WebmWriter.h>



#include "WriterTestEnvironment.h"
@@ -89,19 +89,36 @@ static const struct InputData { 


class WriterTest : public ::testing::TestWithParam<pair<string, int32_t>> {

  public:

    WriterTest() : mWriter(nullptr), mFileMeta(nullptr), mCurrentTrack(nullptr) {}



    ~WriterTest() {

        if (mWriter) {

            mWriter.clear();

            mWriter = nullptr;

        }

        if (mFileMeta) {

            mFileMeta.clear();

            mFileMeta = nullptr;

        }

        if (mCurrentTrack) {

            mCurrentTrack.clear();

            mCurrentTrack = nullptr;

        }

    }



    virtual void SetUp() override {

        mNumCsds = 0;

        mInputFrameId = 0;

        mWriterName = unknown_comp;

        mDisableTest = false;



        std::map<std::string, standardWriters> mapWriter = {

        static const std::map<std::string, standardWriters> mapWriter = {

                {"ogg", OGG},     {"aac", AAC},      {"aac_adts", AAC_ADTS}, {"webm", WEBM},

                {"mpeg4", MPEG4}, {"amrnb", AMR_NB}, {"amrwb", AMR_WB},      {"mpeg2Ts", MPEG2TS}};

        // Find the component type

        string writerFormat = GetParam().first;

        if (mapWriter.find(writerFormat) != mapWriter.end()) {

            mWriterName = mapWriter[writerFormat];

            mWriterName = mapWriter.at(writerFormat);

        }

        if (mWriterName == standardWriters::unknown_comp) {

            cout << "[   WARN   ] Test Skipped. No specific writer mentioned\n";
@@ -110,10 +127,8 @@ class WriterTest : public ::testing::TestWithParam<pair<string, int32_t>> { 
    }



    virtual void TearDown() override {

        mWriter.clear();

        mFileMeta.clear();

        mBufferInfo.clear();

        if (mInputStream) mInputStream.close();

        if (mInputStream.is_open()) mInputStream.close();

    }



    void getInputBufferInfo(string inputFileName, string inputInfo);
@@ -149,7 +164,7 @@ class WriterTest : public ::testing::TestWithParam<pair<string, int32_t>> { 
void WriterTest::getInputBufferInfo(string inputFileName, string inputInfo) {

    std::ifstream eleInfo;

    eleInfo.open(inputInfo.c_str());

    CHECK_EQ(eleInfo.is_open(), true);

    ASSERT_EQ(eleInfo.is_open(), true);

    int32_t bytesCount = 0;

    uint32_t flags = 0;

    int64_t timestamp = 0;
@@ -162,7 +177,7 @@ void WriterTest::getInputBufferInfo(string inputFileName, string inputInfo) { 
    }

    eleInfo.close();

    mInputStream.open(inputFileName.c_str(), std::ifstream::binary);

    CHECK_EQ(mInputStream.is_open(), true);

    ASSERT_EQ(mInputStream.is_open(), true);

}



int32_t WriterTest::createWriter(int32_t fd) {
@@ -258,14 +273,11 @@ TEST_P(WriterTest, CreateWriterTest) { 
    string outputFile = OUTPUT_FILE_NAME;

    int32_t fd =

            open(outputFile.c_str(), O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR, S_IRUSR | S_IWUSR);

    if (fd < 0) return;

    ASSERT_GE(fd, 0) << "Failed to open output file to dump writer's data";



    // Creating writer within a test scope. Destructor should be called when the test ends

    int32_t status = createWriter(fd);

    if (status) {

        cout << "Failed to create writer for output format:" << GetParam().first << "\n";

        ASSERT_TRUE(false);

    }

    ASSERT_EQ((status_t)OK, createWriter(fd))

            << "Failed to create writer for output format:" << GetParam().first;

}



TEST_P(WriterTest, WriterTest) {
@@ -276,38 +288,32 @@ TEST_P(WriterTest, WriterTest) { 
    string outputFile = OUTPUT_FILE_NAME;

    int32_t fd =

            open(outputFile.c_str(), O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR, S_IRUSR | S_IWUSR);

    if (fd < 0) return;

    ASSERT_GE(fd, 0) << "Failed to open output file to dump writer's data";



    int32_t status = createWriter(fd);

    if (status) {

        cout << "Failed to create writer for output format:" << writerFormat << "\n";

        ASSERT_TRUE(false);

    }

    ASSERT_EQ((status_t)OK, status) << "Failed to create writer for output format:" << writerFormat;



    string inputFile = gEnv->getRes();

    string inputInfo = gEnv->getRes();

    configFormat param;

    bool isAudio;

    int32_t inputFileIdx = GetParam().second;

    getFileDetails(inputFile, inputInfo, param, isAudio, inputFileIdx);

    if (!inputFile.compare(gEnv->getRes())) {

        ALOGV("No input file specified");

        return;

    }

    ASSERT_NE(inputFile.compare(gEnv->getRes()), 0) << "No input file specified";



    getInputBufferInfo(inputFile, inputInfo);

    status = addWriterSource(isAudio, param);

    if (status) {

        cout << "Failed to add source for " << writerFormat << "Writer \n";

        ASSERT_TRUE(false);

    }

    CHECK_EQ((status_t)OK, mWriter->start(mFileMeta.get()));

    ASSERT_EQ((status_t)OK, status) << "Failed to add source for " << writerFormat << "Writer";



    status = mWriter->start(mFileMeta.get());

    ASSERT_EQ((status_t)OK, status);

    status = sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack, 0,

                                 mBufferInfo.size());

    ASSERT_EQ((status_t)OK, status) << writerFormat << " writer failed";

    mCurrentTrack->stop();

    if (status) {

        cout << writerFormat << " writer failed \n";

        mWriter->stop();

        ASSERT_TRUE(false);

    }

    CHECK_EQ((status_t)OK, mWriter->stop());



    status = mWriter->stop();

    ASSERT_EQ((status_t)OK, status) << "Failed to stop the writer";

    close(fd);

}
@@ -319,59 +325,52 @@ TEST_P(WriterTest, PauseWriterTest) { 
    string outputFile = OUTPUT_FILE_NAME;

    int32_t fd =

            open(outputFile.c_str(), O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR, S_IRUSR | S_IWUSR);

    if (fd < 0) return;

    ASSERT_GE(fd, 0) << "Failed to open output file to dump writer's data";



    int32_t status = createWriter(fd);

    if (status) {

        cout << "Failed to create writer for output format:" << writerFormat << "\n";

        ASSERT_TRUE(false);

    }

    ASSERT_EQ((status_t)OK, status) << "Failed to create writer for output format:" << writerFormat;



    string inputFile = gEnv->getRes();

    string inputInfo = gEnv->getRes();

    configFormat param;

    bool isAudio;

    int32_t inputFileIdx = GetParam().second;

    getFileDetails(inputFile, inputInfo, param, isAudio, inputFileIdx);

    if (!inputFile.compare(gEnv->getRes())) {

        ALOGV("No input file specified");

        return;

    }

    ASSERT_NE(inputFile.compare(gEnv->getRes()), 0) << "No input file specified";



    getInputBufferInfo(inputFile, inputInfo);

    status = addWriterSource(isAudio, param);

    if (status) {

        cout << "Failed to add source for " << writerFormat << "Writer \n";

        ASSERT_TRUE(false);

    }

    CHECK_EQ((status_t)OK, mWriter->start(mFileMeta.get()));

    ASSERT_EQ((status_t)OK, status) << "Failed to add source for " << writerFormat << "Writer";



    status = mWriter->start(mFileMeta.get());

    ASSERT_EQ((status_t)OK, status);

    status = sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack, 0,

                                 mBufferInfo.size() / 4);

    if (status) {

        cout << writerFormat << " writer failed \n";

        mCurrentTrack->stop();

        mWriter->stop();

        ASSERT_TRUE(false);

    }

    ASSERT_EQ((status_t)OK, status) << writerFormat << " writer failed";



    bool isPaused = false;

    if ((mWriterName != standardWriters::MPEG2TS) && (mWriterName != standardWriters::MPEG4)) {

        CHECK_EQ((status_t)OK, mWriter->pause());

        status = mWriter->pause();

        ASSERT_EQ((status_t)OK, status);

        isPaused = true;

    }

    // In the pause state, writers shouldn't write anything. Testing the writers for the same

    int32_t numFramesPaused = mBufferInfo.size() / 4;

    status |= sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack,

    status = sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack,

                                  mInputFrameId, numFramesPaused, isPaused);

    ASSERT_EQ((status_t)OK, status) << writerFormat << " writer failed";



    if (isPaused) {

        CHECK_EQ((status_t)OK, mWriter->start(mFileMeta.get()));

        status = mWriter->start(mFileMeta.get());

        ASSERT_EQ((status_t)OK, status);

    }

    status |= sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack,

    status = sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack,

                                  mInputFrameId, mBufferInfo.size());

    ASSERT_EQ((status_t)OK, status) << writerFormat << " writer failed";

    mCurrentTrack->stop();

    if (status) {

        cout << writerFormat << " writer failed \n";

        mWriter->stop();

        ASSERT_TRUE(false);

    }

    CHECK_EQ((status_t)OK, mWriter->stop());



    status = mWriter->stop();

    ASSERT_EQ((status_t)OK, status) << "Failed to stop the writer";

    close(fd);

}
@@ -384,7 +383,7 @@ TEST_P(WriterTest, MultiStartStopPauseTest) { 
    string outputFile = OUTPUT_FILE_NAME;

    int32_t fd =

            open(outputFile.c_str(), O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR, S_IRUSR | S_IWUSR);

    ASSERT_GE(fd, 0) << "Cannot open output file to dump writer's data";

    ASSERT_GE(fd, 0) << "Failed to open output file to dump writer's data";



    string writerFormat = GetParam().first;

    int32_t status = createWriter(fd);
@@ -404,7 +403,7 @@ TEST_P(WriterTest, MultiStartStopPauseTest) { 


    // first start should succeed.

    status = mWriter->start(mFileMeta.get());

    ASSERT_EQ((status_t)OK, status) << "Couldn't start the writer";

    ASSERT_EQ((status_t)OK, status) << "Could not start the writer";



    // Multiple start() may/may not succeed.

    // Writers are expected to not crash on multiple start() calls.
@@ -412,8 +411,10 @@ TEST_P(WriterTest, MultiStartStopPauseTest) { 
        mWriter->start(mFileMeta.get());

    }



    (void)sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack, 0,

    status = sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack, 0,

                              mBufferInfo.size() / 4);

    ASSERT_EQ((status_t)OK, status) << writerFormat << " writer failed";



    for (int32_t count = 0; count < kMaxCount; count++) {

        mWriter->pause();

        mWriter->start(mFileMeta.get());
@@ -421,19 +422,23 @@ TEST_P(WriterTest, MultiStartStopPauseTest) { 


    mWriter->pause();

    int32_t numFramesPaused = mBufferInfo.size() / 4;

    (void)sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack,

    status = sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack,

                              mInputFrameId, numFramesPaused, true);

    ASSERT_EQ((status_t)OK, status) << writerFormat << " writer failed";



    for (int32_t count = 0; count < kMaxCount; count++) {

        mWriter->start(mFileMeta.get());

    }



    (void)sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack,

    status = sendBuffersToWriter(mInputStream, mBufferInfo, mInputFrameId, mCurrentTrack,

                              mInputFrameId, mBufferInfo.size());

    ASSERT_EQ((status_t)OK, status) << writerFormat << " writer failed";



    mCurrentTrack->stop();



    // first stop should succeed.

    status = mWriter->stop();

    ASSERT_EQ((status_t)OK, status) << "Couldn't stop the writer";

    ASSERT_EQ((status_t)OK, status) << "Failed to stop the writer";

    // Multiple stop() may/may not succeed.

    // Writers are expected to not crash on multiple stop() calls.

    for (int32_t count = 0; count < kMaxCount; count++) {