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

Commit 40b166a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2 VTS: Use string::compare instead of string::find to match mime" am: 0eadcf3f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1781469

Change-Id: I89dc71c5b06006a3415683586eedf51db156637e
parents 75700c9e 0eadcf3f

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

+3 −3
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ std::vector<CompToFiles> gCompToFiles = { 
        {"mp4a-latm", "bbb_aac_stereo_128kbps_48000hz.aac", "bbb_aac_stereo_128kbps_48000hz.info"},

        {"mp4a-latm", "bbb_aac_stereo_128kbps_48000hz.aac",

         "bbb_aac_stereo_128kbps_48000hz_multi_frame.info"},

        {"audio/mpeg", "bbb_mp3_stereo_192kbps_48000hz.mp3", "bbb_mp3_stereo_192kbps_48000hz.info"},

        {"audio/mpeg", "bbb_mp3_stereo_192kbps_48000hz.mp3",

        {"mpeg", "bbb_mp3_stereo_192kbps_48000hz.mp3", "bbb_mp3_stereo_192kbps_48000hz.info"},

        {"mpeg", "bbb_mp3_stereo_192kbps_48000hz.mp3",

         "bbb_mp3_stereo_192kbps_48000hz_multi_frame.info"},

        {"3gpp", "sine_amrnb_1ch_12kbps_8000hz.amrnb", "sine_amrnb_1ch_12kbps_8000hz.info"},

        {"3gpp", "sine_amrnb_1ch_12kbps_8000hz.amrnb",
@@ -303,7 +303,7 @@ bool Codec2AudioDecHidlTestBase::getFileNames(size_t streamIndex) { 
    int streamCount = 0;



    for (size_t i = 0; i < gCompToFiles.size(); ++i) {

        if (mMime.find(gCompToFiles[i].mime) != std::string::npos) {

        if (!mMime.compare("audio/" + gCompToFiles[i].mime)) {

            if (streamCount == streamIndex) {

                mInputFile = sResourceDir + gCompToFiles[i].inputFile;

                mInfoFile = sResourceDir + gCompToFiles[i].infoFile;

media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp

+9 −7
Original line number Diff line number Diff line
@@ -64,13 +64,15 @@ std::vector<CompToFiles> gCompToFiles = { 
        {"3gpp", "bbb_h263_352x288_300kbps_12fps.h263", "bbb_h263_352x288_300kbps_12fps.info", ""},

        {"mp4v-es", "bbb_mpeg4_352x288_512kbps_30fps.m4v", "bbb_mpeg4_352x288_512kbps_30fps.info",

         ""},

        {"vp8", "bbb_vp8_176x144_240kbps_60fps.vp8", "bbb_vp8_176x144_240kbps_60fps.info", ""},

        {"vp8", "bbb_vp8_640x360_2mbps_30fps.vp8", "bbb_vp8_640x360_2mbps_30fps.info",

        {"x-vnd.on2.vp8", "bbb_vp8_176x144_240kbps_60fps.vp8", "bbb_vp8_176x144_240kbps_60fps.info",

         ""},

        {"x-vnd.on2.vp8", "bbb_vp8_640x360_2mbps_30fps.vp8", "bbb_vp8_640x360_2mbps_30fps.info",

         "bbb_vp8_640x360_2mbps_30fps_chksm.md5"},

        {"vp9", "bbb_vp9_176x144_285kbps_60fps.vp9", "bbb_vp9_176x144_285kbps_60fps.info", ""},

        {"vp9", "bbb_vp9_640x360_1600kbps_30fps.vp9", "bbb_vp9_640x360_1600kbps_30fps.info",

         "bbb_vp9_640x360_1600kbps_30fps_chksm.md5"},

        {"vp9", "bbb_vp9_704x480_280kbps_24fps_altref_2.vp9",

        {"x-vnd.on2.vp9", "bbb_vp9_176x144_285kbps_60fps.vp9", "bbb_vp9_176x144_285kbps_60fps.info",

         ""},

        {"x-vnd.on2.vp9", "bbb_vp9_640x360_1600kbps_30fps.vp9",

         "bbb_vp9_640x360_1600kbps_30fps.info", "bbb_vp9_640x360_1600kbps_30fps_chksm.md5"},

        {"x-vnd.on2.vp9", "bbb_vp9_704x480_280kbps_24fps_altref_2.vp9",

         "bbb_vp9_704x480_280kbps_24fps_altref_2.info", ""},

        {"av01", "bbb_av1_640_360.av1", "bbb_av1_640_360.info", "bbb_av1_640_360_chksum.md5"},

        {"av01", "bbb_av1_176_144.av1", "bbb_av1_176_144.info", "bbb_av1_176_144_chksm.md5"},
@@ -379,7 +381,7 @@ bool Codec2VideoDecHidlTestBase::getFileNames(size_t streamIndex) { 
    int streamCount = 0;



    for (size_t i = 0; i < gCompToFiles.size(); ++i) {

        if (mMime.find(gCompToFiles[i].mime) != std::string::npos) {

        if (!mMime.compare("video/" + gCompToFiles[i].mime)) {

            if (streamCount == streamIndex) {

                mInputFile = sResourceDir + gCompToFiles[i].inputFile;

                mInfoFile = sResourceDir + gCompToFiles[i].infoFile;