From f6a749eff09a18a9bc0ed7a3da59f9ea0a7e9132 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 25 Jun 2004 18:11:15 +0000 Subject: JACK audio support through bio2jack by Kamil Strzelecki git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12663 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 3 + DOCS/xml/en/audio.xml | 3 + DOCS/xml/en/install.xml | 10 +++ DOCS/xml/pl/audio.xml | 3 + DOCS/xml/pl/install.xml | 10 +++ Makefile | 2 +- configure | 47 ++++++++++++ libao2/Makefile | 2 +- libao2/ao_jack.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++ libao2/audio_out.c | 6 ++ 10 files changed, 275 insertions(+), 2 deletions(-) create mode 100644 libao2/ao_jack.c diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index f8e6c92eb9..ff7a5857b4 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -1612,6 +1612,9 @@ Audio output through the Arts daemon. .B esd\ \ \ \ Audio output through the ESD daemon. .TP +.B jack\ \ \ \ +Audio output through JACK (Jack Audio Connection Kit). +.TP .B nas\ \ \ \ Audio output through NAS. .TP diff --git a/DOCS/xml/en/audio.xml b/DOCS/xml/en/audio.xml index 98969195b8..efabe75706 100644 --- a/DOCS/xml/en/audio.xml +++ b/DOCS/xml/en/audio.xml @@ -47,6 +47,9 @@ esd native ESD driver (mostly for GNOME users) +jack + JACK (Jack Audio Connection Kit) driver + diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index 9b89006ec8..2625c17057 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -117,6 +117,16 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended. libsmb - optional, for Samba support. + + bio2jack - optional, for JACK audio output + support, needed only in compile time. You can obtain it from + http://bio2jack.sf.net. Since it + doesn't have install option you have to manually put the file + libbio2jack.a somewhere in your library path + (e.g. /usr/local/lib) or use the + switch to tell + ./configure where that file is. + diff --git a/DOCS/xml/pl/audio.xml b/DOCS/xml/pl/audio.xml index cb33849dd2..9ae3733390 100644 --- a/DOCS/xml/pl/audio.xml +++ b/DOCS/xml/pl/audio.xml @@ -49,6 +49,9 @@ Interfejs audio MPlayera nazywa si esd rdzenny sterownik ESD (głównie dla użytkowników GNOMEa) +jack + sterownik JACK (Jack Audio Connection Kit) + diff --git a/DOCS/xml/pl/install.xml b/DOCS/xml/pl/install.xml index d4adbff48b..2110f0f9ba 100644 --- a/DOCS/xml/pl/install.xml +++ b/DOCS/xml/pl/install.xml @@ -119,6 +119,16 @@ Potrzebujesz do libsmb - opcjonalna, do obsługi Samby. + + bio2jack - opcjonalna, do obsługi wyjścia + dźwięku poprzez JACK, potrzebna jedynie w czasie kompilacji. Do pobrania z + http://bio2jack.sf.net. Ponieważ + nie posiada ona opcji instalacji musisz samodzielnie umieścić plik + libbio2jack.a w swoim katalogu z bibliotekami + (np. /usr/local/lib/) lub użyć opcji + aby przekazać jego lokalizację do + skryptu ./configure. + diff --git a/Makefile b/Makefile index ced266cedb..20104bf3d2 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(CACA_LIB) -AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) +AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB) COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB) diff --git a/configure b/configure index 846ca3f1aa..3e817a2b90 100755 --- a/configure +++ b/configure @@ -255,6 +255,7 @@ Audio output: --disable-ossaudio disable OSS sound support [autodetect] --disable-arts disable aRts sound support [autodetect] --disable-esd disable esd sound support [autodetect] + --disable-jack disable JACK sound support [autodetect] --disable-nas disable NAS sound support [autodetect] --disable-sgiaudio disable SGI sound support [autodetect] --disable-sunaudio disable Sun sound support [autodetect] @@ -321,6 +322,7 @@ Use these options if autodetection fails: --with-livelibdir=DIR path to LIVE.COM Streaming Media libraries --with-xmmsplugindir=DIR path to XMMS plugins --with-xmmslibdir=DIR path to libxmms.so.1 + --with-bio2jack=DIR path to libbio2jack.a (e.g. /home/user/bio2jack) --with-cdparanoiaincdir=DIR cdparanoia headers in DIR --with-cdparanoialibdir=DIR cdparanoia libraries (libcdda_*) in DIR --with-termcaplib=NAME name of library with termcap functionality @@ -1171,6 +1173,7 @@ _rtc=auto _ossaudio=auto _arts=auto _esd=auto +_jack=auto _liblzo=auto _mad=auto _vorbis=auto @@ -1337,6 +1340,8 @@ for ac_option do --disable-arts) _arts=no ;; --enable-esd) _esd=yes ;; --disable-esd) _esd=no ;; + --enable-jack) _jack=yes ;; + --disable-jack) _jack=no ;; --enable-mad) _mad=yes ;; --disable-mad) _mad=no ;; --enable-liblzo) _liblzo=yes ;; @@ -1546,6 +1551,10 @@ for ac_option do --with-xmmsplugindir=*) _xmmsplugindir=`echo $ac_option | cut -d '=' -f 2` ;; + + --with-bio2jack=*) + _bio2jackdir=`echo $ac_option | cut -d '=' -f 2` + ;; --enable-profile) _profile='-p' @@ -4101,6 +4110,41 @@ else _noaomodules="esd $_noaomodules" fi + +echocheck "JACK" +if test "$_jack" = auto ; then + _jack=no + if ( ( pkg-config --modversion jack ) > /dev/null 2>&1 ) && + ( jackd --version | grep version | awk '{ print $3 }' ) >> "$TMPLOG" 2>&1 ; then + +cat > $TMPC << EOF +#include +int main(void) { JACK_Init(); return 0; } +EOF + if test -z "$_bio2jackdir" ; then + cc_check -lbio2jack `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes + else + cc_check -L "$_bio2jackdir" -lbio2jack `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes + fi + fi +fi + +if test "$_jack" = yes ; then + _def_jack='#define USE_JACK 1' + _aosrc="$_aosrc ao_jack.c" + _aomodules="jack $_aomodules" + if test -z "$_bio2jackdir" ; then + _ld_jack="-lbio2jack `pkg-config --libs jack`" + else + _ld_jack="-L \"$_bio2jackdir\" -lbio2jack `pkg-config --libs jack`" + fi + _inc_jack=`pkg-config --cflags jack` +else + _noaomodules="jack $_noaomodules" +fi +echores "$_jack" + + echocheck "ALSA audio" if test "$_alsa" != no ; then _alsa=no @@ -6094,6 +6138,8 @@ ARTS_LIB = $_ld_arts ARTS_INC = $_inc_arts ESD_LIB = $_ld_esd ESD_INC = $_inc_esd +JACK_LIB = $_ld_jack +JACK_INC = $_inc_jack SGIAUDIO_LIB = $_ld_sgiaudio # input/demuxer/codecs @@ -6495,6 +6541,7 @@ $_def_alsa1x $_def_arts $_def_esd $_def_esd_latency +$_def_jack $_def_sys_asoundlib_h $_def_alsa_asoundlib_h $_def_sunaudio diff --git a/libao2/Makefile b/libao2/Makefile index 1fdd7f4c77..1a71775a75 100644 --- a/libao2/Makefile +++ b/libao2/Makefile @@ -6,7 +6,7 @@ SRCS=afmt.c audio_out.c ao_mpegpes.c ao_null.c ao_pcm.c ao_plugin.c pl_delay.c p OBJS=$(SRCS:.c=.o) -CFLAGS = $(OPTFLAGS) -I. -I.. $(ARTS_INC) $(ESD_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DVB_INC) +CFLAGS = $(OPTFLAGS) -I. -I.. $(ARTS_INC) $(ESD_INC) $(JACK_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DVB_INC) .SUFFIXES: .c .o diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c new file mode 100644 index 0000000000..9b5155261e --- /dev/null +++ b/libao2/ao_jack.c @@ -0,0 +1,191 @@ +/* + * ao_jack - JACK audio output driver for MPlayer + * + * Kamil Strzelecki < esack at browarek.net > + * + * This driver is distribuited under terms of GPL + * + * It uses bio2jack (http://bio2jack.sf.net/). + * + */ + +#include + +#include "audio_out.h" +#include "audio_out_internal.h" +#include "afmt.h" +#include "../config.h" +#include "../mp_msg.h" + +//#include "bio2jack.h" + +static int driver = 0; + +//bio2jack stuff: +#define ERR_SUCCESS 0 +#define ERR_OPENING_JACK 1 +#define ERR_RATE_MISMATCH 2 +#define ERR_BYTES_PER_FRAME_INVALID 3 +enum status_enum { PLAYING, PAUSED, STOPPED, CLOSED, RESET }; +void JACK_Init(void); +int JACK_Open(int* deviceID, unsigned int bits_per_sample, unsigned long *rate, int channels); +int JACK_Close(int deviceID); /* return 0 for success */ +void JACK_Reset(int deviceID); /* free all buffered data and reset several values in the device */ +long JACK_Write(int deviceID, char *data, unsigned long bytes); /* returns the number of bytes written */ +long JACK_GetJackLatency(int deviceID); /* return the latency in milliseconds of jack */ +int JACK_SetState(int deviceID, enum status_enum state); /* playing, paused, stopped */ +int JACK_SetVolume(int deviceID, int left, int right); /* returns 0 on success */ +void JACK_GetVolume(int deviceID, int *left, int *right); +// + + +static ao_info_t info = +{ + "JACK audio output", + "jack", + "Kamil Strzelecki ", + "" +}; + + +LIBAO_EXTERN(jack) + + +static int control(int cmd, void *arg) +{ + switch(cmd) { + case AOCONTROL_GET_VOLUME: + { + ao_control_vol_t *vol = (ao_control_vol_t *)arg; + int *l, *r; + + JACK_GetVolume(driver, l, r); + vol->left = (float )*l; + vol->right = (float )*r; + + return CONTROL_OK; + } + case AOCONTROL_SET_VOLUME: + { + ao_control_vol_t *vol = (ao_control_vol_t *)arg; + int l = (int )vol->left, + r = (int )vol->right, + err = 0; + + if((err = JACK_SetVolume(driver, l, r))) { + mp_msg(MSGT_AO, MSGL_ERR, + "AO: [Jack] Setting volume failed, error %d\n",err); + return CONTROL_ERROR; + } + + return CONTROL_OK; + } + } + + return(CONTROL_UNKNOWN); +} + + +static int init(int rate_hz, int channels, int format, int flags) +{ + int err, m, frag_spec; + unsigned long rate; + unsigned int bits_per_sample; + + mp_msg(MSGT_AO, MSGL_INFO, "AO: [Jack] Initialising library.\n"); + JACK_Init(); + + switch (format) { + case AFMT_U8: + case AFMT_S8: + format = AFMT_U8; + bits_per_sample = 8; + m = 1; + break; + default: + format = AFMT_S16_LE; + bits_per_sample = 16; + m = 2; + break; + } + + rate = rate_hz; + + err = JACK_Open(&driver, bits_per_sample, &rate, channels); + + /* if sample rates doesn't match try to open device with jack's rate and + * let mplayer convert it (rate now contains that which jackd use) */ + if(err == ERR_RATE_MISMATCH) { + mp_msg(MSGT_AO, MSGL_INFO, + "AO: [Jack] Sample rate mismatch, trying to resample.\n"); + + err = JACK_Open(&driver, bits_per_sample, &rate, channels); + } + + /* any other error */ + if(err != ERR_SUCCESS) { + mp_msg(MSGT_AO, MSGL_ERR, + "AO: [Jack] JACK_Open() failed, error %d\n", err); + return 0; + } + + ao_data.format = format; + ao_data.channels = channels; + ao_data.samplerate = rate; + ao_data.bps = ( rate * channels * m ); + + mp_msg(MSGT_AO, MSGL_INFO, + "AO: [Jack] OK. I'm ready to go (%d Hz/%d channels/%d bit)\n", + ao_data.samplerate, ao_data.channels, bits_per_sample); + + return 1; +} + + +static void uninit(int immed) +{ + int errval = 0; + + JACK_Reset(driver); + + if((errval = JACK_Close(driver))) + mp_msg(MSGT_AO, MSGL_ERR, + "AO: [Jack] error closing device, error %d\n", errval); +} + + +static int play(void* data,int len,int flags) +{ + return JACK_Write(driver, data, len); +} + + +static void audio_pause() +{ + JACK_SetState(driver, PAUSED); +} + + +static void audio_resume() +{ + JACK_SetState(driver, PLAYING); +} + + +static void reset() +{ + JACK_Reset(driver); +} + + +static int get_space() +{ + return JACK_GetBytesFreeSpace(driver); +} + + +static float get_delay() +{ + return (float )JACK_GetJackLatency(driver); +} + diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 15624c0b65..e193b8efed 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -22,6 +22,9 @@ extern ao_functions_t audio_out_arts; #ifdef USE_ESD extern ao_functions_t audio_out_esd; #endif +#ifdef USE_JACK +extern ao_functions_t audio_out_jack; +#endif extern ao_functions_t audio_out_null; #ifdef HAVE_ALSA5 extern ao_functions_t audio_out_alsa5; @@ -94,6 +97,9 @@ ao_functions_t* audio_out_drivers[] = #ifdef USE_ESD &audio_out_esd, #endif +#ifdef USE_JACK + &audio_out_jack, +#endif #ifdef HAVE_NAS &audio_out_nas, #endif -- cgit v1.2.3