Merge "AudioParameter: Use for BT audio HAL" (b883e1f3) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_a2dp_hw/src/audio_a2dp_hw.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1184,7 +1184,7 @@ static int out_set_parameters(struct audio_stream* stream,
	/* dump params */		/* dump params */
	hash_map_utils_dump_string_keys_string_values(params);		hash_map_utils_dump_string_keys_string_values(params);

	if (params["closing"].compare("true") == 0) {		if (params[AUDIO_PARAMETER_KEY_CLOSING].compare("true") == 0) {
	DEBUG("stream closing, disallow any writes");		DEBUG("stream closing, disallow any writes");
	out->common.state = AUDIO_A2DP_STATE_STOPPING;		out->common.state = AUDIO_A2DP_STATE_STOPPING;
	}		}

system/audio_bluetooth_hw/stream_apis.cc

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -336,7 +336,7 @@ static int out_set_parameters(struct audio_stream* stream,
	}		}
	}		}

	if (params.find("routing") != params.end()) {		if (params.find(AUDIO_PARAMETER_STREAM_ROUTING) != params.end()) {
	auto routing_param = params.find("routing");		auto routing_param = params.find("routing");
	LOG(INFO) << __func__ << ": state=" << out->bluetooth_output_->GetState()		LOG(INFO) << __func__ << ": state=" << out->bluetooth_output_->GetState()
	<< ", stream param '" << routing_param->first.c_str() << "="		<< ", stream param '" << routing_param->first.c_str() << "="
	@@ -391,8 +391,8 @@ static int out_set_parameters(struct audio_stream* stream,
	}		}
	}		}

	if (params.find("closing") != params.end()) {		if (params.find(AUDIO_PARAMETER_KEY_CLOSING) != params.end()) {
	if (params["closing"] == "true") {		if (params[AUDIO_PARAMETER_KEY_CLOSING] == "true") {
	LOG(INFO) << __func__ << ": state=" << out->bluetooth_output_->GetState()		LOG(INFO) << __func__ << ": state=" << out->bluetooth_output_->GetState()
	<< " stream param closing, disallow any writes?";		<< " stream param closing, disallow any writes?";
	if (out->bluetooth_output_->GetState() !=		if (out->bluetooth_output_->GetState() !=
	@@ -404,8 +404,8 @@ static int out_set_parameters(struct audio_stream* stream,
	}		}
	}		}

	if (params.find("exiting") != params.end()) {		if (params.find(AUDIO_PARAMETER_KEY_EXITING) != params.end()) {
	if (params["exiting"] == "1") {		if (params[AUDIO_PARAMETER_KEY_EXITING] == "1") {
	LOG(INFO) << __func__ << ": state=" << out->bluetooth_output_->GetState()		LOG(INFO) << __func__ << ": state=" << out->bluetooth_output_->GetState()
	<< " stream param exiting";		<< " stream param exiting";
	if (out->bluetooth_output_->GetState() !=		if (out->bluetooth_output_->GetState() !=

system/audio_hearing_aid_hw/src/audio_hearing_aid_hw.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1167,7 +1167,7 @@ static int out_set_parameters(struct audio_stream* stream,
	/* dump params */		/* dump params */
	hash_map_utils_dump_string_keys_string_values(params);		hash_map_utils_dump_string_keys_string_values(params);

	if (params["closing"].compare("true") == 0) {		if (params[AUDIO_PARAMETER_KEY_CLOSING].compare("true") == 0) {
	DEBUG("stream closing, disallow any writes");		DEBUG("stream closing, disallow any writes");
	out->common.state = AUDIO_HA_STATE_STOPPING;		out->common.state = AUDIO_HA_STATE_STOPPING;
	}		}