Changeset e9e8b069d0538fd3551bae5f0c30fb7457939a7e

Timestamp:

21/11/02 22:37:46 (6 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[8e3e302dffe73b199cbfbb5faf6ce95cc0247a3f]

git-author:

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

Message:

* modules/codec/Modules.am, configure.ac.in, modules/codec/vorbis.c: added

a tremor decoder module using libvorbisidec (aka tremor) from xiph.org.
This module allows decoding vorbis audio on hardware without a fpu
(--enable-tremor).

* modules/LIST: added entries for tremor and theora.

Files:

• configure.ac.in (modified) (1 diff)
• modules/LIST (modified) (2 diffs)
• modules/codec/Modules.am (modified) (1 diff)
• modules/codec/vorbis.c (modified) (7 diffs)

configure.ac.in

@@ -1503 +1503 @@
-    PLUGINS="${PLUGINS} vorbis"
-    LDFLAGS_vorbis="${LDFLAGS_vorbis} -lvorbis -logg"
+   ],[])
+fi
+
+dnl
+dnl  Tremor plugin
+dnl
+AC_ARG_ENABLE(tremor,
+  [  --enable-tremor         Tremor decoder support (default disabled)])
+if test "x${enable_tremor}" = "xyes"
+then
+  AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [
+    PLUGINS="${PLUGINS} tremor"
+    LDFLAGS_tremor="${LDFLAGS_tremor} -lvorbisidec -logg"
-   ],[])
-fi

modules/LIST

@@ -1 +1 @@
-List of vlc plugins
-4 2002/11/18 13:02:1
+5 2002/11/21 21:37:4
-
- * a52_system: input module for A52 decapsulation.
@@ -138 +138 @@
- * spudec: DVD subtitles decoder.
-
+ * theora: a theora video decoder using the libtheora library.
+
+ * tremor: a vorbis audio decoder using the libvorbisidec (aka tremor) library.
+
- * vcd: input module for accessing Video CDs.
-

modules/codec/Modules.am

@@ -5 +5 @@
-SOURCES_tarkin = modules/codec/tarkin.c
-SOURCES_theora = modules/codec/theora.c
+SOURCES_tremor = modules/codec/vorbis.c
-SOURCES_dv = modules/codec/dv.c
-SOURCES_xvid = modules/codec/xvid.c

modules/codec/vorbis.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-6 2002/11/15 00:41:00
+7 2002/11/21 21:37:46
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -36 +36 @@
-
-#include <ogg/ogg.h>
+#ifdef MODULE_NAME_IS_tremor
+#include <tremor/ivorbiscodec.h>
+#else
-#include <vorbis/codec.h>
+#endif
-
-/*****************************************************************************
@@ -96 +100 @@
-static int  GetOggPacket ( dec_thread_t *, ogg_packet *, mtime_t * );
-
+#ifdef MODULE_NAME_IS_tremor
+static void Interleave   ( int32_t *, const int32_t **, int, int );
+#else
-static void Interleave   ( float *, const float **, int, int );
+#endif
-
-/*****************************************************************************
@@ -185 +193 @@
-    vorbis_block_init( &p_dec->vd, &p_dec->vb );
-
+#ifdef MODULE_NAME_IS_tremor
+    p_dec->output_format.i_format = VLC_FOURCC('f','i','3','2');
+#else
-    p_dec->output_format.i_format = VLC_FOURCC('f','l','3','2');
+#endif
-    p_dec->output_format.i_physical_channels =
-        p_dec->output_format.i_original_channels =
@@ -242 +254 @@
-    aout_buffer_t *p_aout_buffer;
-    ogg_packet    oggpacket;
+#ifdef MODULE_NAME_IS_tremor
+    int32_t       **pp_pcm;
+#else
-    float         **pp_pcm;
+#endif
-    int           i_samples;
-    mtime_t       i_pts;
@@ -279 +295 @@
-
-        /* Interleave the samples */
-
-
+
+
+
+
+
+
+
-
-        /* Tell libvorbis how many samples we actually consumed */
@@ -325 +346 @@
- * Interleave: helper function to interleave channels
- *****************************************************************************/
-
-
+
+
+
+
+
+
-{
-    int i, j;