* ./modules/audio_filter/resampler/ugly.c: simple resampler which does not

    insert blank samples, but changes pitch.

diff --git a/configure b/configure
index 84ceb950cb7e51266809579a7ed39f9452162c1c..2c54fa2601c42aecad64a8a41b2edf82fc8d4cd8 100755 (executable)
--- a/configure
+++ b/configure
@@ -5628,7 +5628,7 @@ PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/
 #PLUGINS="${PLUGINS} codec/lpcm/lpcm"
 PLUGINS="${PLUGINS} video_filter/deinterlace/deinterlace video_filter/invert video_filter/wall video_filter/transform video_filter/distort video_filter/clone video_filter/crop"
 PLUGINS="${PLUGINS} audio_filter/converter/float32tos16 audio_filter/converter/float32tos8 audio_filter/converter/float32tou16 audio_filter/converter/float32tou8 audio_filter/converter/a52tospdif audio_filter/converter/fixed32tofloat32 audio_filter/converter/fixed32tos16 audio_filter/converter/s16tofloat32"
-PLUGINS="${PLUGINS} audio_filter/resampler/trivial"
+PLUGINS="${PLUGINS} audio_filter/resampler/trivial audio_filter/resampler/ugly"
 PLUGINS="${PLUGINS} audio_filter/channel_mixer/trivial"
 PLUGINS="${PLUGINS} audio_mixer/trivial audio_mixer/spdif"
 PLUGINS="${PLUGINS} audio_output/file"

diff --git a/configure.in b/configure.in
index df061ffb0e76e11ebb92d83b9cfdbb43aa2ad865..6ea1306eeb59cd11f26c029d704a1d3b8b86285c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -448,7 +448,7 @@ PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/
 #PLUGINS="${PLUGINS} codec/lpcm/lpcm"
 PLUGINS="${PLUGINS} video_filter/deinterlace/deinterlace video_filter/invert video_filter/wall video_filter/transform video_filter/distort video_filter/clone video_filter/crop"
 PLUGINS="${PLUGINS} audio_filter/converter/float32tos16 audio_filter/converter/float32tos8 audio_filter/converter/float32tou16 audio_filter/converter/float32tou8 audio_filter/converter/a52tospdif audio_filter/converter/fixed32tofloat32 audio_filter/converter/fixed32tos16 audio_filter/converter/s16tofloat32"
-PLUGINS="${PLUGINS} audio_filter/resampler/trivial"
+PLUGINS="${PLUGINS} audio_filter/resampler/trivial audio_filter/resampler/ugly"
 PLUGINS="${PLUGINS} audio_filter/channel_mixer/trivial"
 PLUGINS="${PLUGINS} audio_mixer/trivial audio_mixer/spdif"
 PLUGINS="${PLUGINS} audio_output/file"

diff --git a/modules/audio_filter/resampler/Makefile b/modules/audio_filter/resampler/Makefile
index b49f81393a9d5ee2ee8eb29c093e63b271b1f948..6902485cf5945b25b5248fbf8ff81aca7725a716 100644 (file)
--- a/modules/audio_filter/resampler/Makefile
+++ b/modules/audio_filter/resampler/Makefile
@@ -1 +1,3 @@
 trivial_SOURCES = trivial.c
+ugly_SOURCES = ugly.c
+fast_SOURCES = fast.c

diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c
new file mode 100644 (file)
index 0000000..dd4a52e
--- /dev/null
+++ b/modules/audio_filter/resampler/ugly.c
@@ -0,0 +1,108 @@
+/*****************************************************************************
+ * ugly.c : ugly resampler (changes pitch)
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ * $Id: ugly.c,v 1.1 2002/08/24 20:22:34 sam Exp $
+ *
+ * Authors: Samuel Hocevar <sam@zoy.org>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <errno.h>
+#include <stdlib.h>                                      /* malloc(), free() */
+#include <string.h>
+
+#include <vlc/vlc.h>
+#include "audio_output.h"
+#include "aout_internal.h"
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int  Create    ( vlc_object_t * );
+
+static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
+                        aout_buffer_t * );
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+    set_description( _("audio filter for ugly resampling") );
+    set_capability( "audio filter", 5 );
+    set_callbacks( Create, NULL );
+vlc_module_end();
+
+/*****************************************************************************
+ * Create: allocate ugly resampler
+ *****************************************************************************/
+static int Create( vlc_object_t *p_this )
+{
+    aout_filter_t * p_filter = (aout_filter_t *)p_this;
+
+    if ( p_filter->input.i_rate == p_filter->output.i_rate
+          || p_filter->input.i_format != p_filter->output.i_format
+          || p_filter->input.i_channels != p_filter->output.i_channels
+          || (p_filter->input.i_format != AOUT_FMT_FLOAT32
+               && p_filter->input.i_format != AOUT_FMT_FIXED32) )
+    {
+        return VLC_EGENERIC;
+    }
+
+    p_filter->pf_do_work = DoWork;
+    p_filter->b_in_place = VLC_FALSE;
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * DoWork: convert a buffer
+ *****************************************************************************/
+static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
+                    aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+{
+    s32* p_in = (s32*)p_in_buf->p_buffer;
+    s32* p_out = (s32*)p_out_buf->p_buffer;
+
+    int i_in_nb = p_in_buf->i_nb_samples;
+    int i_out_nb = i_in_nb * p_filter->output.i_rate
+                    / p_filter->input.i_rate;
+    int i_frame_bytes = p_filter->input.i_channels * sizeof(s32);
+    int i_out, i_chan, i_remainder = 0;
+
+    for( i_out = i_out_nb ; i_out-- ; )
+    {
+        for( i_chan = p_filter->input.i_channels ; i_chan ; )
+        {
+            i_chan--;
+            *p_out++ = p_in[i_chan];
+        }
+
+        i_remainder += p_filter->input.i_rate;
+        while( i_remainder >= p_filter->output.i_rate )
+        {
+            p_in += p_filter->input.i_channels;
+            i_remainder -= p_filter->output.i_rate;
+        }
+    }
+
+    p_out_buf->i_nb_samples = i_out_nb;
+    p_out_buf->i_nb_bytes = i_out_nb * i_frame_bytes;
+}
+