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

Commit 20bc750c authored by Dan Shi's avatar Dan Shi
Browse files

Convert VtsHalMediaC2V1_0HostTest to individual gtest 

The python test runs each gtest with various command line options.
Such logic should all be part of gtest for them to be parameterized
gtest.

Bug: 154351999
Test: atest VtsHalMediaC2V1_0TargetAudioDecTest \
  VtsHalMediaC2V1_0TargetAudioEncTest \
  VtsHalMediaC2V1_0TargetComponentTest \
  VtsHalMediaC2V1_0TargetMasterTest \
  VtsHalMediaC2V1_0TargetVideoDecTest \
  VtsHalMediaC2V1_0TargetVideoEncTest

Change-Id: I8fe666305e198db0869f2c91b7f35fa0560abd9d
parent ec77ef69

media/codec2/hidl/1.0/vts/OWNERS

+1 −2
Original line number Diff line number Diff line
@@ -5,5 +5,4 @@ taklee@google.com 
wonsik@google.com



# VTS team

yim@google.com

zhuoyao@google.com
 
dshi@google.com

media/codec2/hidl/1.0/vts/functional/Android.bp

0 → 100644
+101 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2020 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



filegroup {

    name: "media_c2_v1_audio_decode_res",

    path: "res",

    srcs: [

        "res/bbb_aac_stereo_128kbps_48000hz.aac",

        "res/bbb_aac_stereo_128kbps_48000hz.info",

        "res/bbb_aac_stereo_128kbps_48000hz_multi_frame.info",

        "res/bbb_amrwb_1ch_14kbps_16000hz.amrwb",

        "res/bbb_amrwb_1ch_14kbps_16000hz.info",

        "res/bbb_amrwb_1ch_14kbps_16000hz_multi_frame.info",

        "res/bbb_flac_stereo_680kbps_48000hz.flac",

        "res/bbb_flac_stereo_680kbps_48000hz.info",

        "res/bbb_g711alaw_1ch_8khz.info",

        "res/bbb_g711alaw_1ch_8khz.raw",

        "res/bbb_g711mulaw_1ch_8khz.info",

        "res/bbb_g711mulaw_1ch_8khz.raw",

        "res/bbb_gsm_1ch_8khz_13kbps.info",

        "res/bbb_gsm_1ch_8khz_13kbps.raw",

        "res/bbb_mp3_stereo_192kbps_48000hz.info",

        "res/bbb_mp3_stereo_192kbps_48000hz.mp3",

        "res/bbb_mp3_stereo_192kbps_48000hz_multi_frame.info",

        "res/bbb_opus_stereo_128kbps_48000hz.info",

        "res/bbb_opus_stereo_128kbps_48000hz.opus",

        "res/bbb_raw_1ch_8khz_s32le.info",

        "res/bbb_raw_1ch_8khz_s32le.raw",

        "res/bbb_vorbis_stereo_128kbps_48000hz.info",

        "res/bbb_vorbis_stereo_128kbps_48000hz.vorbis",

        "res/sine_amrnb_1ch_12kbps_8000hz.amrnb",

        "res/sine_amrnb_1ch_12kbps_8000hz.info",

        "res/sine_amrnb_1ch_12kbps_8000hz_multi_frame.info",

    ],

}



filegroup {

    name: "media_c2_v1_audio_encode_res",

    path: "res",

    srcs: [

        "res/bbb_raw_2ch_48khz_s16le.raw",

        "res/bbb_raw_1ch_8khz_s16le.raw",

        "res/bbb_raw_1ch_16khz_s16le.raw",

    ],

}



filegroup {

    name: "media_c2_v1_video_decode_res",

    path: "res",

    srcs: [

        "res/bbb_avc_176x144_300kbps_60fps.h264",

        "res/bbb_avc_640x360_768kbps_30fps.h264",

        "res/bbb_avc_176x144_300kbps_60fps.info",

        "res/bbb_avc_640x360_768kbps_30fps.info",

        "res/bbb_hevc_176x144_176kbps_60fps.hevc",

        "res/bbb_hevc_640x360_1600kbps_30fps.hevc",

        "res/bbb_hevc_176x144_176kbps_60fps.info",

        "res/bbb_hevc_640x360_1600kbps_30fps.info",

        "res/bbb_mpeg2_176x144_105kbps_25fps.m2v",

        "res/bbb_mpeg2_352x288_1mbps_60fps.m2v",

        "res/bbb_mpeg2_176x144_105kbps_25fps.info",

        "res/bbb_mpeg2_352x288_1mbps_60fps.info",

        "res/bbb_h263_352x288_300kbps_12fps.h263",

        "res/bbb_h263_352x288_300kbps_12fps.info",

        "res/bbb_mpeg4_352x288_512kbps_30fps.m4v",

        "res/bbb_mpeg4_352x288_512kbps_30fps.info",

        "res/bbb_vp8_176x144_240kbps_60fps.vp8",

        "res/bbb_vp8_640x360_2mbps_30fps.vp8",

        "res/bbb_vp8_176x144_240kbps_60fps.info",

        "res/bbb_vp8_640x360_2mbps_30fps.info",

        "res/bbb_vp9_176x144_285kbps_60fps.vp9",

        "res/bbb_vp9_640x360_1600kbps_30fps.vp9",

        "res/bbb_vp9_176x144_285kbps_60fps.info",

        "res/bbb_vp9_640x360_1600kbps_30fps.info",

        "res/bbb_av1_640_360.av1",

        "res/bbb_av1_176_144.av1",

        "res/bbb_av1_640_360.info",

        "res/bbb_av1_176_144.info",

    ],

}



filegroup {

    name: "media_c2_v1_video_encode_res",

    path: "res",

    srcs: [

        "res/bbb_352x288_420p_30fps_32frames.yuv",

    ],

}
 
 No newline at end of file

media/codec2/hidl/1.0/vts/functional/audio/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -16,18 +16,22 @@ 


cc_test {

    name: "VtsHalMediaC2V1_0TargetAudioDecTest",

    stem: "vts_media_c2_v1_0_audio_dec_test",

    defaults: ["VtsHalMediaC2V1_0Defaults"],

    srcs: [

        "VtsHalMediaC2V1_0TargetAudioDecTest.cpp",

        //"media_audio_hidl_test_common.cpp"

    ],

    data: [":media_c2_v1_audio_decode_res"],

    test_config: "VtsHalMediaC2V1_0TargetAudioDecTest.xml",

}



cc_test {

    name: "VtsHalMediaC2V1_0TargetAudioEncTest",

    stem: "vts_media_c2_v1_0_audio_enc_test",

    defaults: ["VtsHalMediaC2V1_0Defaults"],

    srcs: [

        "VtsHalMediaC2V1_0TargetAudioEncTest.cpp",

        //"media_audio_hidl_test_common.cpp"

    ],

    data: [":media_c2_v1_audio_encode_res"],

    test_config: "VtsHalMediaC2V1_0TargetAudioEncTest.xml",

}

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

+236 −264

File changed.

Preview size limit exceeded, changes collapsed.

media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.xml

0 → 100644
+58 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the"License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an"AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs VtsHalMediaC2V1_0TargetAudioDecTest.">

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />



    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

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

        <option name="push-file" key="vts_media_c2_v1_0_audio_dec_test" value="/data/local/tmp/vts_media_c2_v1_0_audio_dec_test" />



        <!-- Files used for audio testing -->

        <option name="push-file" key="bbb_aac_stereo_128kbps_48000hz.aac" value="/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz.aac" />

        <option name="push-file" key="bbb_aac_stereo_128kbps_48000hz.info" value="/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz.info" />

        <option name="push-file" key="bbb_aac_stereo_128kbps_48000hz_multi_frame.info" value="/data/local/tmp/media/bbb_aac_stereo_128kbps_48000hz_multi_frame.info" />

        <option name="push-file" key="bbb_amrwb_1ch_14kbps_16000hz.amrwb" value="/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz.amrwb" />

        <option name="push-file" key="bbb_amrwb_1ch_14kbps_16000hz.info" value="/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz.info" />

        <option name="push-file" key="bbb_amrwb_1ch_14kbps_16000hz_multi_frame.info" value="/data/local/tmp/media/bbb_amrwb_1ch_14kbps_16000hz_multi_frame.info" />

        <option name="push-file" key="bbb_flac_stereo_680kbps_48000hz.flac" value="/data/local/tmp/media/bbb_flac_stereo_680kbps_48000hz.flac" />

        <option name="push-file" key="bbb_flac_stereo_680kbps_48000hz.info" value="/data/local/tmp/media/bbb_flac_stereo_680kbps_48000hz.info" />

        <option name="push-file" key="bbb_g711alaw_1ch_8khz.info" value="/data/local/tmp/media/bbb_g711alaw_1ch_8khz.info" />

        <option name="push-file" key="bbb_g711alaw_1ch_8khz.raw" value="/data/local/tmp/media/bbb_g711alaw_1ch_8khz.raw" />

        <option name="push-file" key="bbb_g711mulaw_1ch_8khz.info" value="/data/local/tmp/media/bbb_g711mulaw_1ch_8khz.info" />

        <option name="push-file" key="bbb_g711mulaw_1ch_8khz.raw" value="/data/local/tmp/media/bbb_g711mulaw_1ch_8khz.raw" />

        <option name="push-file" key="bbb_gsm_1ch_8khz_13kbps.info" value="/data/local/tmp/media/bbb_gsm_1ch_8khz_13kbps.info" />

        <option name="push-file" key="bbb_gsm_1ch_8khz_13kbps.raw" value="/data/local/tmp/media/bbb_gsm_1ch_8khz_13kbps.raw" />

        <option name="push-file" key="bbb_mp3_stereo_192kbps_48000hz.info" value="/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz.info" />

        <option name="push-file" key="bbb_mp3_stereo_192kbps_48000hz.mp3" value="/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz.mp3" />

        <option name="push-file" key="bbb_mp3_stereo_192kbps_48000hz_multi_frame.info" value="/data/local/tmp/media/bbb_mp3_stereo_192kbps_48000hz_multi_frame.info" />

        <option name="push-file" key="bbb_opus_stereo_128kbps_48000hz.info" value="/data/local/tmp/media/bbb_opus_stereo_128kbps_48000hz.info" />

        <option name="push-file" key="bbb_opus_stereo_128kbps_48000hz.opus" value="/data/local/tmp/media/bbb_opus_stereo_128kbps_48000hz.opus" />

        <option name="push-file" key="bbb_raw_1ch_8khz_s32le.info" value="/data/local/tmp/media/bbb_raw_1ch_8khz_s32le.info" />

        <option name="push-file" key="bbb_raw_1ch_8khz_s32le.raw" value="/data/local/tmp/media/bbb_raw_1ch_8khz_s32le.raw" />

        <option name="push-file" key="bbb_vorbis_stereo_128kbps_48000hz.info" value="/data/local/tmp/media/bbb_vorbis_stereo_128kbps_48000hz.info" />

        <option name="push-file" key="bbb_vorbis_stereo_128kbps_48000hz.vorbis" value="/data/local/tmp/media/bbb_vorbis_stereo_128kbps_48000hz.vorbis" />

        <option name="push-file" key="sine_amrnb_1ch_12kbps_8000hz.amrnb" value="/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz.amrnb" />

        <option name="push-file" key="sine_amrnb_1ch_12kbps_8000hz.info" value="/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz.info" />

        <option name="push-file" key="sine_amrnb_1ch_12kbps_8000hz_multi_frame.info" value="/data/local/tmp/media/sine_amrnb_1ch_12kbps_8000hz_multi_frame.info" />



    </target_preparer>



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

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

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

        <option name="native-test-flag" value="-P /data/local/tmp/media/" />

    </test>

</configuration>
 
 No newline at end of file