Commit 70c09c2e authored by Antoine Cellerier's avatar Antoine Cellerier

Split OSS access from v4l2.

parent b5615ec0
......@@ -2343,23 +2343,6 @@ then
VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include])
fi
if test "${enable_alsa}" != "no"
then
AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false")
fi
if test "${have_v4l2_alsa}" = "true"
then
CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>],
[snd_pcm_hw_params_get_period_time(0,0,0);],
AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
VLC_ADD_LDFLAGS([v4l2],[-lasound -lm -ldl])
AC_DEFINE(HAVE_ALSA, 1, Define if ALSA is present.)
fi
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
AC_CHECK_HEADERS(linux/videodev2.h, [
VLC_ADD_PLUGIN([v4l2])
......@@ -4590,6 +4573,7 @@ if test "${enable_oss}" != "no" &&
then
AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
VLC_ADD_PLUGIN([oss])
VLC_ADD_PLUGIN([access_oss])
AC_CHECK_LIB(ossaudio,main,VLC_ADD_LIBS([oss],[-lossaudio]))
])
fi
......
......@@ -38,6 +38,7 @@ SOURCES_cdda = \
$(NULL)
SOURCES_access_jack = jack.c
SOURCES_access_alsa = alsa.c
SOURCES_access_oss = oss.c
libvlc_LTLIBRARIES += \
libaccess_file_plugin.la \
......
/*****************************************************************************
* oss.c : OSS input module for vlc
*****************************************************************************
* Copyright (C) 2002-2009 the VideoLAN team
* $Id$
*
* Authors: Benjamin Pracht <bigben at videolan dot org>
* Richard Hosking <richard at hovis dot net>
* Antoine Cellerier <dionoea at videolan d.t org>
* Dennis Lou <dlou99 at yahoo dot com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_demux.h>
#include <vlc_input.h>
#include <vlc_vout.h>
#include <ctype.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/soundcard.h>
#include <poll.h>
/*****************************************************************************
* Module descriptior
*****************************************************************************/
static int DemuxOpen ( vlc_object_t * );
static void DemuxClose( vlc_object_t * );
#define STEREO_TEXT N_( "Stereo" )
#define STEREO_LONGTEXT N_( \
"Capture the audio stream in stereo." )
#define SAMPLERATE_TEXT N_( "Samplerate" )
#define SAMPLERATE_LONGTEXT N_( \
"Samplerate of the captured audio stream, in Hz (eg: 11025, 22050, 44100, 48000)" )
#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
"Caching value for OSS captures. This " \
"value should be set in milliseconds." )
#define OSS_DEFAULT "/dev/dsp"
#define CFG_PREFIX "oss-"
vlc_module_begin ()
set_shortname( N_("OSS") )
set_description( N_("OSS input") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
add_shortcut( "oss" )
set_capability( "access_demux", 10 )
set_callbacks( DemuxOpen, DemuxClose )
add_bool( CFG_PREFIX "stereo", true, NULL, STEREO_TEXT, STEREO_LONGTEXT,
true );
add_integer( CFG_PREFIX "samplerate", 48000, NULL, SAMPLERATE_TEXT,
SAMPLERATE_LONGTEXT, true );
add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, true );
vlc_module_end ()
/*****************************************************************************
* Access: local prototypes
*****************************************************************************/
static int DemuxControl( demux_t *, int, va_list );
static int Demux( demux_t * );
static block_t* GrabAudio( demux_t *p_demux );
static int OpenAudioDev( demux_t * );
static int OpenAudioDevOss( demux_t * );
static bool ProbeAudioDevOss( demux_t *, const char *psz_device );
struct buffer_t
{
void * start;
size_t length;
};
struct demux_sys_t
{
const char *psz_device; /* OSS device from MRL */
int i_fd_audio;
/* Audio */
int i_pts;
unsigned int i_sample_rate;
bool b_stereo;
size_t i_audio_max_frame_size;
block_t *p_block_audio;
es_out_id_t *p_es_audio;
};
static int FindMainDevice( demux_t *p_demux )
{
msg_Dbg( p_demux, "opening device '%s'", p_demux->p_sys->psz_device );
if( ProbeAudioDevOss( p_demux, p_demux->p_sys->psz_device ) )
{
msg_Dbg( p_demux, "'%s' is an audio device", p_demux->p_sys->psz_device );
p_demux->p_sys->i_fd_audio = OpenAudioDev( p_demux );
}
if( p_demux->p_sys->i_fd_audio < 0 )
return VLC_EGENERIC;
return VLC_SUCCESS;
}
/*****************************************************************************
* DemuxOpen: opens oss device, access_demux callback
*****************************************************************************
*
* url: <oss device>::::
*
*****************************************************************************/
static int DemuxOpen( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
/* Only when selected */
if( *p_demux->psz_access == '\0' ) return VLC_EGENERIC;
/* Set up p_demux */
p_demux->pf_control = DemuxControl;
p_demux->pf_demux = Demux;
p_demux->info.i_update = 0;
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
if( p_sys == NULL ) return VLC_ENOMEM;
p_sys->i_sample_rate = var_CreateGetInteger( p_demux, CFG_PREFIX "samplerate" );
p_sys->b_stereo = var_CreateGetBool( p_demux, CFG_PREFIX "stereo" );
p_sys->i_pts = var_CreateGetInteger( p_demux, CFG_PREFIX "caching" );
p_sys->psz_device = NULL;
p_sys->i_fd_audio = -1;
p_sys->p_es_audio = 0;
p_sys->p_block_audio = 0;
if( p_demux->psz_path && *p_demux->psz_path )
p_sys->psz_device = p_demux->psz_path;
else
p_sys->psz_device = OSS_DEFAULT;
msg_Err( p_this, "Device is %s", p_sys->psz_device );
if( FindMainDevice( p_demux ) != VLC_SUCCESS )
{
DemuxClose( p_this );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
/*****************************************************************************
* Close: close device, free resources
*****************************************************************************/
static void DemuxClose( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
if( p_sys->i_fd_audio >= 0 ) close( p_sys->i_fd_audio );
if( p_sys->p_block_audio ) block_Release( p_sys->p_block_audio );
free( p_sys );
}
/*****************************************************************************
* DemuxControl:
*****************************************************************************/
static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
bool *pb;
int64_t *pi64;
switch( i_query )
{
/* Special for access_demux */
case DEMUX_CAN_PAUSE:
case DEMUX_CAN_SEEK:
case DEMUX_SET_PAUSE_STATE:
case DEMUX_CAN_CONTROL_PACE:
pb = (bool*)va_arg( args, bool * );
*pb = false;
return VLC_SUCCESS;
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = (int64_t)p_sys->i_pts * 1000;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = mdate();
return VLC_SUCCESS;
/* TODO implement others */
default:
return VLC_EGENERIC;
}
return VLC_EGENERIC;
}
/*****************************************************************************
* Demux: Processes the audio frame
*****************************************************************************/
static int Demux( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
struct pollfd fd;
fd.fd = p_sys->i_fd_audio;
fd.events = POLLIN|POLLPRI;
fd.revents = 0;
/* Wait for data */
if( poll( &fd, 1, 500 ) ) /* Timeout after 0.5 seconds since I don't know if pf_demux can be blocking. */
{
if( fd.revents & (POLLIN|POLLPRI) )
{
block_t *p_block = GrabAudio( p_demux );
if( p_block )
{
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts );
es_out_Send( p_demux->out, p_sys->p_es_audio, p_block );
}
}
}
return 1;
}
/*****************************************************************************
* GrabAudio: Grab an audio frame
*****************************************************************************/
static block_t* GrabAudio( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
struct audio_buf_info buf_info;
int i_read = 0, i_correct;
block_t *p_block;
if( p_sys->p_block_audio ) p_block = p_sys->p_block_audio;
else p_block = block_New( p_demux, p_sys->i_audio_max_frame_size );
if( !p_block )
{
msg_Warn( p_demux, "cannot get block" );
return 0;
}
p_sys->p_block_audio = p_block;
i_read = read( p_sys->i_fd_audio, p_block->p_buffer,
p_sys->i_audio_max_frame_size );
if( i_read <= 0 ) return 0;
p_block->i_buffer = i_read;
p_sys->p_block_audio = 0;
/* Correct the date because of kernel buffering */
i_correct = i_read;
if( ioctl( p_sys->i_fd_audio, SNDCTL_DSP_GETISPACE, &buf_info ) == 0 )
{
i_correct += buf_info.bytes;
}
/* Timestamp */
p_block->i_pts = p_block->i_dts =
mdate() - INT64_C(1000000) * (mtime_t)i_correct /
2 / ( p_sys->b_stereo ? 2 : 1) / p_sys->i_sample_rate;
return p_block;
}
/*****************************************************************************
* OpenAudioDev: open and set up the audio device and probe for capabilities
*****************************************************************************/
static int OpenAudioDevOss( demux_t *p_demux )
{
int i_fd;
int i_format;
i_fd = open( p_demux->p_sys->psz_device, O_RDONLY | O_NONBLOCK );
if( i_fd < 0 )
{
msg_Err( p_demux, "cannot open OSS audio device (%m)" );
goto adev_fail;
}
i_format = AFMT_S16_LE;
if( ioctl( i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0
|| i_format != AFMT_S16_LE )
{
msg_Err( p_demux,
"cannot set audio format (16b little endian) (%m)" );
goto adev_fail;
}
if( ioctl( i_fd, SNDCTL_DSP_STEREO,
&p_demux->p_sys->b_stereo ) < 0 )
{
msg_Err( p_demux, "cannot set audio channels count (%m)" );
goto adev_fail;
}
if( ioctl( i_fd, SNDCTL_DSP_SPEED,
&p_demux->p_sys->i_sample_rate ) < 0 )
{
msg_Err( p_demux, "cannot set audio sample rate (%m)" );
goto adev_fail;
}
p_demux->p_sys->i_audio_max_frame_size = 6 * 1024;
return i_fd;
adev_fail:
if( i_fd >= 0 ) close( i_fd );
return -1;
}
static int OpenAudioDev( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
int i_fd = OpenAudioDevOss( p_demux );
if( i_fd < 0 )
return i_fd;
msg_Dbg( p_demux, "opened adev=`%s' %s %dHz",
p_sys->psz_device, p_sys->b_stereo ? "stereo" : "mono",
p_sys->i_sample_rate );
es_format_t fmt;
es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC('a','r','a','w') );
fmt.audio.i_channels = p_sys->b_stereo ? 2 : 1;
fmt.audio.i_rate = p_sys->i_sample_rate;
fmt.audio.i_bitspersample = 16;
fmt.audio.i_blockalign = fmt.audio.i_channels * fmt.audio.i_bitspersample / 8;
fmt.i_bitrate = fmt.audio.i_channels * fmt.audio.i_rate * fmt.audio.i_bitspersample;
msg_Dbg( p_demux, "new audio es %d channels %dHz",
fmt.audio.i_channels, fmt.audio.i_rate );
p_sys->p_es_audio = es_out_Add( p_demux->out, &fmt );
return i_fd;
}
/*****************************************************************************
* ProbeAudioDev: probe audio for capabilities
*****************************************************************************/
static bool ProbeAudioDevOss( demux_t *p_demux, const char *psz_device )
{
int i_caps;
int i_fd = open( psz_device, O_RDONLY | O_NONBLOCK );
if( i_fd < 0 )
{
msg_Err( p_demux, "cannot open device %s for OSS audio (%m)", psz_device );
goto open_failed;
}
/* this will fail if the device is video */
if( ioctl( i_fd, SNDCTL_DSP_GETCAPS, &i_caps ) < 0 )
{
msg_Err( p_demux, "cannot get audio caps (%m)" );
goto open_failed;
}
if( i_fd >= 0 ) close( i_fd );
return true;
open_failed:
if( i_fd >= 0 ) close( i_fd );
return false;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment