Merge "audiohal: Rename output flag VOIP_CALL_RX -> VOIP_RX" (bb2e149e) · Commits · e / os / android_frameworks_av

media/libmedia/TypeConverter.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ const OutputDeviceConverter::Table OutputDeviceConverter::mTable[] = {
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_IP),
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BUS),
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_PROXY),
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_USB_HEADSET),
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_DEFAULT),
		// STUB must be after DEFAULT, so the latter is picked up by toString first.
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_STUB),
		@@ -89,6 +90,7 @@ const InputDeviceConverter::Table InputDeviceConverter::mTable[] = {
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_IP),
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BUS),
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_PROXY),
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_USB_HEADSET),
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_DEFAULT),
		// STUB must be after DEFAULT, so the latter is picked up by toString first.
		MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_STUB),
		@@ -112,6 +114,7 @@ const OutputFlagConverter::Table OutputFlagConverter::mTable[] = {
		MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_IEC958_NONAUDIO),
		MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_DIRECT_PCM),
		MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_MMAP_NOIRQ),
		MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_VOIP_RX),
		TERMINATOR
		};

		@@ -124,6 +127,7 @@ const InputFlagConverter::Table InputFlagConverter::mTable[] = {
		MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_RAW),
		MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_SYNC),
		MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_MMAP_NOIRQ),
		MAKE_STRING_FROM_ENUM(AUDIO_INPUT_FLAG_VOIP_TX),
		TERMINATOR
		};