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

Commit 5842cd53 authored by Shivaansh Agrawal's avatar Shivaansh Agrawal Committed by Shivaansh Agrawal
Browse files

ExtractorUnitTest: add more input vectors 

This patch adds different streams like ac4, flac, opus, mpeg2 to increase code coverage for Mp4 extractor

Coverage increase:
Lines: from 34.4% to 55.9%
Functions: from 32.8% to 43.3%

Test: atest ExtractorUnitTest -- --enable-module-dynamic-download=true
Bug: 160111782
Change-Id: Ie6f6709d84809588365404b2821fdea10291f03c
parent e87ca157

media/extractors/tests/AndroidTest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
        <option name="cleanup" value="true" />

        <option name="cleanup" value="true" />

        <option name="push" value="ExtractorUnitTest->/data/local/tmp/ExtractorUnitTest" />

        <option name="push" value="ExtractorUnitTest->/data/local/tmp/ExtractorUnitTest" />

        <option name="push-file"

        <option name="push-file"

            key="https://storage.googleapis.com/android_media/frameworks/av/media/extractors/tests/extractor.zip?unzip=true"

            key="https://storage.googleapis.com/android_media/frameworks/av/media/extractors/tests/extractor-1.1.zip?unzip=true"

            value="/data/local/tmp/ExtractorUnitTestRes/" />

            value="/data/local/tmp/ExtractorUnitTestRes/" />

    </target_preparer>

    </target_preparer>

media/extractors/tests/ExtractorUnitTest.cpp

+28 −2
Original line number Original line Diff line number Diff line
@@ -1100,7 +1100,7 @@ INSTANTIATE_TEST_SUITE_P(ConfigParamTestAll, ConfigParamTest, 
                                           make_pair("mkv", MPEG4_1),

                                           make_pair("mkv", MPEG4_1),

                                           make_pair("mkv", VP9_1)));

                                           make_pair("mkv", VP9_1)));





// Validate extractors for container format, input file and supports seek flag

// Validate extractors for container format, input file, no. of tracks and supports seek flag

INSTANTIATE_TEST_SUITE_P(

INSTANTIATE_TEST_SUITE_P(

        ExtractorUnitTestAll, ExtractorFunctionalityTest,

        ExtractorUnitTestAll, ExtractorFunctionalityTest,

        ::testing::Values(

        ::testing::Values(
@@ -1118,7 +1118,14 @@ INSTANTIATE_TEST_SUITE_P( 
                make_tuple("mpeg2ts", "testac3ts.ts", 1, false),

                make_tuple("mpeg2ts", "testac3ts.ts", 1, false),

                make_tuple("mpeg2ts", "testac4ts.ts", 1, false),

                make_tuple("mpeg2ts", "testac4ts.ts", 1, false),

                make_tuple("mpeg2ts", "testeac3ts.ts", 1, false),

                make_tuple("mpeg2ts", "testeac3ts.ts", 1, false),

                make_tuple("mpeg4", "audio_aac_mono_70kbs_44100hz.mp4", 2, true),

                make_tuple("mpeg4", "multi0_ac4.mp4", 1, true),

                make_tuple("mpeg4", "noise_6ch_44khz_aot5_dr_sbr_sig2_mp4.m4a", 1, true),

                make_tuple("mpeg4", "sinesweepalac.mov", 1, true),

                make_tuple("mpeg4", "sinesweepflacmp4.mp4", 1, true),

                make_tuple("mpeg4", "sinesweepm4a.m4a", 1, true),

                make_tuple("mpeg4", "sinesweepoggmp4.mp4", 1, true),

                make_tuple("mpeg4", "sinesweepoggmp4.mp4", 1, true),

                make_tuple("mpeg4", "sinesweepopusmp4.mp4", 1, true),

                make_tuple("mpeg4", "testac3mp4.mp4", 1, true),

                make_tuple("mpeg4", "testac3mp4.mp4", 1, true),

                make_tuple("mpeg4", "testeac3mp4.mp4", 1, true),

                make_tuple("mpeg4", "testeac3mp4.mp4", 1, true),

                make_tuple("ogg", "john_cage.ogg", 1, true),

                make_tuple("ogg", "john_cage.ogg", 1, true),
@@ -1132,7 +1139,26 @@ INSTANTIATE_TEST_SUITE_P( 
                make_tuple("mkv", "swirl_144x136_vp8.webm", 1, true),

                make_tuple("mkv", "swirl_144x136_vp8.webm", 1, true),

                make_tuple("mpeg2ps", "swirl_144x136_mpeg2.mpg", 1, false),

                make_tuple("mpeg2ps", "swirl_144x136_mpeg2.mpg", 1, false),

                make_tuple("mpeg2ps", "programstream.mpeg", 2, false),

                make_tuple("mpeg2ps", "programstream.mpeg", 2, false),

                make_tuple("mpeg4", "swirl_132x130_mpeg4.mp4", 1, true)));

                make_tuple("mpeg4", "color_176x144_bt601_525_lr_sdr_h264.mp4", 1, true),

                make_tuple("mpeg4", "psshtest.mp4", 1, true),

                make_tuple("mpeg4", "swirl_132x130_mpeg4.mp4", 1, true),

                make_tuple("mpeg4", "testvideo.3gp", 4, true),

                make_tuple("mpeg4", "testvideo_with_2_timedtext_tracks.3gp", 4, true),

                make_tuple("mpeg4",

                           "video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz_"

                           "metadata_gyro_compliant.3gp",

                           3, true),

                make_tuple(

                        "mpeg4",

                        "video_1920x1080_mp4_mpeg2_12000kbps_30fps_aac_stereo_128kbps_48000hz.mp4",

                        2, true),

                make_tuple("mpeg4",

                           "video_480x360_mp4_hevc_650kbps_30fps_aac_stereo_128kbps_48000hz.mp4", 2,

                           true),

                make_tuple(

                        "mpeg4",

                        "video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz_dash.mp4",

                        2, true)));





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

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

    gEnv = new ExtractorUnitTestEnvironment();

    gEnv = new ExtractorUnitTestEnvironment();