| Message ID | 20191209191554.821230-1-paul@crapouillou.net |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] SDL_mixer: Add option to prefer Tremor over libvorbis | expand |
>>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes: > Add a menu option to set the Vorbis decoding library to Tremor instead > of libvorbis. > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > package/sdl_mixer/Config.in | 13 +++++++++++++ > package/sdl_mixer/sdl_mixer.mk | 5 +++++ > 2 files changed, 18 insertions(+) > diff --git a/package/sdl_mixer/Config.in b/package/sdl_mixer/Config.in > index 42dfe63c0a..94fcda7a0e 100644 > --- a/package/sdl_mixer/Config.in > +++ b/package/sdl_mixer/Config.in > @@ -9,3 +9,16 @@ config BR2_PACKAGE_SDL_MIXER > SMPEG MP3 libraries. > http://www.libsdl.org/projects/SDL_mixer/ > + > +if BR2_PACKAGE_SDL_MIXER > + > +config BR2_PACKAGE_SDL_MIXER_USE_TREMOR > + bool "Prefer Tremor for Vorbis decoding" > + select BR2_PACKAGE_TREMOR > + help > + Prefer Tremor over libvorbis for Vorbis decoding. > + Tremor is a fixed-point implementation of an Ogg Vorbis > + decoder. Choose this option if the target CPU has no > + FPU. > + > +endif > diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk > index 9183a4aa8c..3159d0dee1 100644 > --- a/package/sdl_mixer/sdl_mixer.mk > +++ b/package/sdl_mixer/sdl_mixer.mk > @@ -35,11 +35,16 @@ else > SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl > endif > +ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_TREMOR),y) > +SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor > +SDL_MIXER_DEPENDENCIES += tremor > +else > ifeq ($(BR2_PACKAGE_LIBVORBIS),y) Do we need an explicit option for this? Can't we just check for BR2_PACKAGE_TREMOR here? I doubt there is any situations where tremor is enabled but the user doesn't want to use it.
Hi Peter, Le mar., déc. 10, 2019 at 10:29, Peter Korsgaard <peter@korsgaard.com> a écrit : >>>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes: > > > Add a menu option to set the Vorbis decoding library to Tremor > instead > > of libvorbis. > > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > > --- > > package/sdl_mixer/Config.in | 13 +++++++++++++ > > package/sdl_mixer/sdl_mixer.mk | 5 +++++ > > 2 files changed, 18 insertions(+) > > > diff --git a/package/sdl_mixer/Config.in > b/package/sdl_mixer/Config.in > > index 42dfe63c0a..94fcda7a0e 100644 > > --- a/package/sdl_mixer/Config.in > > +++ b/package/sdl_mixer/Config.in > > @@ -9,3 +9,16 @@ config BR2_PACKAGE_SDL_MIXER > > SMPEG MP3 libraries. > > > http://www.libsdl.org/projects/SDL_mixer/ > > + > > +if BR2_PACKAGE_SDL_MIXER > > + > > +config BR2_PACKAGE_SDL_MIXER_USE_TREMOR > > + bool "Prefer Tremor for Vorbis decoding" > > + select BR2_PACKAGE_TREMOR > > + help > > + Prefer Tremor over libvorbis for Vorbis decoding. > > + Tremor is a fixed-point implementation of an Ogg Vorbis > > + decoder. Choose this option if the target CPU has no > > + FPU. > > + > > +endif > > diff --git a/package/sdl_mixer/sdl_mixer.mk > b/package/sdl_mixer/sdl_mixer.mk > > index 9183a4aa8c..3159d0dee1 100644 > > --- a/package/sdl_mixer/sdl_mixer.mk > > +++ b/package/sdl_mixer/sdl_mixer.mk > > @@ -35,11 +35,16 @@ else > > SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl > > endif > > > +ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_TREMOR),y) > > +SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor > > +SDL_MIXER_DEPENDENCIES += tremor > > +else > > ifeq ($(BR2_PACKAGE_LIBVORBIS),y) > > Do we need an explicit option for this? Can't we just check for > BR2_PACKAGE_TREMOR here? I doubt there is any situations where tremor > is > enabled but the user doesn't want to use it. That's up to you really. I can send a v2 with the Config.in option removed. -Paul
>>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes: Hi, >> > +ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_TREMOR),y) >> > +SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor >> > +SDL_MIXER_DEPENDENCIES += tremor >> > +else >> > ifeq ($(BR2_PACKAGE_LIBVORBIS),y) >> >> Do we need an explicit option for this? Can't we just check for >> BR2_PACKAGE_TREMOR here? I doubt there is any situations where >> tremor is >> enabled but the user doesn't want to use it. > That's up to you really. I can send a v2 with the Config.in option > removed. Yes please - Thanks.
diff --git a/package/sdl_mixer/Config.in b/package/sdl_mixer/Config.in index 42dfe63c0a..94fcda7a0e 100644 --- a/package/sdl_mixer/Config.in +++ b/package/sdl_mixer/Config.in @@ -9,3 +9,16 @@ config BR2_PACKAGE_SDL_MIXER SMPEG MP3 libraries. http://www.libsdl.org/projects/SDL_mixer/ + +if BR2_PACKAGE_SDL_MIXER + +config BR2_PACKAGE_SDL_MIXER_USE_TREMOR + bool "Prefer Tremor for Vorbis decoding" + select BR2_PACKAGE_TREMOR + help + Prefer Tremor over libvorbis for Vorbis decoding. + Tremor is a fixed-point implementation of an Ogg Vorbis + decoder. Choose this option if the target CPU has no + FPU. + +endif diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk index 9183a4aa8c..3159d0dee1 100644 --- a/package/sdl_mixer/sdl_mixer.mk +++ b/package/sdl_mixer/sdl_mixer.mk @@ -35,11 +35,16 @@ else SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl endif +ifeq ($(BR2_PACKAGE_SDL_MIXER_USE_TREMOR),y) +SDL_MIXER_CONF_OPTS += --enable-music-ogg-tremor +SDL_MIXER_DEPENDENCIES += tremor +else ifeq ($(BR2_PACKAGE_LIBVORBIS),y) SDL_MIXER_CONF_OPTS += --enable-music-ogg SDL_MIXER_DEPENDENCIES += libvorbis else SDL_MIXER_CONF_OPTS += --disable-music-ogg endif +endif $(eval $(autotools-package))
Add a menu option to set the Vorbis decoding library to Tremor instead of libvorbis. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- package/sdl_mixer/Config.in | 13 +++++++++++++ package/sdl_mixer/sdl_mixer.mk | 5 +++++ 2 files changed, 18 insertions(+)