Changeset 59173c65552ee499e502e4961215e85526e483ff

Show
Ignore:
Timestamp:
02/12/03 00:39:11 (5 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1070321951 +0000
git-parent:

[2202af209fbd40847dfce15abaa6f1aedfe9e2c6]

git-author:
Gildas Bazin <gbazin@videolan.org> 1070321951 +0000
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac

    r78ba4b7 r59173c6  
    11dnl Autoconf settings for vlc 
    2 dnl $Id: configure.ac,v 1.125 2003/11/30 18:14:20 rocky Exp $ 
     2dnl $Id: configure.ac,v 1.126 2003/12/01 23:39:11 gbazin Exp $ 
    33 
    44AC_INIT(vlc,0.7.0-test1) 
    …… 
    879879AX_ADD_PLUGINS([id3 m3u]) 
    880880AX_ADD_PLUGINS([rawvideo]) 
    881 AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys au]) 
     881AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys dtssys au]) 
    882882AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms]) 
    883883AX_ADD_PLUGINS([access_ftp access_directory sap httpd http]) 

  • modules/codec/dts.c

    r61f6d45 r59173c6  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: dts.c,v 1.7 2003/11/22 23:39:14 fenrir Exp $ 
     5 * $Id: dts.c,v 1.8 2003/12/01 23:39:11 gbazin Exp $ 
    66 * 
    77 * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
    …… 
    259259            } 
    260260 
    261             if( p_header[0] == 0x7f && p_header[1] == 0xfe && 
    262                 p_header[2] == 0x80 && p_header[3] == 0x01 ) 
     261            if( p_header[0] != 0x7f || p_header[1] != 0xfe || 
     262                p_header[2] != 0x80 || p_header[3] != 0x01 ) 
    263263            { 
    264264                msg_Dbg( p_dec, "emulated sync word " 
    265                          "(no sync on following frame)" ); 
     265                         "(no sync on following frame) %2.2x%2.2x%2.2x%2.2x", 
     266             p_header[0], p_header[1], p_header[2], p_header[3] ); 
    266267                p_sys->i_state = STATE_NOSYNC; 
    267268                block_SkipByte( &p_sys->bytestream ); 
    …… 
    573574    *pi_frame_length = (i_frame_length + 1) * 32; 
    574575 
    575     return( i_frame_size + 1 ); 
    576 } 
     576    return i_frame_size + 1; 
     577} 

  • modules/demux/Modules.am

    r2ad7219 r59173c6  
    11SOURCES_a52sys = a52sys.c 
     2SOURCES_dtssys = dts.c 
    23SOURCES_flac = flac.c 
    34SOURCES_ogg = ogg.c 

  • modules/demux/mpeg/system.c

    r97f5289 r59173c6  
    33 ***************************************************************************** 
    44 * Copyright (C) 1998-2002 VideoLAN 
    5  * $Id: system.c,v 1.22 2003/11/26 20:44:38 fenrir Exp $ 
     5 * $Id: system.c,v 1.23 2003/12/01 23:39:11 gbazin Exp $ 
    66 * 
    77 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    364364 
    365365        /* Welcome to the kludge area ! --Meuuh */ 
    366         if ( p_es->i_fourcc == VLC_FOURCC('a','5','2','b') ) 
    367         { 
    368             /* With A/52 audio, we need to skip the first 4 bytes */ 
     366        if ( p_es->i_fourcc == VLC_FOURCC('a','5','2','b') 
     367              || p_es->i_fourcc == VLC_FOURCC('d','t','s','b') ) 
     368        { 
     369            /* With A/52 or DTS audio, we need to skip the first 4 bytes */ 
    369370            i_pes_header_size += 4; 
    370371        } 
    …… 
    372373        if ( p_es->i_fourcc == VLC_FOURCC('l','p','c','b') 
    373374              || p_es->i_fourcc == VLC_FOURCC('s','p','u','b') 
    374               || p_es->i_fourcc == VLC_FOURCC('d','t','s','b') 
    375375              || p_es->i_fourcc == VLC_FOURCC('s','d','d','b') ) 
    376376        { 

  • modules/mux/mpeg/pes.c

    r0fe9b69 r59173c6  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001, 2002 VideoLAN 
    5  * $Id: pes.c,v 1.12 2003/11/15 18:57:12 fenrir Exp $ 
     5 * $Id: pes.c,v 1.13 2003/12/01 23:39:11 gbazin Exp $ 
    66 * 
    77 * Authors: Laurent Aimar <fenrir@via.ecp.fr> 
    …… 
    6060    { 
    6161        i_extra = 1; 
    62         if( ( i_private_id&0xf8 ) == 0x80 ) 
     62        if( ( i_private_id & 0xf0 ) == 0x80 ) 
    6363        { 
    6464            i_extra += 3;