Merge "Refine the log messages of audio_bluetooth_hal" (c0cbaa44) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_bluetooth_hw/device_port_proxy.cc

+56 −60

system/audio_bluetooth_hw/stream_apis.cc

+17 −29

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@
	#include "stream_apis.h"		#include "stream_apis.h"
	#include "utils.h"		#include "utils.h"

			using ::android::base::StringPrintf;
	using ::android::bluetooth::audio::BluetoothAudioPortOut;		using ::android::bluetooth::audio::BluetoothAudioPortOut;
	using ::android::bluetooth::audio::utils::GetAudioParamString;		using ::android::bluetooth::audio::utils::GetAudioParamString;
	using ::android::bluetooth::audio::utils::ParseAudioParams;		using ::android::bluetooth::audio::utils::ParseAudioParams;
	@@ -41,9 +42,7 @@ constexpr int kExtraAudioSyncMs = 200;

	std::ostream& operator<<(std::ostream& os, const audio_config& config) {		std::ostream& operator<<(std::ostream& os, const audio_config& config) {
	return os << "audio_config[sample_rate=" << config.sample_rate		return os << "audio_config[sample_rate=" << config.sample_rate
	<< ", channels=0x"		<< ", channels=" << StringPrintf("%#x", config.channel_mask) << ", format=" << config.format << "]";
	<< android::base::StringPrintf("%x", config.channel_mask)
	<< ", format=" << config.format << "]";
	}		}

	} // namespace		} // namespace
	@@ -63,7 +62,7 @@ std::ostream& operator<<(std::ostream& os, const BluetoothStreamState& state) {
	case BluetoothStreamState::UNKNOWN:		case BluetoothStreamState::UNKNOWN:
	return os << "UNKNOWN";		return os << "UNKNOWN";
	default:		default:
	return os << "0x" + android::base::StringPrintf("%hhx", state);		return os << StringPrintf("%#hhx", state);
	}		}
	}		}

	@@ -107,9 +106,7 @@ static audio_channel_mask_t out_get_channels(
	return audio_cfg.channel_mask;		return audio_cfg.channel_mask;
	} else {		} else {
	LOG(WARNING) << __func__ << ": state=" << out->bluetooth_output_.GetState()		LOG(WARNING) << __func__ << ": state=" << out->bluetooth_output_.GetState()
	<< ", channels=0x"		<< ", channels=" << StringPrintf("%#x", out->channel_mask_) << " failure";
	<< android::base::StringPrintf("%x", out->channel_mask_)
	<< " failure";
	return out->channel_mask_;		return out->channel_mask_;
	}		}
	}		}
	@@ -194,10 +191,8 @@ static int out_set_parameters(struct audio_stream* stream,
	out->sample_rate_ = audio_cfg.sample_rate;		out->sample_rate_ = audio_cfg.sample_rate;
	out->channel_mask_ = audio_cfg.channel_mask;		out->channel_mask_ = audio_cfg.channel_mask;
	out->format_ = audio_cfg.format;		out->format_ = audio_cfg.format;
	LOG(VERBOSE) << "state=" << out->bluetooth_output_.GetState()		LOG(VERBOSE) << "state=" << out->bluetooth_output_.GetState() << ", sample_rate=" << out->sample_rate_
	<< ", sample_rate=" << out->sample_rate_ << ", channels=0x"		<< ", channels=" << StringPrintf("%#x", out->channel_mask_) << ", format=" << out->format_;
	<< android::base::StringPrintf("%x", out->channel_mask_)
	<< ", format=" << out->format_;
	} else {		} else {
	LOG(WARNING) << __func__		LOG(WARNING) << __func__
	<< ": state=" << out->bluetooth_output_.GetState()		<< ": state=" << out->bluetooth_output_.GetState()
	@@ -554,12 +549,9 @@ static int out_get_presentation_position(const struct audio_stream_out* stream,
	timestamp->tv_sec += static_cast<int>(timestamp->tv_nsec / 1000000000);		timestamp->tv_sec += static_cast<int>(timestamp->tv_nsec / 1000000000);
	timestamp->tv_nsec %= 1000000000;		timestamp->tv_nsec %= 1000000000;
	}		}
	LOG(VERBOSE) << __func__		LOG(VERBOSE) << __func__ << ": state=" << out->bluetooth_output_.GetState() << ", frames=" << *frames << " ("
	<< ": state=" << out->bluetooth_output_.GetState()		<< bytes << " bytes), timestamp=" << timestamp->tv_sec << "."
	<< ", frames=" << *frames << " (" << bytes		<< StringPrintf("%09ld", timestamp->tv_nsec) << "s";
	<< " bytes), timestamp=" << timestamp->tv_sec << "."
	<< android::base::StringPrintf("%09ld", timestamp->tv_nsec)
	<< "s";
	return 0;		return 0;
	} else if (delay_report_ns >= kMaximumDelayMs * 1000000) {		} else if (delay_report_ns >= kMaximumDelayMs * 1000000) {
	LOG(WARNING) << __func__		LOG(WARNING) << __func__
	@@ -572,11 +564,9 @@ static int out_get_presentation_position(const struct audio_stream_out* stream,
	if (out->frames_presented_ >= out->frames_count_) {		if (out->frames_presented_ >= out->frames_count_) {
	clock_gettime(CLOCK_MONOTONIC, timestamp);		clock_gettime(CLOCK_MONOTONIC, timestamp);
	*frames = out->frames_presented_ - out->frames_count_;		*frames = out->frames_presented_ - out->frames_count_;
	LOG(VERBOSE) << __func__ << ": state=" << out->bluetooth_output_.GetState()		LOG(VERBOSE) << __func__ << ": state=" << out->bluetooth_output_.GetState() << ", frames=" << *frames << " ("
	<< ", frames=" << *frames << " (" << bytes		<< bytes << " bytes), timestamp=" << timestamp->tv_sec << "."
	<< " bytes), timestamp=" << timestamp->tv_sec << "."		<< StringPrintf("%09ld", timestamp->tv_nsec) << "s";
	<< android::base::StringPrintf("%09ld", timestamp->tv_nsec)
	<< "s";
	return 0;		return 0;
	}		}

	@@ -615,8 +605,7 @@ int adev_open_output_stream(struct audio_hw_device* dev,
	delete out;		delete out;
	return -EINVAL;		return -EINVAL;
	}		}
	LOG(VERBOSE) << __func__ << ": device=0x"		LOG(VERBOSE) << __func__ << ": device=" << StringPrintf("%#x", devices);
	<< android::base::StringPrintf("%08x", devices);

	out->stream_out_.common.get_sample_rate = out_get_sample_rate;		out->stream_out_.common.get_sample_rate = out_get_sample_rate;
	out->stream_out_.common.set_sample_rate = out_set_sample_rate;		out->stream_out_.common.set_sample_rate = out_set_sample_rate;
	@@ -646,7 +635,7 @@ int adev_open_output_stream(struct audio_hw_device* dev,
	}		}
	// WAR to support Mono / 16 bits per sample as the Bluetooth stack required		// WAR to support Mono / 16 bits per sample as the Bluetooth stack required
	if (config->channel_mask == AUDIO_CHANNEL_OUT_MONO && config->format == AUDIO_FORMAT_PCM_16_BIT) {		if (config->channel_mask == AUDIO_CHANNEL_OUT_MONO && config->format == AUDIO_FORMAT_PCM_16_BIT) {
	LOG(INFO) << __func__ << ": force channels=0x" << android::base::StringPrintf("%x", out->channel_mask_)		LOG(INFO) << __func__ << ": force channels=" << StringPrintf("%#x", out->channel_mask_)
	<< " to be AUDIO_CHANNEL_OUT_STEREO";		<< " to be AUDIO_CHANNEL_OUT_STEREO";
	out->bluetooth_output_.ForcePcmStereoToMono(true);		out->bluetooth_output_.ForcePcmStereoToMono(true);
	config->channel_mask = AUDIO_CHANNEL_OUT_STEREO;		config->channel_mask = AUDIO_CHANNEL_OUT_STEREO;
	@@ -661,10 +650,9 @@ int adev_open_output_stream(struct audio_hw_device* dev,
	out->frames_presented_ = 0;		out->frames_presented_ = 0;

	*stream_out = &out->stream_out_;		*stream_out = &out->stream_out_;
	LOG(INFO) << __func__ << ": state=" << out->bluetooth_output_.GetState()		LOG(INFO) << __func__ << ": state=" << out->bluetooth_output_.GetState() << ", sample_rate=" << out->sample_rate_
	<< ", sample_rate=" << out->sample_rate_ << ", channels="		<< ", channels=" << StringPrintf("%#x", out->channel_mask_) << ", format=" << out->format_
	<< android::base::StringPrintf("%x", out->channel_mask_)		<< ", frames=" << out->frames_count_;
	<< ", format=" << out->format_ << ", frames=" << out->frames_count_;
	return 0;		return 0;
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -32,8 +32,7 @@ namespace android {
	namespace bluetooth {		namespace bluetooth {
	namespace audio {		namespace audio {

	using android::base::StringPrintf;		using ::android::base::StringPrintf;

	using ::android::bluetooth::audio::BluetoothAudioSessionControl;		using ::android::bluetooth::audio::BluetoothAudioSessionControl;
	using ::android::hardware::bluetooth::audio::V2_0::BitsPerSample;		using ::android::hardware::bluetooth::audio::V2_0::BitsPerSample;
	using ::android::hardware::bluetooth::audio::V2_0::ChannelMode;		using ::android::hardware::bluetooth::audio::V2_0::ChannelMode;
	@@ -116,7 +115,7 @@ bool BluetoothAudioPortOut::SetUp(audio_devices_t devices) {
	return;		return;
	}		}
	if (port->cookie_ != cookie) {		if (port->cookie_ != cookie) {
	LOG(ERROR) << "control_result_cb: proxy of device port (cookie=0x" << StringPrintf("%04hx", cookie)		LOG(ERROR) << "control_result_cb: proxy of device port (cookie=" << StringPrintf("%#hx", cookie)
	<< ") is corrupted";		<< ") is corrupted";
	return;		return;
	}		}
	@@ -128,7 +127,7 @@ bool BluetoothAudioPortOut::SetUp(audio_devices_t devices) {
	return;		return;
	}		}
	if (port->cookie_ != cookie) {		if (port->cookie_ != cookie) {
	LOG(ERROR) << "session_changed_cb: proxy of device port (cookie=0x" << StringPrintf("%04hx", cookie)		LOG(ERROR) << "session_changed_cb: proxy of device port (cookie=" << StringPrintf("%#hx", cookie)
	<< ") is corrupted";		<< ") is corrupted";
	return;		return;
	}		}
	@@ -139,8 +138,7 @@ bool BluetoothAudioPortOut::SetUp(audio_devices_t devices) {
	.session_changed_cb_ = session_changed_cb};		.session_changed_cb_ = session_changed_cb};
	cookie_ = BluetoothAudioSessionControl::RegisterControlResultCback(		cookie_ = BluetoothAudioSessionControl::RegisterControlResultCback(
	session_type_, cbacks);		session_type_, cbacks);
	LOG(INFO) << __func__ << ": session_type=" << toString(session_type_) << ", cookie=0x"		LOG(INFO) << __func__ << ": session_type=" << toString(session_type_) << ", cookie=" << StringPrintf("%#hx", cookie_);
	<< StringPrintf("%04hx", cookie_);

	return (cookie_ != android::bluetooth::audio::kObserversCookieUndefined);		return (cookie_ != android::bluetooth::audio::kObserversCookieUndefined);
	}		}
	@@ -150,23 +148,23 @@ bool BluetoothAudioPortOut::init_session_type(audio_devices_t device) {
	case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP:		case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP:
	case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES:		case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES:
	case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER:		case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER:
	LOG(VERBOSE) << __func__ << ": device=AUDIO_DEVICE_OUT_BLUETOOTH_A2DP (HEADPHONES/SPEAKER) (0x"		LOG(VERBOSE) << __func__ << ": device=AUDIO_DEVICE_OUT_BLUETOOTH_A2DP (HEADPHONES/SPEAKER) ("
	<< StringPrintf("%08x", device) << ")";		<< StringPrintf("%#x", device) << ")";