diff --git a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp index 8520757703..145d04a78b 100644 --- a/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp +++ b/media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp @@ -171,7 +171,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { {"mp3", mp3}, {"amrnb", amrnb}, {"amrwb", amrwb}, {"aac", aac}, {"vorbis", vorbis}, {"opus", opus}, {"pcm", pcm}, {"g711alaw", g711alaw}, {"g711mlaw", g711mlaw}, - {"gsm", gsm}, {"raw", raw}, + {"gsm", gsm}, {"raw", raw}, {"flac", flac}, }; const size_t kNumStringToName = sizeof(kStringToName) / sizeof(kStringToName[0]); @@ -204,6 +204,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { {g711mlaw, OMX_AUDIO_CodingG711}, {gsm, OMX_AUDIO_CodingGSMFR}, {raw, OMX_AUDIO_CodingPCM}, + {flac, OMX_AUDIO_CodingFLAC}, }; static const size_t kNumCompToCoding = sizeof(kCompToCoding) / sizeof(kCompToCoding[0]); @@ -301,6 +302,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { g711mlaw, gsm, raw, + flac, unknown_comp, }; @@ -431,6 +433,16 @@ void getInputChannelInfo(sp omxNode, OMX_U32 kPortIndexInput, *nSampleRate = param.nSampleRate; break; } + case OMX_AUDIO_CodingFLAC: { + OMX_AUDIO_PARAM_FLACTYPE param; + status = getPortParam(omxNode, OMX_IndexParamAudioFlac, + kPortIndexInput, ¶m); + ASSERT_EQ(status, + ::android::hardware::media::omx::V1_0::Status::OK); + *nChannels = param.nChannels; + *nSampleRate = param.nSampleRate; + break; + } default: ASSERT_TRUE(false); break; @@ -472,6 +484,9 @@ void GetURLForComponent(AudioDecHidlTest::standardComp comp, char* mURL, "bbb_gsm_1ch_8khz_13kbps.info"}, {AudioDecHidlTest::standardComp::raw, "bbb_raw_1ch_8khz_s32le.raw", "bbb_raw_1ch_8khz_s32le.info"}, + {AudioDecHidlTest::standardComp::flac, + "bbb_flac_stereo_680kbps_48000hz.flac", + "bbb_flac_stereo_680kbps_48000hz.info"}, }; for (size_t i = 0; i < sizeof(kCompToURL) / sizeof(kCompToURL[0]); ++i) { diff --git a/media/res/bbb_flac_stereo_680kbps_48000hz.flac b/media/res/bbb_flac_stereo_680kbps_48000hz.flac new file mode 100644 index 0000000000..db94d8eb04 Binary files /dev/null and b/media/res/bbb_flac_stereo_680kbps_48000hz.flac differ diff --git a/media/res/bbb_flac_stereo_680kbps_48000hz.info b/media/res/bbb_flac_stereo_680kbps_48000hz.info new file mode 100644 index 0000000000..c57243079d --- /dev/null +++ b/media/res/bbb_flac_stereo_680kbps_48000hz.info @@ -0,0 +1,415 @@ +42 128 0 +1386 32 0 +2401 32 24000 +2321 32 48000 +2367 32 72000 +2370 32 96000 +2334 32 120000 +2396 32 144000 +2375 32 168000 +2431 32 192000 +2428 32 216000 +2334 32 240000 +2261 32 264000 +2124 32 288000 +2152 32 312000 +2295 32 336000 +2183 32 360000 +2393 32 384000 +2400 32 408000 +2246 32 432000 +2289 32 456000 +2400 32 480000 +2335 32 504000 +2294 32 528000 +2260 32 552000 +2206 32 576000 +2185 32 600000 +2155 32 624000 +2118 32 648000 +2094 32 672000 +2050 32 696000 +2059 32 720000 +2030 32 744000 +2022 32 768000 +2078 32 792000 +2082 32 816000 +2094 32 840000 +2111 32 864000 +2043 32 888000 +2023 32 912000 +2024 32 936000 +2056 32 960000 +2108 32 984000 +2138 32 1008000 +2140 32 1032000 +2111 32 1056000 +2110 32 1080000 +2137 32 1104000 +2157 32 1128000 +2174 32 1152000 +2200 32 1176000 +2203 32 1200000 +2237 32 1224000 +2261 32 1248000 +2215 32 1272000 +2133 32 1296000 +2091 32 1320000 +2088 32 1344000 +2122 32 1368000 +2139 32 1392000 +2146 32 1416000 +2231 32 1440000 +2282 32 1464000 +2273 32 1488000 +2304 32 1512000 +2292 32 1536000 +2255 32 1560000 +2181 32 1584000 +2081 32 1608000 +2012 32 1632000 +2011 32 1656000 +2066 32 1680000 +2069 32 1704000 +2120 32 1728000 +2141 32 1752000 +2148 32 1776000 +2181 32 1800000 +2176 32 1824000 +2240 32 1848000 +2297 32 1872000 +2325 32 1896000 +2336 32 1920000 +2329 32 1944000 +2299 32 1968000 +2322 32 1992000 +2347 32 2016000 +2287 32 2040000 +2286 32 2064000 +2269 32 2088000 +2320 32 2112000 +2305 32 2136000 +2384 32 2160000 +2429 32 2184000 +2370 32 2208000 +2365 32 2232000 +2361 32 2256000 +2370 32 2280000 +2393 32 2304000 +2342 32 2328000 +2325 32 2352000 +2334 32 2376000 +2316 32 2400000 +2317 32 2424000 +2305 32 2448000 +2360 32 2472000 +2331 32 2496000 +2332 32 2520000 +2361 32 2544000 +2417 32 2568000 +2438 32 2592000 +2403 32 2616000 +2386 32 2640000 +2382 32 2664000 +2350 32 2688000 +2355 32 2712000 +2383 32 2736000 +2384 32 2760000 +2383 32 2784000 +2373 32 2808000 +2374 32 2832000 +2347 32 2856000 +2353 32 2880000 +2381 32 2904000 +2401 32 2928000 +2401 32 2952000 +2385 32 2976000 +2382 32 3000000 +2328 32 3024000 +2303 32 3048000 +2272 32 3072000 +2270 32 3096000 +2312 32 3120000 +2273 32 3144000 +2330 32 3168000 +2339 32 3192000 +2296 32 3216000 +2317 32 3240000 +2440 32 3264000 +2353 32 3288000 +2346 32 3312000 +2303 32 3336000 +2308 32 3360000 +2287 32 3384000 +2316 32 3408000 +2367 32 3432000 +2335 32 3456000 +2350 32 3480000 +2395 32 3504000 +2408 32 3528000 +2413 32 3552000 +2415 32 3576000 +2468 32 3600000 +2437 32 3624000 +2372 32 3648000 +2371 32 3672000 +2341 32 3696000 +2328 32 3720000 +2273 32 3744000 +2244 32 3768000 +2233 32 3792000 +2229 32 3816000 +2252 32 3840000 +2236 32 3864000 +2217 32 3888000 +2179 32 3912000 +2251 32 3936000 +2192 32 3960000 +2199 32 3984000 +2212 32 4008000 +2190 32 4032000 +2102 32 4056000 +2120 32 4080000 +2167 32 4104000 +2024 32 4128000 +2010 32 4152000 +2067 32 4176000 +2035 32 4200000 +2051 32 4224000 +2012 32 4248000 +2066 32 4272000 +2025 32 4296000 +1987 32 4320000 +1972 32 4344000 +1966 32 4368000 +1999 32 4392000 +1987 32 4416000 +1922 32 4440000 +2020 32 4464000 +2072 32 4488000 +2021 32 4512000 +2017 32 4536000 +2099 32 4560000 +2064 32 4584000 +2109 32 4608000 +2093 32 4632000 +2090 32 4656000 +2148 32 4680000 +2184 32 4704000 +2179 32 4728000 +2152 32 4752000 +2143 32 4776000 +2159 32 4800000 +2123 32 4824000 +2129 32 4848000 +2147 32 4872000 +2192 32 4896000 +2051 32 4920000 +2116 32 4944000 +2124 32 4968000 +2088 32 4992000 +2073 32 5016000 +2146 32 5040000 +2133 32 5064000 +2073 32 5088000 +2059 32 5112000 +2044 32 5136000 +2012 32 5160000 +2034 32 5184000 +2053 32 5208000 +2013 32 5232000 +1981 32 5256000 +2094 32 5280000 +2076 32 5304000 +1968 32 5328000 +2028 32 5352000 +2031 32 5376000 +2020 32 5400000 +2019 32 5424000 +2030 32 5448000 +2015 32 5472000 +1962 32 5496000 +2070 32 5520000 +2087 32 5544000 +1964 32 5568000 +2069 32 5592000 +2034 32 5616000 +1994 32 5640000 +1985 32 5664000 +2030 32 5688000 +2066 32 5712000 +1954 32 5736000 +1733 32 5760000 +1649 32 5784000 +1652 32 5808000 +1631 32 5832000 +1656 32 5856000 +1672 32 5880000 +1667 32 5904000 +1696 32 5928000 +1672 32 5952000 +1701 32 5976000 +1651 32 6000000 +1674 32 6024000 +1695 32 6048000 +1702 32 6072000 +1707 32 6096000 +1694 32 6120000 +1727 32 6144000 +1730 32 6168000 +1708 32 6192000 +1704 32 6216000 +1735 32 6240000 +1758 32 6264000 +1753 32 6288000 +1748 32 6312000 +1763 32 6336000 +1737 32 6360000 +1783 32 6384000 +1839 32 6408000 +1861 32 6432000 +1832 32 6456000 +1947 32 6480000 +1939 32 6504000 +1926 32 6528000 +1896 32 6552000 +1909 32 6576000 +1869 32 6600000 +1900 32 6624000 +1896 32 6648000 +1883 32 6672000 +1903 32 6696000 +1895 32 6720000 +1865 32 6744000 +1878 32 6768000 +1881 32 6792000 +1861 32 6816000 +1791 32 6840000 +1787 32 6864000 +1798 32 6888000 +1811 32 6912000 +1824 32 6936000 +1895 32 6960000 +2079 32 6984000 +2034 32 7008000 +2038 32 7032000 +2018 32 7056000 +2030 32 7080000 +2067 32 7104000 +1982 32 7128000 +1911 32 7152000 +1904 32 7176000 +1874 32 7200000 +1876 32 7224000 +1944 32 7248000 +1977 32 7272000 +1977 32 7296000 +1979 32 7320000 +2012 32 7344000 +1961 32 7368000 +1773 32 7392000 +1780 32 7416000 +1801 32 7440000 +1892 32 7464000 +1869 32 7488000 +1936 32 7512000 +2154 32 7536000 +2226 32 7560000 +2159 32 7584000 +2253 32 7608000 +2286 32 7632000 +2214 32 7656000 +2111 32 7680000 +2027 32 7704000 +1994 32 7728000 +1882 32 7752000 +1887 32 7776000 +1993 32 7800000 +1962 32 7824000 +1982 32 7848000 +1966 32 7872000 +1962 32 7896000 +1928 32 7920000 +1878 32 7944000 +1857 32 7968000 +1885 32 7992000 +1919 32 8016000 +1904 32 8040000 +1909 32 8064000 +1909 32 8088000 +1933 32 8112000 +1824 32 8136000 +1756 32 8160000 +1733 32 8184000 +1705 32 8208000 +1755 32 8232000 +1756 32 8256000 +1725 32 8280000 +1761 32 8304000 +1736 32 8328000 +1706 32 8352000 +1662 32 8376000 +1604 32 8400000 +1613 32 8424000 +1692 32 8448000 +1736 32 8472000 +1779 32 8496000 +1768 32 8520000 +1758 32 8544000 +1708 32 8568000 +1642 32 8592000 +1645 32 8616000 +1581 32 8640000 +1651 32 8664000 +1731 32 8688000 +1743 32 8712000 +1717 32 8736000 +1715 32 8760000 +1646 32 8784000 +1551 32 8808000 +1563 32 8832000 +1649 32 8856000 +1742 32 8880000 +1724 32 8904000 +1676 32 8928000 +1664 32 8952000 +1587 32 8976000 +1497 32 9000000 +1503 32 9024000 +1644 32 9048000 +1658 32 9072000 +1680 32 9096000 +1611 32 9120000 +1694 32 9144000 +1668 32 9168000 +1677 32 9192000 +1604 32 9216000 +1567 32 9240000 +1639 32 9264000 +1552 32 9288000 +1486 32 9312000 +1494 32 9336000 +1480 32 9360000 +1509 32 9384000 +1457 32 9408000 +1423 32 9432000 +1459 32 9456000 +1444 32 9480000 +1424 32 9504000 +1413 32 9528000 +1498 32 9552000 +1455 32 9576000 +1393 32 9600000 +1638 32 9624000 +1919 32 9648000 +1979 32 9672000 +1894 32 9696000 +2002 32 9720000 +2062 32 9744000 +2098 32 9768000 +1919 32 9792000 +1738 32 9816000 +1890 32 9840000 +1971 32 9864000 +2429 32 9888000 +1861 32 9912000