Changeset 15f3b0f6fa0eac7207eec34e80e1f65506d4f599

Timestamp:

27/08/02 01:00:23 (6 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1030402823 +0000

git-parent:

[44fc8c8927a693b57b9e525341167620a9915ac4]

git-author:

Christophe Massiot <massiot@videolan.org> 1030402823 +0000

Message:

* Miscellaneous S/PDIF fixes.
* New NextPTS() function, to replace CurrentPTS() (gives the PTS which will

be valid for NEXT byte).

* Fixed mono mode in the builtin mpeg audio decoder.
* Various fixes related to PTS calculation in audio decoders.

Files:

• include/input_ext-dec.h (modified) (2 diffs)
• include/vlc_symbols.h (modified) (2 diffs)
• modules/audio_filter/converter/a52tospdif.c (modified) (3 diffs)
• modules/codec/a52.c (modified) (3 diffs)
• modules/codec/a52old/a52old.c (modified) (2 diffs)
• modules/codec/mpeg_audio/decoder.c (modified) (6 diffs)
• modules/codec/mpeg_audio/decoder.h (modified) (2 diffs)
• modules/codec/mpeg_audio/generic.c (modified) (2 diffs)
• modules/codec/mpeg_audio/layer2.c (modified) (2 diffs)
• modules/codec/spdif.c (modified) (6 diffs)
• src/audio_output/input.c (modified) (2 diffs)
• src/audio_output/mixer.c (modified) (2 diffs)
• src/input/input_ext-dec.c (modified) (3 diffs)
• src/misc/modules_plugin.h (modified) (1 diff)

include/input_ext-dec.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-69 2002/08/12 22:12:50
+70 2002/08/26 23:00:22
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -227 +227 @@
-VLC_EXPORT( u32,  UnalignedGetBits,        ( bit_stream_t *, unsigned int ) );
-VLC_EXPORT( void, CurrentPTS,              ( bit_stream_t *, mtime_t *, mtime_t * ) );
+VLC_EXPORT( void, NextPTS,                 ( bit_stream_t *, mtime_t *, mtime_t * ) );
-
-/*****************************************************************************

include/vlc_symbols.h

@@ -79 +79 @@
-    void (* DecoderError_inner) ( decoder_fifo_t * p_fifo ) ;
-    void (* InitBitstream_inner) ( bit_stream_t *, decoder_fifo_t *, void ( * )( bit_stream_t *, vlc_bool_t ), void * p_callback_arg ) ;
+    void (* NextPTS_inner) ( bit_stream_t *, mtime_t *, mtime_t * ) ;
-    void (* UnalignedRemoveBits_inner) ( bit_stream_t * ) ;
-    void (* __config_PutFloat_inner) (vlc_object_t *, const char *, float) ;
@@ -160 +161 @@
-#   define InitBitstream p_symbols->InitBitstream_inner
-#   define NextDataPacket p_symbols->NextDataPacket_inner
+#   define NextPTS p_symbols->NextPTS_inner
-#   define UnalignedGetBits p_symbols->UnalignedGetBits_inner
-#   define UnalignedRemoveBits p_symbols->UnalignedRemoveBits_inner

modules/audio_filter/converter/a52tospdif.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-9 2002/08/21 22:41:59
+10 2002/08/26 23:00:22
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -99 +99 @@
-    memcpy( p_out, p_sync, 6 );
-    pi_length = (u16 *)(p_out + 6);
-
+ * 8
-
-    /* FIXME : if i_length is odd, the following code sucks. What should
@@ -106 +106 @@
-#ifndef WORDS_BIGENDIAN
-#   ifdef HAVE_SWAB
-out + 8, p_in
+in, p_out + 8
-#   else
-    p_out += 8;

modules/codec/a52.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-6 2002/08/21 22:41:59
+7 2002/08/26 23:00:22
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -168 +168 @@
-        }
-
+        /* Set the Presentation Time Stamp */
+        NextPTS( &p_dec->bit_stream, &pts, NULL );
+        if ( pts != 0 && pts != aout_DateGet( &p_dec->end_date ) )
+        {
+            aout_DateSet( &p_dec->end_date, pts );
+        }
+
-        /* Get A/52 frame header */
-        GetChunk( &p_dec->bit_stream, p_frame_buffer, 7 );
@@ -208 +215 @@
-        }
-
-        /* Set the Presentation Time Stamp */
-        CurrentPTS( &p_dec->bit_stream, &pts, NULL );
-        if ( pts != 0 && pts != aout_DateGet( &p_dec->end_date ) )
-        {
-            aout_DateSet( &p_dec->end_date, pts );
-        }
-
-        /* Get the complete frame */
-        GetChunk( &p_dec->bit_stream, p_frame_buffer + 7,

modules/codec/a52old/a52old.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-4 2002/08/23 14:05:22 sam
+5 2002/08/26 23:00:22 massiot
- *
- * Authors: Michel Lespinasse <walken@zoy.org>
@@ -187 +187 @@
-        }
-
-Curren
+Nex
-        if( i_pts != 0 && i_pts != aout_DateGet( &end_date ) )
-        {

modules/codec/mpeg_audio/decoder.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-2 2002/08/17 15:35:10 fenrir
+3 2002/08/26 23:00:22 massiot
- *
- * Authors: Michel Kaempf <maxx@via.ecp.fr>
@@ -38 +38 @@
-#include "decoder.h"
-
-SIZE 1152 /* XXX Frame size for only one channel */
+NB 1152
-
-/*****************************************************************************
@@ -84 +84 @@
-static int RunDecoder( decoder_fifo_t *p_fifo )
-{
-a
+
-    
-    /* Allocate the memory needed to store the thread's structure */
-a
+
-    {
-        msg_Err( p_fifo, "out of memory" );
@@ -97 +97 @@
-     * Initialize the thread properties
-     */
-a
+
-
-    /* 
-     * Initilize the banks
-     */
-adec->bank_0.actual = p_a
-a
-adec->bank_1.actual = p_a
-a
+dec->bank_0.actual = p_
+
+dec->bank_1.actual = p_
+
-    
-    /*
-     * Initialize bit stream 
-     */
-adec->bit_stream, p_a
+dec->bit_stream, p_
-
-    /* We do not create the audio output fifo now, but
-       it will be created when the first frame is received */
-
-
-
-
-
+
+
-
-    /* Audio decoder thread's main loop */
-adec->p_fifo->b_die) && (!p_a
-
-a
+dec->p_fifo->b_die) && (!p_
+
+
-    }
-    
-    /* If b_error is set, the audio decoder thread enters the error loop */
-a
-
-a
+
+
+
-    }
-
-    /* End of the audio decoder thread */
-a
+
-
-    return( 0 );
@@ -145 +142 @@
- * DecodeThread: decodes a mpeg frame
- *****************************************************************************/
-a
+
-{
-i_
-
+
+ 
-
-    adec_sync_info_t sync_info;
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* Create the output fifo if it doesn't exist yet */
-a
-a
-a
-
-a
+
+
+
+
+
-            {
-                /* Delete old output */
-a
-adec->p_aout, p_a
+
+dec->p_aout, p_
-            }
-
-            /* Set output configuration */
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            return;
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
-        if( !p_aout_buffer )
-        {
-a
-a
+
+
-            return;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        {
-            /* Ouch, failed decoding... We'll have to resync */
-
-
+
-        }
-        else
-        {
-adec->p_aout, p_a
+dec->p_aout, p_
-        }
-    }
@@ -225 +232 @@
- * initialization.
- *****************************************************************************/
-a
+
-{
-    /* If the audio output fifo was created, we destroy it */
-a
-
-adec->p_aout, p_a
+
+
+dec->p_aout, p_
-        
-    }
-
-    /* Destroy descriptor */
-a
-
-
+
+
+

modules/codec/mpeg_audio/decoder.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-2 2002/08/17 15:35:10 fenrir
+3 2002/08/26 23:00:22 massiot
- *
- * Authors: Michel Kaempf <maxx@via.ecp.fr>
@@ -53 +53 @@
-    aout_input_t        *p_aout_input; /* opaque */
-    audio_sample_format_t output_format;
-
-
+
-} adec_thread_t;
-

modules/codec/mpeg_audio/generic.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-2 2002/08/17 15:35:10 fenrir
+3 2002/08/26 23:00:22 massiot
- *
- * Authors: Michel Kaempf <maxx@via.ecp.fr>
@@ -47 +47 @@
-int adec_SyncFrame( adec_thread_t * p_adec, adec_sync_info_t * p_sync_info )
-{
-
-
+const 
+const 
-    {
-        0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448
-    };
-
+const 
-    {
-        0, 32, 48, 56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 384
-    };
-
+const 
-    {
-        0, 32, 48, 56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256
-    };
-
+const 
-    {
-        0,  8, 16, 24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160
-    };
-
+const 
-    {
-        NULL, NULL, mpeg2_layer2_bit_rate, mpeg2_layer1_bit_rate,

modules/codec/mpeg_audio/layer2.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-3 2002/08/17 15:35:10 fenrir
+4 2002/08/26 23:00:22 massiot
- *
- * Authors: Michel Kaempf <maxx@via.ecp.fr>
@@ -435 +435 @@
-            {
-                DCT32( &p_adec->bank_0, sample[s] );
-
-
-
-
-
-
-
+
+
+
-            }
-        }

modules/codec/spdif.c

@@ -1 +1 @@
-/*****************************************************************************
-
+/
- *****************************************************************************
- * Copyright (C) 2001-2002 VideoLAN
-6 2002/08/19 21:31:11
+7 2002/08/26 23:00:22
- *
- * Authors: St�ane Borel <stef@via.ecp.fr>
@@ -118 +118 @@
-{
-    spdif_thread_t * p_dec;
-mtime_t last_date = 0
+audio_date_t end_date
-    
-    /* Allocate the memory needed to store the thread's structure */
@@ -155 +155 @@
-        }
-
+        /* Set the Presentation Time Stamp */
+        NextPTS( &p_dec->bit_stream, &pts, NULL );
+        if ( pts != 0 && pts != aout_DateGet( &end_date ) )
+        {
+            aout_DateSet( &end_date, pts );
+        }
+
-        /* Get A/52 frame header */
-        GetChunk( &p_dec->bit_stream, p_header, 7 );
@@ -184 +191 @@
-            p_dec->output_format.i_bytes_per_frame = i_frame_size;
-            p_dec->output_format.i_frame_length = A52_FRAME_NB;
-/* p_dec->output_format.i_channels = i_channels; */
+aout_DateInit( &end_date, i_rate );
-            p_dec->p_aout_input = aout_InputNew( p_dec->p_fifo,
-                                                 &p_dec->p_aout,
@@ -196 +203 @@
-        }
-
-
-
-
-
-
-
-
-
+
-        {
-            byte_t p_junk[3840];
@@ -215 +215 @@
-                                   A52_FRAME_NB );
-        if ( p_buffer == NULL ) return -1;
-
-
-
-
+
+
+
-
-        /* Get the whole frame. */

src/audio_output/input.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-8 2002/08/24 10:19:43 sam
+9 2002/08/26 23:00:23 massiot
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -30 +30 @@
-#include <vlc/vlc.h>
-
+#ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#endif
+
-#include "audio_output.h"
-#include "aout_internal.h"

src/audio_output/mixer.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-9 2002/08/21 22:41:59
+10 2002/08/26 23:00:23
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -250 +250 @@
-        return -1;
-    }
-
-
+
+
+
+
+
-                              * p_aout->mixer.mixer.i_bytes_per_frame
-                              / p_aout->mixer.mixer.i_frame_length;
+    }
-    p_output_buffer->start_date = start_date;
-    p_output_buffer->end_date = end_date;

src/input/input_ext-dec.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-3 2002/07/24 15:21:47 sam
+4 2002/08/26 23:00:23 massiot
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -430 +430 @@
-    /* Check if the current PTS is already valid (ie. if the first byte
-     * of the packet has already been used in the decoder). */
-byte - p_bit_stream->p_pts_validity
+pts_validity - p_bit_stream->p_byte
-    if( p_diff < 0 || p_diff > 4 /* We are far away so it is valid */
-         || (p_diff * 8) >= p_bit_stream->fifo.i_available
@@ -447 +447 @@
-}
-
+/*****************************************************************************
+ * NextPTS: returns the PTS and DTS for the next starting byte
+ *****************************************************************************/
+void NextPTS( bit_stream_t * p_bit_stream, mtime_t * pi_pts,
+              mtime_t * pi_dts )
+{
+    /* Check if the current PTS is already valid (ie. if the first byte
+     * of the packet has already been used in the decoder). */
+    ptrdiff_t p_diff = p_bit_stream->p_pts_validity - p_bit_stream->p_byte - 1;
+    if( p_diff < 0 || p_diff > 4 /* We are far away so it is valid */
+         || (p_diff * 8) >= p_bit_stream->fifo.i_available
+            /* We have buffered less bytes than actually read */ )
+    {
+        *pi_pts = p_bit_stream->i_pts;
+        if( pi_dts != NULL ) *pi_dts = p_bit_stream->i_dts;
+        p_bit_stream->i_pts = 0;
+        p_bit_stream->i_dts = 0;
+    }
+    else
+    {
+        *pi_pts = 0;
+        if( pi_dts != NULL) *pi_dts = 0;
+    }
+}
+

src/misc/modules_plugin.h

@@ -215 +215 @@
-    (p_symbols)->UnalignedGetBits_inner = UnalignedGetBits; \
-    (p_symbols)->CurrentPTS_inner = CurrentPTS; \
+    (p_symbols)->NextPTS_inner = NextPTS; \
-    (p_symbols)->DecoderError_inner = DecoderError; \
-    (p_symbols)->__input_SetStatus_inner = __input_SetStatus; \