From ff88f762a8e1252486a160e0e9dac2c2f8f345ec Mon Sep 17 00:00:00 2001 From: zhuchaochao Date: Tue, 26 Sep 2023 03:36:16 +0000 Subject: [PATCH] parse usb hal info Signed-off-by: zhuchaochao Change-Id: Ia7a55446df08c97c6c261cf15c4d84ee45bc5128 --- .../src/service/audio_policy_service.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/services/audio_policy/server/src/service/audio_policy_service.cpp b/services/audio_policy/server/src/service/audio_policy_service.cpp index 7b5629b222..5b1603e9e1 100644 --- a/services/audio_policy/server/src/service/audio_policy_service.cpp +++ b/services/audio_policy/server/src/service/audio_policy_service.cpp @@ -1358,24 +1358,24 @@ static string ParseAudioFormat(string format) static void GetUsbModuleInfo(AudioModuleInfo &moduleInfo, string deviceInfo) { if (moduleInfo.role == "sink") { - auto sinkRate_begin = deviceInfo.find("sink_rate"); + auto sinkRate_begin = deviceInfo.find("sink_rate:"); auto sinkRate_end = deviceInfo.find_first_of(";", sinkRate_begin); - moduleInfo.rate = deviceInfo.substr(sinkRate_begin + std::strlen("sink_rate"), - sinkRate_end - sinkRate_begin - std::strlen("sink_rate")); - auto sinkFormat_begin = deviceInfo.find("sink_format"); + moduleInfo.rate = deviceInfo.substr(sinkRate_begin + std::strlen("sink_rate:"), + sinkRate_end - sinkRate_begin - std::strlen("sink_rate:")); + auto sinkFormat_begin = deviceInfo.find("sink_format:"); auto sinkFormat_end = deviceInfo.find_first_of(";", sinkFormat_begin); - string format = deviceInfo.substr(sinkFormat_begin + std::strlen("sink_format"), - sinkFormat_end - sinkFormat_begin - std::strlen("sink_format")); + string format = deviceInfo.substr(sinkFormat_begin + std::strlen("sink_format:"), + sinkFormat_end - sinkFormat_begin - std::strlen("sink_format:")); moduleInfo.format = ParseAudioFormat(format); } else { - auto sourceRate_begin = deviceInfo.find("source_rate"); + auto sourceRate_begin = deviceInfo.find("source_rate:"); auto sourceRate_end = deviceInfo.find_first_of(";", sourceRate_begin); - moduleInfo.rate = deviceInfo.substr(sourceRate_begin + std::strlen("source_rate"), - sourceRate_end - sourceRate_begin - std::strlen("source_rate")); - auto sourceFormat_begin = deviceInfo.find("source_format"); + moduleInfo.rate = deviceInfo.substr(sourceRate_begin + std::strlen("source_rate:"), + sourceRate_end - sourceRate_begin - std::strlen("source_rate:")); + auto sourceFormat_begin = deviceInfo.find("source_format:"); auto sourceFormat_end = deviceInfo.find_first_of(";", sourceFormat_begin); - string format = deviceInfo.substr(sourceFormat_begin + std::strlen("source_format"), - sourceFormat_end - sourceFormat_begin - std::strlen("source_format")); + string format = deviceInfo.substr(sourceFormat_begin + std::strlen("source_format:"), + sourceFormat_end - sourceFormat_begin - std::strlen("source_format:")); moduleInfo.format = ParseAudioFormat(format); } } -- Gitee