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

Commit 63f38bb4 authored by Sushant's avatar Sushant
Browse files

Extend AmrnbEncoderTest to validate encoded output with reference files 

Bug: 357558004
Test: atest AmrnbEncoderTest

Change-Id: Ib2eb2a6e30bbb8c4f5f0034eff1c88e97faf3d7e
parent 6413b8bf

media/module/codecs/amrnb/enc/test/AmrnbEncoderTest.cpp

+65 −21
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <audio_utils/sndfile.h>

#include <stdio.h>

#include <fstream>



#include "gsmamr_enc.h"
@@ -39,7 +40,7 @@ struct AmrNbEncState { 


static AmrnbEncTestEnvironment *gEnv = nullptr;



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

class AmrnbEncoderTest : public ::testing::TestWithParam<tuple<string, int32_t, string>> {

  public:

    AmrnbEncoderTest() : mAmrEncHandle(nullptr) {}
@@ -53,6 +54,7 @@ class AmrnbEncoderTest : public ::testing::TestWithParam<pair<string, int32_t>> 
    AmrNbEncState *mAmrEncHandle;

    int32_t EncodeFrames(int32_t mode, FILE *fpInput, FILE *mFpOutput,

                         int32_t frameCount = INT32_MAX);

    bool compareBinaryFiles(const string& refFilePath, const string& outFilePath);

};



int32_t AmrnbEncoderTest::EncodeFrames(int32_t mode, FILE *fpInput, FILE *mFpOutput,
@@ -87,6 +89,42 @@ int32_t AmrnbEncoderTest::EncodeFrames(int32_t mode, FILE *fpInput, FILE *mFpOut 
    return 0;

}



bool AmrnbEncoderTest::compareBinaryFiles(const std::string &refFilePath,

                                          const std::string &outFilePath) {

    std::ifstream refFile(refFilePath, std::ios::binary | std::ios::ate);

    std::ifstream outFile(outFilePath, std::ios::binary | std::ios::ate);

    assert(refFile.is_open() && "Error opening reference file " + refFilePath);

    assert(outFile.is_open() && "Error opening output file " + outFilePath);



    std::streamsize refFileSize = refFile.tellg();

    std::streamsize outFileSize = outFile.tellg();

    if (refFileSize != outFileSize) {

        ALOGE("Error, File size mismatch: Reference file size = %td bytes,"

              " but output file size = %td bytes.", refFileSize, outFileSize);

        return false;

    }



    refFile.seekg(0, std::ios::beg);

    outFile.seekg(0, std::ios::beg);

    constexpr std::streamsize kBufferSize = 16 * 1024;

    char refBuffer[kBufferSize];

    char outBuffer[kBufferSize];



    while (refFile && outFile) {

        refFile.read(refBuffer, kBufferSize);

        outFile.read(outBuffer, kBufferSize);



        std::streamsize refBytesRead = refFile.gcount();

        std::streamsize outBytesRead = outFile.gcount();



        if (refBytesRead != outBytesRead || memcmp(refBuffer, outBuffer, refBytesRead) != 0) {

            ALOGE("Error, File content mismatch.");

            return false;

        }

    }

    return true;

}



TEST_F(AmrnbEncoderTest, CreateAmrnbEncoderTest) {

    mAmrEncHandle = (AmrNbEncState *)malloc(sizeof(AmrNbEncState));

    ASSERT_NE(mAmrEncHandle, nullptr) << "Error in allocating memory to Codec handle";
@@ -111,7 +149,7 @@ TEST_P(AmrnbEncoderTest, EncodeTest) { 
    int32_t status = AMREncodeInit(&mAmrEncHandle->encCtx, &mAmrEncHandle->pidSyncCtx, 0);

    ASSERT_EQ(status, 0) << "Error creating AMR-NB encoder";



    string inputFile = gEnv->getRes() + GetParam().first;

    string inputFile = gEnv->getRes() + std::get<0>(GetParam());

    FILE *fpInput = fopen(inputFile.c_str(), "rb");

    ASSERT_NE(fpInput, nullptr) << "Error opening input file " << inputFile;
@@ -121,7 +159,7 @@ TEST_P(AmrnbEncoderTest, EncodeTest) { 
    // Write file header.

    fwrite("#!AMR\n", 1, 6, fpOutput);



    int32_t mode = GetParam().second;

    int32_t mode = std::get<1>(GetParam());

    int32_t encodeErr = EncodeFrames(mode, fpInput, fpOutput);

    ASSERT_EQ(encodeErr, 0) << "EncodeFrames returned error for Codec mode: " << mode;
@@ -134,6 +172,11 @@ TEST_P(AmrnbEncoderTest, EncodeTest) { 
    free(mAmrEncHandle);

    mAmrEncHandle = nullptr;

    ALOGV("Successfully deleted encoder");



    string refFilePath = gEnv->getRes() + std::get<2>(GetParam());

    ASSERT_TRUE(compareBinaryFiles(refFilePath, OUTPUT_FILE))

       << "Error, Binary file comparison failed: Output file " << OUTPUT_FILE

       << " does not match the reference file " << refFilePath << ".";

}



TEST_P(AmrnbEncoderTest, ResetEncoderTest) {
@@ -142,7 +185,7 @@ TEST_P(AmrnbEncoderTest, ResetEncoderTest) { 
    int32_t status = AMREncodeInit(&mAmrEncHandle->encCtx, &mAmrEncHandle->pidSyncCtx, 0);

    ASSERT_EQ(status, 0) << "Error creating AMR-NB encoder";



    string inputFile = gEnv->getRes() + GetParam().first;

    string inputFile = gEnv->getRes() + std::get<0>(GetParam());

    FILE *fpInput = fopen(inputFile.c_str(), "rb");

    ASSERT_NE(fpInput, nullptr) << "Error opening input file " << inputFile;
@@ -152,7 +195,7 @@ TEST_P(AmrnbEncoderTest, ResetEncoderTest) { 
    // Write file header.

    fwrite("#!AMR\n", 1, 6, fpOutput);



    int32_t mode = GetParam().second;

    int32_t mode = std::get<1>(GetParam());

    // Encode kNumFrameReset first

    int32_t encodeErr = EncodeFrames(mode, fpInput, fpOutput, kNumFrameReset);

    ASSERT_EQ(encodeErr, 0) << "EncodeFrames returned error for Codec mode: " << mode;
@@ -177,22 +220,23 @@ TEST_P(AmrnbEncoderTest, ResetEncoderTest) { 


// TODO: Add more test vectors

INSTANTIATE_TEST_SUITE_P(AmrnbEncoderTestAll, AmrnbEncoderTest,

                         ::testing::Values(make_pair("bbb_raw_1ch_8khz_s16le.raw", MR475),

                                           make_pair("bbb_raw_1ch_8khz_s16le.raw", MR515),

                                           make_pair("bbb_raw_1ch_8khz_s16le.raw", MR59),

                                           make_pair("bbb_raw_1ch_8khz_s16le.raw", MR67),

                                           make_pair("bbb_raw_1ch_8khz_s16le.raw", MR74),

                                           make_pair("bbb_raw_1ch_8khz_s16le.raw", MR795),

                                           make_pair("bbb_raw_1ch_8khz_s16le.raw", MR102),

                                           make_pair("bbb_raw_1ch_8khz_s16le.raw", MR122),

                                           make_pair("sinesweepraw.raw", MR475),

                                           make_pair("sinesweepraw.raw", MR515),

                                           make_pair("sinesweepraw.raw", MR59),

                                           make_pair("sinesweepraw.raw", MR67),

                                           make_pair("sinesweepraw.raw", MR74),

                                           make_pair("sinesweepraw.raw", MR795),

                                           make_pair("sinesweepraw.raw", MR102),

                                           make_pair("sinesweepraw.raw", MR122)));

    ::testing::Values(

        make_tuple("bbb_raw_1ch_8khz_s16le.raw", MR475, "bbb_raw_1ch_8khz_s16le_MR475_ref.amrnb"),

        make_tuple("bbb_raw_1ch_8khz_s16le.raw", MR515, "bbb_raw_1ch_8khz_s16le_MR515_ref.amrnb"),

        make_tuple("bbb_raw_1ch_8khz_s16le.raw", MR59, "bbb_raw_1ch_8khz_s16le_MR59_ref.amrnb"),

        make_tuple("bbb_raw_1ch_8khz_s16le.raw", MR67, "bbb_raw_1ch_8khz_s16le_MR67_ref.amrnb"),

        make_tuple("bbb_raw_1ch_8khz_s16le.raw", MR74, "bbb_raw_1ch_8khz_s16le_MR74_ref.amrnb"),

        make_tuple("bbb_raw_1ch_8khz_s16le.raw", MR795, "bbb_raw_1ch_8khz_s16le_MR795_ref.amrnb"),

        make_tuple("bbb_raw_1ch_8khz_s16le.raw", MR102, "bbb_raw_1ch_8khz_s16le_MR102_ref.amrnb"),

        make_tuple("bbb_raw_1ch_8khz_s16le.raw", MR122, "bbb_raw_1ch_8khz_s16le_MR122_ref.amrnb"),

        make_tuple("sinesweepraw.raw", MR475, "sinesweepraw_MR475_ref.amrnb"),

        make_tuple("sinesweepraw.raw", MR515, "sinesweepraw_MR515_ref.amrnb"),

        make_tuple("sinesweepraw.raw", MR59, "sinesweepraw_MR59_ref.amrnb"),

        make_tuple("sinesweepraw.raw", MR67, "sinesweepraw_MR67_ref.amrnb"),

        make_tuple("sinesweepraw.raw", MR74, "sinesweepraw_MR74_ref.amrnb"),

        make_tuple("sinesweepraw.raw", MR795, "sinesweepraw_MR795_ref.amrnb"),

        make_tuple("sinesweepraw.raw", MR102, "sinesweepraw_MR102_ref.amrnb"),

        make_tuple("sinesweepraw.raw", MR122, "sinesweepraw_MR122_ref.amrnb")));



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

    gEnv = new AmrnbEncTestEnvironment();

media/module/codecs/amrnb/enc/test/AndroidTest.xml

+3 −3
Original line number Diff line number Diff line
@@ -23,17 +23,17 @@ 
    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">

        <option name="target" value="host" />

        <option name="config-filename" value="AmrnbEncoderTest" />

        <option name="version" value="1.0"/>

        <option name="version" value="2.0"/>

    </target_preparer>

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.MediaPreparer">

        <option name="push-all" value="true" />

        <option name="media-folder-name" value="AmrnbEncoderTest-1.0" />

        <option name="media-folder-name" value="AmrnbEncoderTest-2.0" />

        <option name="dynamic-config-module" value="AmrnbEncoderTest" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="AmrnbEncoderTest" />

        <option name="native-test-flag" value="-P /sdcard/test/AmrnbEncoderTest-1.0/" />

        <option name="native-test-flag" value="-P /sdcard/test/AmrnbEncoderTest-2.0/" />

    </test>

</configuration>

media/module/codecs/amrnb/enc/test/DynamicConfig.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 


<dynamicConfig>

    <entry key="media_files_url">

            <value>https://dl.google.com/android-unittest/media/frameworks/av/media/module/codecs/amrnb/enc/test/AmrnbEncoderTest-1.0.zip</value>

            <value>https://dl.google.com/android-unittest/media/frameworks/av/media/module/codecs/amrnb/enc/test/AmrnbEncoderTest-2.0.zip</value>

    </entry>

</dynamicConfig>

media/module/codecs/amrnb/enc/test/README.md

+3 −3
Original line number Diff line number Diff line
@@ -22,15 +22,15 @@ To test 32-bit binary push binaries from nativetest. 
adb push ${OUT}/data/nativetest/AmrnbEncoderTest/AmrnbEncoderTest /data/local/tmp/

```



The resource file for the tests is taken from [here](https://dl.google.com/android-unittest/media/frameworks/av/media/module/codecs/amrnb/enc/test/AmrnbEncoderTest-1.0.zip). Download, unzip and push these files into device for testing.

The resource file for the tests is taken from [here](https://dl.google.com/android-unittest/media/frameworks/av/media/module/codecs/amrnb/enc/test/AmrnbEncoderTest-2.0.zip). Download, unzip and push these files into device for testing.



```

adb push AmrnbEncoderTest-1.0 /data/local/tmp/

adb push AmrnbEncoderTest-2.0 /data/local/tmp/

```



usage: AmrnbEncoderTest -P \<path_to_folder\>

```

adb shell /data/local/tmp/AmrnbEncoderTest -P /data/local/tmp/AmrnbEncoderTest-1.0/

adb shell /data/local/tmp/AmrnbEncoderTest -P /data/local/tmp/AmrnbEncoderTest-2.0/

```

Alternatively, the test can also be run using atest command.