File pipewire-issue1492-add-aac_eld-support.patch of Package pipewire

Overview Repositories Revisions Requests Users Attributes Meta

File pipewire-issue1492-add-aac_eld-support.patch of Package pipewire (Revision 829a65fe7f6cbafcb4a53dc7e7a2684b)

Currently displaying revision 829a65fe7f6cbafcb4a53dc7e7a2684b , Show latest

diff --git a/spa/include/spa/param/bluetooth/audio.h b/spa/include/spa/param/bluetooth/audio.h
index 68c6b9f2295fc157d137bda5d33266137bc70693..bc6e98d87c4356fc2d5df940d9589f15c8e49d73 100644
--- a/spa/include/spa/param/bluetooth/audio.h
+++ b/spa/include/spa/param/bluetooth/audio.h
@@ -21,6 +21,7 @@ enum spa_bluetooth_audio_codec {
 	SPA_BLUETOOTH_AUDIO_CODEC_SBC_XQ,
 	SPA_BLUETOOTH_AUDIO_CODEC_MPEG,
 	SPA_BLUETOOTH_AUDIO_CODEC_AAC,
+	SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
 	SPA_BLUETOOTH_AUDIO_CODEC_APTX,
 	SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD,
 	SPA_BLUETOOTH_AUDIO_CODEC_LDAC,
diff --git a/spa/include/spa/param/bluetooth/type-info.h b/spa/include/spa/param/bluetooth/type-info.h
index 6b166fde6d78fde124cfdfa244717703ec3ebfb0..e8bf3718fb768e188352eceaa7dcefea2baf3190 100644
--- a/spa/include/spa/param/bluetooth/type-info.h
+++ b/spa/include/spa/param/bluetooth/type-info.h
@@ -25,6 +25,7 @@ static const struct spa_type_info spa_type_bluetooth_audio_codec[] = {
 	{ SPA_BLUETOOTH_AUDIO_CODEC_SBC_XQ, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "sbc_xq", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_MPEG, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "mpeg", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_AAC, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "aac", NULL },
+	{ SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "aac_eld", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_APTX, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "aptx", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "aptx_hd", NULL },
 	{ SPA_BLUETOOTH_AUDIO_CODEC_LDAC, SPA_TYPE_Int, SPA_TYPE_INFO_BLUETOOTH_AUDIO_CODEC_BASE "ldac", NULL },
diff --git a/spa/plugins/bluez5/a2dp-codec-aac.c b/spa/plugins/bluez5/a2dp-codec-aac.c
index e6ddcf1562c7fd8ea93d87f9569d5815ed02da1a..ce80f574798690253c873ee3fd1d3512562de3a3 100644
--- a/spa/plugins/bluez5/a2dp-codec-aac.c
+++ b/spa/plugins/bluez5/a2dp-codec-aac.c
@@ -42,6 +42,30 @@ struct impl {
 	int samplesize;
 };
 
+static bool eld_supported()
+{
+	static bool supported = false, checked = false;
+	HANDLE_AACENCODER aacenc = NULL;
+
+	if (checked)
+		return supported;
+
+	if (aacEncOpen(&aacenc, 0, 2) != AACENC_OK)
+		goto done;
+	if (aacEncoder_SetParam(aacenc, AACENC_AOT, AOT_ER_AAC_ELD) != AACENC_OK)
+		goto done;
+	if (aacEncoder_SetParam(aacenc,  AACENC_SBR_MODE, 1) != AACENC_OK)
+		goto done;
+		
+	supported = true;
+
+done:
+	if (aacenc)
+		aacEncClose(&aacenc);
+	checked = true;
+	return supported;
+}
+
 static int codec_fill_caps(const struct media_codec *codec, uint32_t flags,
 		uint8_t caps[A2DP_MAX_CAPS_SIZE])
 {
@@ -50,7 +74,8 @@ static int codec_fill_caps(const struct media_codec *codec, uint32_t flags,
 			/* NOTE: AAC Long Term Prediction and AAC Scalable are
 			 *       not supported by the FDK-AAC library. */
 			AAC_OBJECT_TYPE_MPEG2_AAC_LC |
-			AAC_OBJECT_TYPE_MPEG4_AAC_LC,
+			AAC_OBJECT_TYPE_MPEG4_AAC_LC |
+			(eld_supported() ? AAC_OBJECT_TYPE_MPEG4_AAC_ELD : 0),
 		AAC_INIT_FREQUENCY(
 			AAC_SAMPLING_FREQ_8000 |
 			AAC_SAMPLING_FREQ_11025 |
@@ -120,16 +145,26 @@ static int codec_select_config(const struct media_codec *codec, uint32_t flags,
 
 	conf = *(a2dp_aac_t*)caps;
 
-	if (conf.object_type & AAC_OBJECT_TYPE_MPEG2_AAC_LC)
-		conf.object_type = AAC_OBJECT_TYPE_MPEG2_AAC_LC;
-	else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LC)
-		conf.object_type = AAC_OBJECT_TYPE_MPEG4_AAC_LC;
-	else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LTP)
-		return -ENOTSUP;  /* Not supported by FDK-AAC */
-	else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_SCA)
-		return -ENOTSUP;  /* Not supported by FDK-AAC */
-	else
-		return -ENOTSUP;
+	if (codec->id == SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD) {
+		if (!eld_supported())
+			return -ENOTSUP;
+			
+		if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_ELD)
+			conf.object_type = AAC_OBJECT_TYPE_MPEG4_AAC_ELD;
+		else
+			return -ENOTSUP;
+	} else {
+		if (conf.object_type & AAC_OBJECT_TYPE_MPEG2_AAC_LC)
+			conf.object_type = AAC_OBJECT_TYPE_MPEG2_AAC_LC;
+		else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LC)
+			conf.object_type = AAC_OBJECT_TYPE_MPEG4_AAC_LC;
+		else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_LTP)
+			return -ENOTSUP;  /* Not supported by FDK-AAC */
+		else if (conf.object_type & AAC_OBJECT_TYPE_MPEG4_AAC_SCA)
+			return -ENOTSUP;  /* Not supported by FDK-AAC */
+		else
+			return -ENOTSUP;
+	}
 
 	if ((i = media_codec_select_config(aac_frequencies,
 					  SPA_N_ELEMENTS(aac_frequencies),
@@ -247,7 +282,8 @@ static int codec_validate_config(const struct media_codec *codec, uint32_t flags
 	 * a BlueZ bug, but we can be lax here and below in codec_init.
 	 */
 	if (!(conf.object_type & (AAC_OBJECT_TYPE_MPEG2_AAC_LC |
-					AAC_OBJECT_TYPE_MPEG4_AAC_LC)))
+					AAC_OBJECT_TYPE_MPEG4_AAC_LC |
+					AAC_OBJECT_TYPE_MPEG2_AAC_ELD)))
 		return -EINVAL;
 	j = 0;
 	SPA_FOR_EACH_ELEMENT_VAR(aac_frequencies, f) {
@@ -327,16 +363,24 @@ static void *codec_init(const struct media_codec *codec, uint32_t flags,
 	if (res != AACENC_OK)
 		goto error;
 
-	if (!(conf->object_type & (AAC_OBJECT_TYPE_MPEG2_AAC_LC |
-					AAC_OBJECT_TYPE_MPEG4_AAC_LC))) {
+	if (conf->object_type & AAC_OBJECT_TYPE_MPEG4_AAC_ELD) {
+		res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_ER_AAC_ELD);
+		if (res != AACENC_OK)
+			goto error;
+
+		res = aacEncoder_SetParam(this->aacenc,  AACENC_SBR_MODE, 1);
+		if (res != AACENC_OK)
+			goto error;
+	} else if (conf->object_type & (AAC_OBJECT_TYPE_MPEG2_AAC_LC |
+						AAC_OBJECT_TYPE_MPEG4_AAC_LC)) {
+		res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_AAC_LC);
+		if (res != AACENC_OK)
+			goto error;
+	} else {		
 		res = -EINVAL;
 		goto error;
 	}
 
-	res = aacEncoder_SetParam(this->aacenc, AACENC_AOT, AOT_AAC_LC);
-	if (res != AACENC_OK)
-		goto error;
-
 	res = aacEncoder_SetParam(this->aacenc, AACENC_SAMPLERATE, this->rate);
 	if (res != AACENC_OK)
 		goto error;
@@ -632,7 +676,33 @@ const struct media_codec a2dp_codec_aac = {
 	.set_log = codec_set_log,
 };
 
+const struct media_codec a2dp_codec_aac_eld = {
+	.id = SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
+	.codec_id = A2DP_CODEC_MPEG24,
+	.name = "aac_eld",
+	.description = "AAC-ELD",
+	.endpoint_name = "aac",
+	.fill_caps = NULL,
+	.select_config = codec_select_config,
+	.enum_config = codec_enum_config,
+	.validate_config = codec_validate_config,
+	.init_props = codec_init_props,
+	.clear_props = codec_clear_props,
+	.init = codec_init,
+	.deinit = codec_deinit,
+	.get_block_size = codec_get_block_size,
+	.start_encode = codec_start_encode,
+	.encode = codec_encode,
+	.start_decode = codec_start_decode,
+	.decode = codec_decode,
+	.abr_process = codec_abr_process,
+	.reduce_bitpool = codec_reduce_bitpool,
+	.increase_bitpool = codec_increase_bitpool,
+	.set_log = codec_set_log,
+};
+
 MEDIA_CODEC_EXPORT_DEF(
 	"aac",
-	&a2dp_codec_aac
+	&a2dp_codec_aac,
+	&a2dp_codec_aac_eld
 );
diff --git a/spa/plugins/bluez5/a2dp-codec-caps.h b/spa/plugins/bluez5/a2dp-codec-caps.h
index 9f7259296d3a5d0a2fa4e70586ae69209b86e39e..2a9b067342713235caf881df20dacb26041cc0d9 100644
--- a/spa/plugins/bluez5/a2dp-codec-caps.h
+++ b/spa/plugins/bluez5/a2dp-codec-caps.h
@@ -101,6 +101,7 @@
 #define AAC_OBJECT_TYPE_MPEG4_AAC_LC	0x40
 #define AAC_OBJECT_TYPE_MPEG4_AAC_LTP	0x20
 #define AAC_OBJECT_TYPE_MPEG4_AAC_SCA	0x10
+#define AAC_OBJECT_TYPE_MPEG4_AAC_ELD	0x02
 
 #define AAC_SAMPLING_FREQ_8000		0x0800
 #define AAC_SAMPLING_FREQ_11025		0x0400
diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 928a4d665be57d1c623aca7f929f2d06d77b134a..7f0cbb937b777aca146881b4b0f3d9c0054c693b 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -3167,6 +3167,7 @@ int64_t spa_bt_transport_get_delay_nsec(struct spa_bt_transport *t)
 		return 150 * SPA_NSEC_PER_MSEC;
 	case SPA_BLUETOOTH_AUDIO_CODEC_LDAC:
 		return 175 * SPA_NSEC_PER_MSEC;
+	case SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD:
 	case SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL:
 	case SPA_BLUETOOTH_AUDIO_CODEC_APTX_LL_DUPLEX:
 	case SPA_BLUETOOTH_AUDIO_CODEC_FASTSTREAM:
diff --git a/spa/plugins/bluez5/codec-loader.c b/spa/plugins/bluez5/codec-loader.c
index ac05d3c609f1ead7c0624f83169bfee283db1c2d..47970d2952c29edbb18291037c08505cfdd4b877 100644
--- a/spa/plugins/bluez5/codec-loader.c
+++ b/spa/plugins/bluez5/codec-loader.c
@@ -35,6 +35,7 @@ static int codec_order(const struct media_codec *c)
 		SPA_BLUETOOTH_AUDIO_CODEC_LDAC,
 		SPA_BLUETOOTH_AUDIO_CODEC_APTX_HD,
 		SPA_BLUETOOTH_AUDIO_CODEC_APTX,
+		SPA_BLUETOOTH_AUDIO_CODEC_AAC_ELD,
 		SPA_BLUETOOTH_AUDIO_CODEC_AAC,
 		SPA_BLUETOOTH_AUDIO_CODEC_LC3PLUS_HR,
 		SPA_BLUETOOTH_AUDIO_CODEC_MPEG,

Places

File pipewire-issue1492-add-aac_eld-support.patch of Package pipewire (Revision 829a65fe7f6cbafcb4a53dc7e7a2684b)

Places