jenna
/
device_samsung_sm7125-common
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sm7125-common: audio-impl: Use String8/16 c_str

Browse Source 
Bug: 295394788
Test: make checkbuild
Change-Id: I9cba2d925dc1e5363927ba336b0ca2c43207ddad
fourteen-wip
Tomasz Wasilczyk 1 year ago committed by Simon1511
parent 21363945a3
commit 675f13312a
2 changed files with 10 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      audio/impl/ParametersUtil.cpp
  2. 12
      audio/impl/Stream.cpp

8
audio/impl/ParametersUtil.cpp
Unescape View File

@ -97,15 +97,15 @@ void ParametersUtil::getParametersImpl(
retval = getHalStatusToResult(status); retval = getHalStatusToResult(status);
break; break;
} }
result[i].key = halKey.string(); result[i].key = halKey.c_str();
result[i].value = halValue.string(); result[i].value = halValue.c_str();
} }
cb(retval, result); cb(retval, result);
} }
std::unique_ptr<AudioParameter> ParametersUtil::getParams(const AudioParameter& keys) { std::unique_ptr<AudioParameter> ParametersUtil::getParams(const AudioParameter& keys) {
String8 paramsAndValues; String8 paramsAndValues;
char* halValues = halGetParameters(keys.keysToString().string()); char* halValues = halGetParameters(keys.keysToString().c_str());
if (halValues != NULL) { if (halValues != NULL) {
paramsAndValues.setTo(halValues); paramsAndValues.setTo(halValues);
free(halValues); free(halValues);
@ -167,7 +167,7 @@ Result ParametersUtil::setParam(const char* name, const DeviceAddress& address)
} }
Result ParametersUtil::setParams(const AudioParameter& param) { Result ParametersUtil::setParams(const AudioParameter& param) {
int halStatus = halSetParameters(param.toString().string()); int halStatus = halSetParameters(param.toString().c_str());
return util::analyzeStatus(halStatus); return util::analyzeStatus(halStatus);
} }

12
audio/impl/Stream.cpp
Unescape View File

@ -114,7 +114,7 @@ Return<void> Stream::getSupportedSampleRates(AudioFormat format,
SampleRateSet halSampleRates; SampleRateSet halSampleRates;
if (result == Result::OK) { if (result == Result::OK) {
halSampleRates = halSampleRates =
samplingRatesFromString(halListValue.string(), AudioParameter::valueListSeparator); samplingRatesFromString(halListValue.c_str(), AudioParameter::valueListSeparator);
sampleRates = hidl_vec<uint32_t>(halSampleRates.begin(), halSampleRates.end()); sampleRates = hidl_vec<uint32_t>(halSampleRates.begin(), halSampleRates.end());
// Legacy get_parameter does not return a status_t, thus can not advertise of failure. // Legacy get_parameter does not return a status_t, thus can not advertise of failure.
// Note that this method must succeed (non empty list) if the format is supported. // Note that this method must succeed (non empty list) if the format is supported.
@ -140,7 +140,7 @@ Return<void> Stream::getSupportedChannelMasks(AudioFormat format,
ChannelMaskSet halChannelMasks; ChannelMaskSet halChannelMasks;
if (result == Result::OK) { if (result == Result::OK) {
halChannelMasks = halChannelMasks =
channelMasksFromString(halListValue.string(), AudioParameter::valueListSeparator); channelMasksFromString(halListValue.c_str(), AudioParameter::valueListSeparator);
channelMasks.resize(halChannelMasks.size()); channelMasks.resize(halChannelMasks.size());
size_t i = 0; size_t i = 0;
for (auto channelMask : halChannelMasks) { for (auto channelMask : halChannelMasks) {
@ -182,7 +182,7 @@ Return<void> Stream::getSupportedFormats(getSupportedFormats_cb _hidl_cb) {
hidl_vec<AudioFormat> formats; hidl_vec<AudioFormat> formats;
FormatVector halFormats; FormatVector halFormats;
if (result == Result::OK) { if (result == Result::OK) {
halFormats = formatsFromString(halListValue.string(), AudioParameter::valueListSeparator); halFormats = formatsFromString(halListValue.c_str(), AudioParameter::valueListSeparator);
formats.resize(halFormats.size()); formats.resize(halFormats.size());
for (size_t i = 0; i < halFormats.size(); ++i) { for (size_t i = 0; i < halFormats.size(); ++i) {
formats[i] = AudioFormat(halFormats[i]); formats[i] = AudioFormat(halFormats[i]);
@ -226,7 +226,7 @@ Return<void> Stream::getSupportedProfiles(getSupportedProfiles_cb _hidl_cb) {
// Ensure that the separator is one character, despite that it's defined as a C string. // Ensure that the separator is one character, despite that it's defined as a C string.
static_assert(sizeof(AUDIO_PARAMETER_VALUE_LIST_SEPARATOR) == 2); static_assert(sizeof(AUDIO_PARAMETER_VALUE_LIST_SEPARATOR) == 2);
std::vector<std::string> halFormats = std::vector<std::string> halFormats =
splitString(halListValue.string(), AUDIO_PARAMETER_VALUE_LIST_SEPARATOR[0]); splitString(halListValue.c_str(), AUDIO_PARAMETER_VALUE_LIST_SEPARATOR[0]);
hidl_vec<AudioFormat> formats; hidl_vec<AudioFormat> formats;
(void)HidlUtils::audioFormatsFromHal(halFormats, &formats); (void)HidlUtils::audioFormatsFromHal(halFormats, &formats);
std::vector<AudioProfile> tempProfiles; std::vector<AudioProfile> tempProfiles;
@ -241,7 +241,7 @@ Return<void> Stream::getSupportedProfiles(getSupportedProfiles_cb _hidl_cb) {
result = getParam(AudioParameter::keyStreamSupportedSamplingRates, &halListValue, context); result = getParam(AudioParameter::keyStreamSupportedSamplingRates, &halListValue, context);
if (result != Result::OK) break; if (result != Result::OK) break;
std::vector<std::string> halSampleRates = std::vector<std::string> halSampleRates =
splitString(halListValue.string(), AUDIO_PARAMETER_VALUE_LIST_SEPARATOR[0]); splitString(halListValue.c_str(), AUDIO_PARAMETER_VALUE_LIST_SEPARATOR[0]);
hidl_vec<uint32_t> sampleRates; hidl_vec<uint32_t> sampleRates;
sampleRates.resize(halSampleRates.size()); sampleRates.resize(halSampleRates.size());
for (size_t i = 0; i < sampleRates.size(); ++i) { for (size_t i = 0; i < sampleRates.size(); ++i) {
@ -251,7 +251,7 @@ Return<void> Stream::getSupportedProfiles(getSupportedProfiles_cb _hidl_cb) {
result = getParam(AudioParameter::keyStreamSupportedChannels, &halListValue, context); result = getParam(AudioParameter::keyStreamSupportedChannels, &halListValue, context);
if (result != Result::OK) break; if (result != Result::OK) break;
std::vector<std::string> halChannelMasks = std::vector<std::string> halChannelMasks =
splitString(halListValue.string(), AUDIO_PARAMETER_VALUE_LIST_SEPARATOR[0]); splitString(halListValue.c_str(), AUDIO_PARAMETER_VALUE_LIST_SEPARATOR[0]);
hidl_vec<AudioChannelMask> channelMasks; hidl_vec<AudioChannelMask> channelMasks;
(void)HidlUtils::audioChannelMasksFromHal(halChannelMasks, &channelMasks); (void)HidlUtils::audioChannelMasksFromHal(halChannelMasks, &channelMasks);
// Create a profile. // Create a profile.

Write Preview
Loading…
Cancel
Save