* ALL: fixed DTS audio support.
* modules/demux/dts.c: added raw DTS audio demuxer.

configure.ac

 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.125 2003/11/30 18:14:20 rocky Exp $
+dnl $Id: configure.ac,v 1.126 2003/12/01 23:39:11 gbazin Exp $
 
 AC_INIT(vlc,0.7.0-test1)
 
@@ -878,7 +878,7 @@ AX_ADD_PLUGINS([aout_file])
 AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
 AX_ADD_PLUGINS([id3 m3u])
 AX_ADD_PLUGINS([rawvideo])
-AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys au])
+AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys dtssys au])
 AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
 AX_ADD_PLUGINS([access_ftp access_directory sap httpd http])
 

modules/codec/dts.c

@@ -2,7 +2,7 @@
  * dts.c: parse DTS audio sync info and packetize the stream
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: dts.c,v 1.7 2003/11/22 23:39:14 fenrir Exp $
+ * $Id: dts.c,v 1.8 2003/12/01 23:39:11 gbazin Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -258,11 +258,12 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                 return NULL;
             }
 
-            if( p_header[0] == 0x7f && p_header[1] == 0xfe &&
-                p_header[2] == 0x80 && p_header[3] == 0x01 )
+            if( p_header[0] != 0x7f || p_header[1] != 0xfe ||
+                p_header[2] != 0x80 || p_header[3] != 0x01 )
             {
                 msg_Dbg( p_dec, "emulated sync word "
-                         "(no sync on following frame)" );
+                         "(no sync on following frame) %2.2x%2.2x%2.2x%2.2x",
+			 p_header[0], p_header[1], p_header[2], p_header[3] );
                 p_sys->i_state = STATE_NOSYNC;
                 block_SkipByte( &p_sys->bytestream );
                 break;
@@ -572,5 +573,5 @@ static int SyncInfo( const byte_t * p_buf,
 
     *pi_frame_length = (i_frame_length + 1) * 32;
 
-    return( i_frame_size + 1 );
+    return i_frame_size + 1;
 }

modules/demux/Modules.am

 SOURCES_a52sys = a52sys.c
+SOURCES_dtssys = dts.c
 SOURCES_flac = flac.c
 SOURCES_ogg = ogg.c
 SOURCES_m3u = m3u.c

modules/demux/dts.c

+/*****************************************************************************
+ * dts.c : raw DTS stream input module for vlc
+ *****************************************************************************
+ * Copyright (C) 2001 VideoLAN
+ * $Id: dts.c,v 1.1 2003/12/01 23:39:11 gbazin Exp $
+ *
+ * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ *
+ * 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 <vlc/vlc.h>
+#include <vlc/input.h>
+#include <vlc_codec.h>
+
+#define DTS_PACKET_SIZE 16384
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int  Open  ( vlc_object_t * );
+static void Close ( vlc_object_t * );
+static int  Demux ( input_thread_t * );
+
+struct demux_sys_t
+{
+    vlc_bool_t  b_start;
+    es_out_id_t *p_es;
+
+    /* Packetizer */
+    decoder_t *p_packetizer;
+};
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+    set_description( _("Raw DTS demuxer") );
+    set_capability( "demux", 155 );
+    set_callbacks( Open, Close );
+    add_shortcut( "dts" );
+vlc_module_end();
+
+/*****************************************************************************
+ * Open: initializes ES structures
+ *****************************************************************************/
+static int Open( vlc_object_t * p_this )
+{
+    input_thread_t *p_input = (input_thread_t *)p_this;
+    demux_sys_t    *p_sys;
+    byte_t *       p_peek;
+
+    p_input->pf_demux = Demux;
+    p_input->pf_demux_control = demux_vaControlDefault;
+    p_input->pf_rewind = NULL;
+
+    /* Have a peep at the show. */
+    if( input_Peek( p_input, &p_peek, 4 ) < 4 )
+    {
+        /* Stream shorter than 4 bytes... */
+        msg_Err( p_input, "cannot peek()" );
+        return VLC_EGENERIC;
+    }
+
+    if( p_peek[0] != 0x7f || p_peek[1] != 0xfe ||
+        p_peek[2] != 0x80 || p_peek[3] != 0x01 )
+    {
+        if( p_input->psz_demux && !strncmp( p_input->psz_demux, "dts", 3 ) )
+        {
+            /* User forced */
+            msg_Err( p_input, "this doesn't look like a DTS audio stream, "
+                     "continuing anyway" );
+        }
+        else
+        {
+            return VLC_EGENERIC;
+        }
+    }
+
+    p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) );
+    p_sys->b_start = VLC_TRUE;
+
+    /*
+     * Load the DTS packetizer
+     */
+    p_sys->p_packetizer = vlc_object_create( p_input, VLC_OBJECT_DECODER );
+    p_sys->p_packetizer->pf_decode_audio = 0;
+    p_sys->p_packetizer->pf_decode_video = 0;
+    p_sys->p_packetizer->pf_decode_sub = 0;
+    p_sys->p_packetizer->pf_packetize = 0;
+
+    /* Initialization of decoder structure */
+    es_format_Init( &p_sys->p_packetizer->fmt_in, AUDIO_ES,
+                    VLC_FOURCC( 'd', 't', 's', ' ' ) );
+
+    p_sys->p_packetizer->p_module =
+        module_Need( p_sys->p_packetizer, "packetizer", NULL );
+    if( !p_sys->p_packetizer->p_module )
+    {
+        msg_Err( p_input, "cannot find DTS packetizer" );
+        return VLC_EGENERIC;
+    }
+
+    /* Create one program */
+    vlc_mutex_lock( &p_input->stream.stream_lock );
+    if( input_InitStream( p_input, 0 ) == -1 )
+    {
+        vlc_mutex_unlock( &p_input->stream.stream_lock );
+        msg_Err( p_input, "cannot init stream" );
+        return VLC_EGENERIC;
+    }
+    p_input->stream.i_mux_rate = 0;
+    vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+    p_sys->p_es =
+        es_out_Add( p_input->p_es_out, &p_sys->p_packetizer->fmt_in );
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close: frees unused data
+ *****************************************************************************/
+static void Close( vlc_object_t * p_this )
+{
+    input_thread_t *p_input = (input_thread_t*)p_this;
+    demux_sys_t    *p_sys = p_input->p_demux_data;
+
+    /* Unneed module */
+    module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
+
+    /* Delete the decoder */
+    vlc_object_destroy( p_sys->p_packetizer );
+
+    free( p_sys );
+}
+
+/*****************************************************************************
+ * Demux: reads and demuxes data packets
+ *****************************************************************************
+ * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
+ *****************************************************************************/
+static int Demux( input_thread_t * p_input )
+{
+    demux_sys_t  *p_sys = p_input->p_demux_data;
+    block_t *p_block_in, *p_block_out;
+
+    if( !( p_block_in = stream_Block( p_input->s, DTS_PACKET_SIZE ) ) )
+    {
+        return 0;
+    }
+
+    if( p_sys->b_start )
+    {
+        p_block_in->i_pts = p_block_in->i_dts = 1;
+        p_sys->b_start = VLC_FALSE;
+    }
+    else
+    {
+        p_block_in->i_pts = p_block_in->i_dts = 0;
+    }
+
+    while( (p_block_out = p_sys->p_packetizer->pf_packetize(
+                p_sys->p_packetizer, &p_block_in )) )
+    {
+        while( p_block_out )
+        {
+            block_t *p_next = p_block_out->p_next;
+
+            input_ClockManageRef( p_input,
+                                  p_input->stream.p_selected_program,
+                                  p_block_out->i_pts * 9 / 100 );
+
+            p_block_in->b_discontinuity = 0;
+            p_block_out->i_dts = p_block_out->i_pts =
+                input_ClockGetTS( p_input, p_input->stream.p_selected_program,
+                                  p_block_out->i_pts * 9 / 100 );
+
+            es_out_Send( p_input->p_es_out, p_sys->p_es, p_block_out );
+
+            p_block_out = p_next;
+        }
+    }
+
+    return 1;
+}

modules/demux/mpeg/system.c

@@ -2,7 +2,7 @@
  * system.c: helper module for TS, PS and PES management
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: system.c,v 1.22 2003/11/26 20:44:38 fenrir Exp $
+ * $Id: system.c,v 1.23 2003/12/01 23:39:11 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Lespinasse <walken@via.ecp.fr>
@@ -363,15 +363,15 @@ static void ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
         }
 
         /* Welcome to the kludge area ! --Meuuh */
-        if ( p_es->i_fourcc == VLC_FOURCC('a','5','2','b') )
+        if ( p_es->i_fourcc == VLC_FOURCC('a','5','2','b')
+              || p_es->i_fourcc == VLC_FOURCC('d','t','s','b') )
         {
-            /* With A/52 audio, we need to skip the first 4 bytes */
+            /* With A/52 or DTS audio, we need to skip the first 4 bytes */
             i_pes_header_size += 4;
         }
 
         if ( p_es->i_fourcc == VLC_FOURCC('l','p','c','b')
               || p_es->i_fourcc == VLC_FOURCC('s','p','u','b')
-              || p_es->i_fourcc == VLC_FOURCC('d','t','s','b')
               || p_es->i_fourcc == VLC_FOURCC('s','d','d','b') )
         {
             /* stream_private_id */

modules/mux/mpeg/pes.c

@@ -2,7 +2,7 @@
  * pes.c: PES packetizer used by the MPEG multiplexers
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: pes.c,v 1.12 2003/11/15 18:57:12 fenrir Exp $
+ * $Id: pes.c,v 1.13 2003/12/01 23:39:11 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -59,7 +59,7 @@ static inline int PESHeader( uint8_t *p_hdr, mtime_t i_pts, mtime_t i_dts,
     if( i_stream_id == PES_PRIVATE_STREAM_1 && i_private_id != -1 )
     {
         i_extra = 1;
-        if( ( i_private_id&0xf8 ) == 0x80 )
+        if( ( i_private_id & 0xf0 ) == 0x80 )
         {
             i_extra += 3;
         }