Changeset bfc4f0f588c0c68c557a8f5cbadc19818ac9484f

Timestamp:

10/24/02 01:17:45 (6 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[0330bbedd98672af4f6321c595d89b75615d1fc3]

git-author:

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

Message:

* ALL: New ogg demux and vorbis codec modules for preliminary support of

ogg/vorbis streams.

Files:

• AUTHORS (modified) (1 diff)
• MAINTAINERS (modified) (2 diffs)
• STATUS (modified) (2 diffs)
• TODO (modified) (1 diff)
• configure.ac.in (modified) (3 diffs)
• include/input_ext-dec.h (modified) (2 diffs)
• modules/LIST (modified) (3 diffs)
• modules/codec/Modules.am (modified) (1 diff)
• modules/demux/Modules.am (modified) (1 diff)
• src/input/input_ext-dec.c (modified) (3 diffs)

AUTHORS

@@ -49 +49 @@
-D: mingw32 port, various win32 fixes
-D: DirectX audio and video output, win32 WaveOut audio output
-
+
+
-D: Configuration file infrastructure
-S: France

MAINTAINERS

@@ -1 @@
-2 2002/08/16 14:30:39 bozo
+3 2002/10/23 23:17:45 gbazin
-#
-#                            VLC MAINTAINERS
@@ -80 +80 @@
-  - A/52 : [gibalou] ([meuuh])
-  - SPU : [sam]
-Xavier Maillard
+[gibalou]
-
-* DOCUMENTATION

STATUS

@@ -1 @@
-4 2002/08/16 14:30:39 bozo
+5 2002/10/23 23:17:45 gbazin
-#
-#                              VLC STATUS
@@ -47 +47 @@
-    - Xinerama fullscreen support
-      ETA : completed
-    - Ogg/Vorbis decoder plug-in
-      ETA : soon
-
-Christophe Massiot <massiot@via.ecp.fr> :

TODO

@@ -479 +479 @@
- MP3 format. The system packets are quite different than the MPEG ones, so
- adding support for it would require a lot of code rewrite.
-In the works (Xavier Maillard
+Done 24 Nov 2002 (gbazin
-
-Task: 0x23

configure.ac.in

@@ -1073 +1073 @@
-
-dnl
+dnl  ogg plugin
+dnl
+AC_ARG_ENABLE(ogg,
+  [  --enable-ogg            Ogg demux support (default enabled)])
+if test "x${enable_ogg}" != "xno"
+then
+  AC_CHECK_HEADERS(ogg/ogg.h, [
+    PLUGINS="${PLUGINS} ogg"
+    LDFLAGS_ogg="${LDFLAGS_ogg} -logg"
+   ],[])
+fi
+
+dnl
-dnl  Codec plugins
-dnl
@@ -1357 +1370 @@
-
-dnl
-dnl  ogg vorbis plugin
-dnl
-AC_ARG_ENABLE(vorbis,
-  [  --enable-vorbis         Ogg/Vorbis decoder support (default enabled)])
-if test "x${enable_vorbis}" != "xno"
-then
-  AC_CHECK_HEADERS(ogg/ogg.h, [
-    dnl disabled for the moment
-    #PLUGINS="${PLUGINS} ogg vorbis"
-    LDFLAGS_vorbis="${LDFLAGS_vorbis} -lvorbis"
-   ],[])
-fi
-
-dnl
-dnl  DV plugin
-dnl
@@ -1380 +1379 @@
-    PLUGINS="${PLUGINS} dv"
-    LDFLAGS_dv="${LDFLAGS_dv} -ldv"
+   ],[])
+fi
+
+dnl
+dnl  Vorbis plugin
+dnl
+AC_ARG_ENABLE(vorbis,
+  [  --enable-vorbis            Vorbis decoder support (default enabled)])
+if test "x${enable_vorbis}" != "xno"
+then
+  AC_CHECK_HEADERS(vorbis/codec.h, [
+    PLUGINS="${PLUGINS} vorbis"
+    LDFLAGS_vorbis="${LDFLAGS_vorbis} -lvorbis"
-   ],[])
-fi

include/input_ext-dec.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-2 2002/10/21 10:46:34 fenrir
+3 2002/10/23 23:17:45 gbazin
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -210 +210 @@
-VLC_EXPORT( void, InitBitstream,  ( bit_stream_t *, decoder_fifo_t *, void ( * )( bit_stream_t *, vlc_bool_t ), void * p_callback_arg ) );
-VLC_EXPORT( vlc_bool_t, NextDataPacket,    ( decoder_fifo_t *, data_packet_t ** ) );
+VLC_EXPORT( pes_packet_t *, GetPES,        ( decoder_fifo_t * ) );
+VLC_EXPORT( pes_packet_t *, NextPES,       ( decoder_fifo_t * ) );
-VLC_EXPORT( void, BitstreamNextDataPacket, ( bit_stream_t * ) );
-VLC_EXPORT( u32,  UnalignedShowBits,       ( bit_stream_t *, unsigned int ) );

modules/LIST

@@ -1 +1 @@
-List of vlc plugins
-2 2002/09/15 20:54:12 jpsama
+3 2002/10/23 23:17:45 gbazi
-
- * a52_system: input module for A52 decapsulation.
@@ -126 +126 @@
- * null: a module with no capabilities.
-
+ * ogg: input module for OGG decapsulation.
+
- * qt: interface module using the Qt widget set.
-
@@ -138 +140 @@
- * vcd: input module for accessing Video CDs.
-
+ * vorbis: a vorbis audio decoder using the libvorbis library.
+
- * waveout: simple audio output module for Windows.
-

modules/codec/Modules.am

@@ -2 +2 @@
-SOURCES_lpcm = modules/codec/lpcm.c
-SOURCES_araw = modules/codec/araw.c
+SOURCES_vorbis = modules/codec/vorbis.c

modules/demux/Modules.am

@@ -1 +1 @@
-SOURCES_a52sys = modules/demux/a52sys.c
+SOURCES_ogg = modules/demux/ogg.c

src/input/input_ext-dec.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-5 2002/10/21 10:46:34 fenrir
+6 2002/10/23 23:17:44 gbazin
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -112 +112 @@
-
-/*****************************************************************************
+ * GetPES: return the first PES from the fifo
+ *****************************************************************************/
+static inline pes_packet_t *_GetPES( decoder_fifo_t * p_fifo )
+{
+    pes_packet_t * p_pes;
+
+    vlc_mutex_lock( &p_fifo->data_lock );
+
+    if( p_fifo->p_first == NULL )
+    {
+        /* No PES in the FIFO. p_last is no longer valid. */
+        p_fifo->pp_last = &p_fifo->p_first;
+
+        if( p_fifo->b_die )
+        {
+            vlc_mutex_unlock( &p_fifo->data_lock );
+            return NULL;
+        }
+
+        /* Signal the input thread we're waiting. This is only
+         * needed in case of slave clock (ES plug-in)  but it won't
+         * harm. */
+        vlc_cond_signal( &p_fifo->data_wait );
+
+        /* Wait for the input to tell us when we receive a packet. */
+        vlc_cond_wait( &p_fifo->data_wait, &p_fifo->data_lock );
+    }
+
+    p_pes = p_fifo->p_first;
+
+    vlc_mutex_unlock( &p_fifo->data_lock );
+
+    return p_pes;
+}
+
+pes_packet_t * GetPES( decoder_fifo_t * p_fifo )
+{
+    return( _GetPES( p_fifo ) );
+}
+
+/*****************************************************************************
+ * NextPES: free the current PES and return the next one
+ *****************************************************************************/
+static inline pes_packet_t * _NextPES( decoder_fifo_t * p_fifo )
+{
+    pes_packet_t * p_next;
+
+    vlc_mutex_lock( &p_fifo->data_lock );
+
+    /* Free the previous PES packet. */
+    p_next = p_fifo->p_first->p_next;
+    p_fifo->p_first->p_next = NULL;
+    input_DeletePES( p_fifo->p_packets_mgt, p_fifo->p_first );
+    p_fifo->p_first = p_next;
+    p_fifo->i_depth--;
+
+    vlc_mutex_unlock( &p_fifo->data_lock );
+
+    return _GetPES( p_fifo );
+}
+
+pes_packet_t * NextPES( decoder_fifo_t * p_fifo )
+{
+    return( _NextPES( p_fifo ) );
+}
+
+/*****************************************************************************
- * NextDataPacket: go to the data packet after *pp_data, return 1 if we
- * changed PES
@@ -128 +195 @@
-        if( (*pp_data)->p_next == NULL )
-        {
-            pes_packet_t * p_next;
-
-            vlc_mutex_lock( &p_fifo->data_lock );
-
-            /* Free the previous PES packet. */
-            p_next = p_fifo->p_first->p_next;
-            p_fifo->p_first->p_next = NULL;
-            input_DeletePES( p_fifo->p_packets_mgt, p_fifo->p_first );
-            p_fifo->p_first = p_next;
-            p_fifo->i_depth--;
-
-            if( p_fifo->p_first == NULL )
-            {
-                /* No PES in the FIFO. p_last is no longer valid. */
-                p_fifo->pp_last = &p_fifo->p_first;
-
-                /* Signal the input thread we're waiting. This is only
-                 * needed in case of slave clock (ES plug-in)  but it won't
-                 * harm. */
-                vlc_cond_signal( &p_fifo->data_wait );
-
-                /* Wait for the input to tell us when we receive a packet. */
-                vlc_cond_wait( &p_fifo->data_wait, &p_fifo->data_lock );
-            }
-
-            /* The next packet could be found in the next PES packet */
-
-
-
+
-
-            b_new_pes = 1;