Changeset 4525fffaf01a35712399e5d26a7ffa337bcdc382

Timestamp:

17/05/03 13:35:14 (6 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1053171314 +0000

git-parent:

[bd7ed3cead45be14d9b435cbfddd5a7745c97a64]

git-author:

Gildas Bazin <gbazin@videolan.org> 1053171314 +0000

Message:

* 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.

Files:

• configure.ac.in (modified) (4 diffs)
• modules/audio_filter/resampler/bandlimited.c (modified) (2 diffs)
• src/libvlc.h (modified) (3 diffs)

configure.ac.in

@@ -1534 +1534 @@
-    AC_CHECK_HEADERS(ffmpeg/avcodec.h postproc/postprocess.h)
-    AC_CHECK_LIB(avcodec, avcodec_init, [
- encoder_ffmpeg
+
-      LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -lavcodec"
-      dnl  XXX: we don't link with -lavcodec a 2nd time because the OS X
@@ -1558 +1558 @@
-      dnl  Use a custom libffmpeg
-      AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
- encoder_ffmpeg
+
-      LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${real_ffmpeg_tree}/libavcodec -lavcodec"
-      CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${real_ffmpeg_tree}/libavcodec"
@@ -1676 +1676 @@
-      dnl  Use a custom xvid
-      AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a)
- encoder_xvid
+
-      LDFLAGS_xvid="${LDFLAGS_xvid} -L${real_xvid_tree}/build/generic -lxvidcore"
-      CPPFLAGS_xvid="${CPPFLAGS_xvid} -I${real_xvid_tree}/src"
@@ -1690 +1690 @@
-      [ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ])
-    AC_CHECK_LIB(xvidcore, xvid_init, [
- encoder_xvid
+
-      LDFLAGS_xvid="${LDFLAGS_xvid} -lxvidcore" ],
-      [ AC_MSG_ERROR([Cannot find libxvidcore library...]) ])

modules/audio_filter/resampler/bandlimited.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-5 2003/03/05 22:37:05
+6 2003/05/17 11:35:14
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -105 +105 @@
-    }
-
+#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) );

src/libvlc.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-6 2003/05/14 21:29:43 fenrir
+7 2003/05/17 11:35:14 gbazin
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -112 +112 @@
-    "-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_( \
@@ -467 +474 @@
-                            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 );