Merge "Refine the map between audio attribute and LE audio context type" (fe37b4bc) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/le_audio/client.cc

+9 −39

Original line number	Original line	Diff line number	Diff line
	@@ -2939,44 +2939,13 @@ class LeAudioClientImpl : public LeAudioClient {
	LeAudioContextType AudioContentToLeAudioContext(		LeAudioContextType AudioContentToLeAudioContext(
	LeAudioContextType current_context_type,		LeAudioContextType current_context_type,
	audio_content_type_t content_type, audio_usage_t usage) {		audio_content_type_t content_type, audio_usage_t usage) {
	/* Let's stay on the Conversational context type in case it is already		/* Check audio attribute usage of stream */
	* configured to conversational.
	*/
	if (current_context_type == LeAudioContextType::CONVERSATIONAL) {
	switch (content_type) {
	case AUDIO_CONTENT_TYPE_SONIFICATION:
	case AUDIO_CONTENT_TYPE_SPEECH:
	return LeAudioContextType::CONVERSATIONAL;
	default:
	break;
	}

	switch (usage) {		switch (usage) {
	case AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE:		case AUDIO_USAGE_MEDIA:
	case AUDIO_USAGE_NOTIFICATION:
	case AUDIO_USAGE_ALARM:
	case AUDIO_USAGE_EMERGENCY:
	case AUDIO_USAGE_VOICE_COMMUNICATION:
	return LeAudioContextType::CONVERSATIONAL;
	default:
	break;
	}
	}

	switch (content_type) {
	case AUDIO_CONTENT_TYPE_SPEECH:
	return LeAudioContextType::CONVERSATIONAL;
	case AUDIO_CONTENT_TYPE_MUSIC:
	case AUDIO_CONTENT_TYPE_MOVIE:
	case AUDIO_CONTENT_TYPE_SONIFICATION:
	return LeAudioContextType::MEDIA;		return LeAudioContextType::MEDIA;
	default:
	break;
	}

	/* Context is not clear, consider also usage of stream */
	switch (usage) {
	case AUDIO_USAGE_VOICE_COMMUNICATION:		case AUDIO_USAGE_VOICE_COMMUNICATION:
			case AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING:
			case AUDIO_USAGE_CALL_ASSISTANT:
	return LeAudioContextType::CONVERSATIONAL;		return LeAudioContextType::CONVERSATIONAL;
	case AUDIO_USAGE_GAME:		case AUDIO_USAGE_GAME:
	return LeAudioContextType::GAME;		return LeAudioContextType::GAME;
	@@ -2988,6 +2957,8 @@ class LeAudioClientImpl : public LeAudioClient {
	return LeAudioContextType::ALERTS;		return LeAudioContextType::ALERTS;
	case AUDIO_USAGE_EMERGENCY:		case AUDIO_USAGE_EMERGENCY:
	return LeAudioContextType::EMERGENCYALARM;		return LeAudioContextType::EMERGENCYALARM;
			case AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE:
			return LeAudioContextType::INSTRUCTIONAL;
	default:		default:
	break;		break;
	}		}
	@@ -3046,9 +3017,8 @@ class LeAudioClientImpl : public LeAudioClient {
	continue;		continue;
	}		}

	DLOG(INFO) << __func__ << ": usage=" << tracks->usage		LOG_INFO("%s: usage=%d, content_type=%d, gain=%f", __func__,
	<< ", content_type=" << tracks->content_type		tracks->usage, tracks->content_type, tracks->gain);
	<< ", gain=" << tracks->gain;

	auto new_context = AudioContentToLeAudioContext(		auto new_context = AudioContentToLeAudioContext(
	current_context_type_, tracks->content_type, tracks->usage);		current_context_type_, tracks->content_type, tracks->usage);