Commit 887573c6 authored May 16, 2022 by Treehugger Robot Committed by Automerger Merge Worker May 16, 2022

Merge "C2 VTS: use mime instead of component name in DecodeTest" into...

Merge "C2 VTS: use mime instead of component name in DecodeTest" into android12-tests-dev am: fd05de2d

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

Change-Id: I5e14794274e63a139cbc03689db0badc31248e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -465,7 +465,8 @@ TEST_P(Codec2AudioDecDecodeTest, DecodeTest) {
		if (mMime.find("raw") != std::string::npos) {
		bitStreamInfo[0] = 8000;
		bitStreamInfo[1] = 1;
		} else if (mCompName == g711alaw \|\| mCompName == g711mlaw) {
		} else if ((mMime.find("g711-alaw") != std::string::npos) \|\|
		(mMime.find("g711-mlaw") != std::string::npos)) {
		// g711 test data is all 1-channel and has no embedded config info.
		bitStreamInfo[0] = 8000;
		bitStreamInfo[1] = 1;