some s/KHz/Hz/ fixes in osssrc consistency-with-the-rest-of-gst adjustments
Original commit message from CVS: * some s/KHz/Hz/ fixes in osssrc * added dxr3 plugin from rehan khwaja <rehankhwaja@yahoo.com>, with some consistency-with-the-rest-of-gst adjustments
This commit is contained in:
parent
983feed7a1
commit
afb7bcab51
@ -190,6 +190,12 @@ dnl ============================= sys plugins ================================
|
|||||||
dnl ==========================================================================
|
dnl ==========================================================================
|
||||||
|
|
||||||
|
|
||||||
|
dnl *** DXR3 card ***
|
||||||
|
translit(dnm, m, l) AM_CONDITIONAL(USE_DXR3, true)
|
||||||
|
GST_CHECK_FEATURE(DXR3, [DXR3 hardware mpeg video decoder], dxr3videosink, [
|
||||||
|
AC_CHECK_HEADER(linux/em8000.h, HAVE_DXR3="yes", HAVE_DXR3="no")
|
||||||
|
])
|
||||||
|
|
||||||
dnl *** OSS audio ***
|
dnl *** OSS audio ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
|
translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true)
|
||||||
GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
|
GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
|
||||||
@ -762,6 +768,7 @@ gst/vumeter/Makefile
|
|||||||
gst/wavparse/Makefile
|
gst/wavparse/Makefile
|
||||||
gst/y4m/Makefile
|
gst/y4m/Makefile
|
||||||
sys/Makefile
|
sys/Makefile
|
||||||
|
sys/dxr3/Makefile
|
||||||
sys/oss/Makefile
|
sys/oss/Makefile
|
||||||
sys/qcam/Makefile
|
sys/qcam/Makefile
|
||||||
sys/v4l/Makefile
|
sys/v4l/Makefile
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
if USE_DXR3
|
||||||
|
DXR3_DIR=dxr3
|
||||||
|
else
|
||||||
|
DXR3_DIR=
|
||||||
|
endif
|
||||||
|
|
||||||
if USE_OSS
|
if USE_OSS
|
||||||
OSS_DIR=oss
|
OSS_DIR=oss
|
||||||
else
|
else
|
||||||
@ -34,8 +40,8 @@ else
|
|||||||
XVIDEO_DIR=
|
XVIDEO_DIR=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS=$(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(VCD_DIR) \
|
SUBDIRS=$(OSS_DIR) $(DXR3_DIR) $(QCAM_DIR) $(V4L_DIR) $(VCD_DIR) \
|
||||||
$(VGA_DIR) $(XVIDEO_DIR)
|
$(VGA_DIR) $(XVIDEO_DIR)
|
||||||
|
|
||||||
DIST_SUBDIRS=oss qcam v4l vcd vga xvideo videosink
|
DIST_SUBDIRS=oss dxr3 qcam v4l vcd vga xvideo videosink
|
||||||
|
|
||||||
|
@ -384,7 +384,7 @@ gst_osssrc_sync_parms (GstOssSrc *osssrc)
|
|||||||
audio_buf_info ispace;
|
audio_buf_info ispace;
|
||||||
gint frag;
|
gint frag;
|
||||||
/* remember : ioctl on samplerate returns the sample rate the card
|
/* remember : ioctl on samplerate returns the sample rate the card
|
||||||
* is actually set to ! Setting it to 44101 KHz could cause it to
|
* is actually set to ! Setting it to 44101 Hz could cause it to
|
||||||
* be set to 44101, for example
|
* be set to 44101, for example
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -409,7 +409,7 @@ gst_osssrc_sync_parms (GstOssSrc *osssrc)
|
|||||||
ioctl(osssrc->fd, SNDCTL_DSP_GETISPACE, &ispace);
|
ioctl(osssrc->fd, SNDCTL_DSP_GETISPACE, &ispace);
|
||||||
ioctl(osssrc->fd, SNDCTL_DSP_GETBLKSIZE, &frag);
|
ioctl(osssrc->fd, SNDCTL_DSP_GETBLKSIZE, &frag);
|
||||||
|
|
||||||
g_print("setting sound card to %dKHz %d bit %s (%d bytes buffer, %d fragment)\n",
|
g_print("setting sound card to %dHz %d bit %s (%d bytes buffer, %d fragment)\n",
|
||||||
osssrc->frequency, osssrc->format,
|
osssrc->frequency, osssrc->format,
|
||||||
(osssrc->channels == 2) ? "stereo" : "mono", ispace.bytes, frag);
|
(osssrc->channels == 2) ? "stereo" : "mono", ispace.bytes, frag);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user