[v3] libmad: Add optimization config options

Submitted by Benoît Thébaudeau on July 13, 2012, 8:14 p.m.

Details

Message ID 1591143229.1340033.1342210445309.JavaMail.root@advansee.com
State Accepted
Headers show

Commit Message

Benoît Thébaudeau July 13, 2012, 8:14 p.m.
Configuring libmad with --enable-speed compromises accuracy and can cause audio
clipping in some cases (heard on ARM platform with some loud MP3s), so give
users the choice of MAD optimizations.

The default config corresponds to the default behavior of libmad's configure.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
---
Note that, if applicable, the options are always passed with either '--enable-'
or '--disable-' to be more robust than a simple omission, since this can avoid a
mismatch in config options if the package version is changed and its new default
configure options are different.

Changes for v2:
   - Factorize the 'able' in the $(if ).

Changes for v3 (according to Thomas Petazzoni's comments):
   - Undo v2.
   - Rename the speed vs. accuracy choice configs to
     BR2_PACKAGE_LIBMAD_OPTIMIZATION_*.
   - Use 'default' naming if neither speed nor accuracy is compromised for the
     other.

 .../package/libmad/Config.in                       |   41 ++++++++++++++++++++
 .../package/libmad/libmad.mk                       |    6 ++-
 2 files changed, 46 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni July 13, 2012, 8:48 p.m.
Le Fri, 13 Jul 2012 22:14:05 +0200 (CEST),
Benoît Thébaudeau <benoit.thebaudeau@advansee.com> a écrit :

> Configuring libmad with --enable-speed compromises accuracy and can cause audio
> clipping in some cases (heard on ARM platform with some loud MP3s), so give
> users the choice of MAD optimizations.
> 
> The default config corresponds to the default behavior of libmad's configure.
> 
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>

Applied, thanks.

Thomas

Patch hide | download patch | download mbox

diff --git buildroot.orig/package/libmad/Config.in buildroot/package/libmad/Config.in
index 4d4f930..d0edc49 100644
--- buildroot.orig/package/libmad/Config.in
+++ buildroot/package/libmad/Config.in
@@ -6,3 +6,44 @@  config BR2_PACKAGE_LIBMAD
 	  without a floating-point unit.
 
 	  http://www.underbit.com/products/mad/
+
+if BR2_PACKAGE_LIBMAD
+
+choice
+	prompt "Speed vs. accuracy"
+	default BR2_PACKAGE_LIBMAD_OPTIMIZATION_DEFAULT
+
+config BR2_PACKAGE_LIBMAD_OPTIMIZATION_DEFAULT
+	bool "Default"
+	help
+	  Keep optimizations balanced between speed and accuracy.
+
+config BR2_PACKAGE_LIBMAD_OPTIMIZATION_SPEED
+	bool "Optimize for speed over accuracy"
+	help
+	  Compromise accuracy for speed.
+
+config BR2_PACKAGE_LIBMAD_OPTIMIZATION_ACCURACY
+	bool "Optimize for accuracy over speed"
+	help
+	  Compromise speed for accuracy.
+
+endchoice
+
+config BR2_PACKAGE_LIBMAD_SSO
+	bool "Subband synthesis optimization"
+	help
+	  Use the subband synthesis optimization, with reduced accuracy.
+
+config BR2_PACKAGE_LIBMAD_ASO
+	bool "Architecture-specific optimizations"
+	default y
+	help
+	  Use certain architecture-specific optimizations.
+
+config BR2_PACKAGE_LIBMAD_STRICT_ISO
+	bool "Strict ISO/IEC interpretations"
+	help
+	  Use strict ISO/IEC interpretations.
+
+endif
diff --git buildroot.orig/package/libmad/libmad.mk buildroot/package/libmad/libmad.mk
index 6e53cf2..3c92d52 100644
--- buildroot.orig/package/libmad/libmad.mk
+++ buildroot/package/libmad/libmad.mk
@@ -30,6 +30,10 @@  LIBMAD_POST_INSTALL_TARGET_HOOKS += LIBMAD_INSTALL_TARGET_PC
 
 LIBMAD_CONF_OPT = \
 		--disable-debugging \
-		--enable-speed
+		$(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_SPEED),--enable-speed) \
+		$(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_ACCURACY),--enable-accuracy) \
+		--$(if $(BR2_PACKAGE_LIBMAD_SSO),enable,disable)-sso \
+		--$(if $(BR2_PACKAGE_LIBMAD_ASO),enable,disable)-aso \
+		--$(if $(BR2_PACKAGE_LIBMAD_STRICT_ISO),enable,disable)-strict-iso
 
 $(eval $(call AUTOTARGETS))