mirror of https://code.videolan.org/videolan/vlc
* configure.ac.in: removed the encoders from the list of plugins as they are not used currently.
* src/libvlc.h, modules/audio_filter/resampler/bandlimited.c: added an hq-resampling option to enable/disable the high quality resampling.
This commit is contained in:
parent
bd7ed3cead
commit
4525fffaf0
|
@ -1533,7 +1533,7 @@ then
|
|||
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
|
||||
AC_CHECK_HEADERS(ffmpeg/avcodec.h postproc/postprocess.h)
|
||||
AC_CHECK_LIB(avcodec, avcodec_init, [
|
||||
BUILTINS="${BUILTINS} ffmpeg stream_out_transcode encoder_ffmpeg"
|
||||
BUILTINS="${BUILTINS} ffmpeg stream_out_transcode"
|
||||
LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -lavcodec"
|
||||
dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
|
||||
dnl linker would miserably barf on multiple definitions.
|
||||
|
@ -1557,7 +1557,7 @@ then
|
|||
if test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
|
||||
dnl Use a custom libffmpeg
|
||||
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
|
||||
BUILTINS="${BUILTINS} ffmpeg stream_out_transcode encoder_ffmpeg"
|
||||
BUILTINS="${BUILTINS} ffmpeg stream_out_transcode"
|
||||
LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${real_ffmpeg_tree}/libavcodec -lavcodec"
|
||||
CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${real_ffmpeg_tree}/libavcodec"
|
||||
|
||||
|
@ -1675,7 +1675,7 @@ then
|
|||
then
|
||||
dnl Use a custom xvid
|
||||
AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a)
|
||||
BUILTINS="${BUILTINS} xvid encoder_xvid"
|
||||
BUILTINS="${BUILTINS} xvid"
|
||||
LDFLAGS_xvid="${LDFLAGS_xvid} -L${real_xvid_tree}/build/generic -lxvidcore"
|
||||
CPPFLAGS_xvid="${CPPFLAGS_xvid} -I${real_xvid_tree}/src"
|
||||
else
|
||||
|
@ -1689,7 +1689,7 @@ then
|
|||
AC_CHECK_HEADERS(xvid.h, ,
|
||||
[ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ])
|
||||
AC_CHECK_LIB(xvidcore, xvid_init, [
|
||||
PLUGINS="${PLUGINS} xvid encoder_xvid"
|
||||
PLUGINS="${PLUGINS} xvid"
|
||||
LDFLAGS_xvid="${LDFLAGS_xvid} -lxvidcore" ],
|
||||
[ AC_MSG_ERROR([Cannot find libxvidcore library...]) ])
|
||||
LDFLAGS="${LDFLAGS_save}"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* bandlimited.c : bandlimited interpolation resampler
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2002 VideoLAN
|
||||
* $Id: bandlimited.c,v 1.5 2003/03/05 22:37:05 gbazin Exp $
|
||||
* $Id: bandlimited.c,v 1.6 2003/05/17 11:35:14 gbazin Exp $
|
||||
*
|
||||
* Authors: Gildas Bazin <gbazin@netcourrier.com>
|
||||
*
|
||||
|
@ -104,6 +104,13 @@ static int Create( vlc_object_t *p_this )
|
|||
return VLC_EGENERIC;
|
||||
}
|
||||
|
||||
#if !defined( SYS_DARWIN )
|
||||
if( !config_GetInt( p_this, "hq-resampling" ) )
|
||||
{
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Allocate the memory needed to store the module's structure */
|
||||
p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
|
||||
if( p_filter->p_sys == NULL )
|
||||
|
|
12
src/libvlc.h
12
src/libvlc.h
|
@ -2,7 +2,7 @@
|
|||
* libvlc.h: main libvlc header
|
||||
*****************************************************************************
|
||||
* Copyright (C) 1998-2002 VideoLAN
|
||||
* $Id: libvlc.h,v 1.66 2003/05/14 21:29:43 fenrir Exp $
|
||||
* $Id: libvlc.h,v 1.67 2003/05/17 11:35:14 gbazin Exp $
|
||||
*
|
||||
* Authors: Vincent Seguin <seguin@via.ecp.fr>
|
||||
* Samuel Hocevar <sam@zoy.org>
|
||||
|
@ -111,6 +111,13 @@ static char *ppsz_language[] = { "auto", "de", "en_GB", "fr", "it",
|
|||
"You can force the audio output frequency here. Common values are " \
|
||||
"-1 (default), 48000, 44100, 32000, 22050, 16000, 11025, 8000.")
|
||||
|
||||
#if !defined( SYS_DARWIN )
|
||||
#define AOUT_RESAMP_TEXT N_("High quality audio resampling")
|
||||
#define AOUT_RESAMP_LONGTEXT N_( \
|
||||
"High quality audio resampling can be processor intensive so you can " \
|
||||
"disable it and a cheaper resampling algorithm will be used instead.")
|
||||
#endif
|
||||
|
||||
#define DESYNC_TEXT N_("Compensate desynchronization of audio (in ms)")
|
||||
#define DESYNC_LONGTEXT N_( \
|
||||
"This option allows you to delay the audio output. This can be handy if " \
|
||||
|
@ -466,6 +473,9 @@ vlc_module_begin();
|
|||
AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL,
|
||||
VOLUME_SAVE_TEXT, VOLUME_SAVE_LONGTEXT, VLC_TRUE );
|
||||
add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, AOUT_RATE_LONGTEXT, VLC_TRUE );
|
||||
#if !defined( SYS_DARWIN )
|
||||
add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT, AOUT_RESAMP_LONGTEXT, VLC_TRUE );
|
||||
#endif
|
||||
add_integer( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT, VLC_TRUE );
|
||||
add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE );
|
||||
add_bool( "headphone-opt", 0, NULL, HEADPHONE_TEXT, HEADPHONE_LONGTEXT, VLC_FALSE );
|
||||
|
|
Loading…
Reference in New Issue