Fix DVD LPCM format description in comments.

[vlc] / modules / codec / lpcm.c

diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index b64f2c881bc0fe07bcdccf7c8d35c202a66b0f63..3928065a37727e112461510d4aad70ef40cd7a9b 100644 (file)
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -72,7 +72,7 @@ struct decoder_sys_t
     /*
      * Output properties
      */
-    audio_date_t end_date;
+    date_t   end_date;
 
     /* */
     unsigned i_header_size;
@@ -81,15 +81,17 @@ struct decoder_sys_t
 
 /*
  * LPCM DVD header :
- * - frame number (8 bits)
- * - unknown (16 bits) == 0x0003 ?
- * - unknown (4 bits)
- * - current frame (4 bits)
- * - unknown (2 bits)
- * - frequency (2 bits) 0 == 48 kHz, 1 == 32 kHz, 2 == ?, 3 == ?
- * - unknown (1 bit)
+ * - number of frames in this packet (8 bits)
+ * - first access unit (16 bits) == 0x0003 ?
+ * - emphasis (1 bit)
+ * - mute (1 bit)
+ * - reserved (1 bit)
+ * - current frame (5 bits)
+ * - quantisation (2 bits) 0 == 16bps, 1 == 20bps, 2 == 24bps, 3 == illegal
+ * - frequency (2 bits) 0 == 48 kHz, 1 == 96 kHz, 2 == 44.1 kHz, 3 == 32 kHz
+ * - reserved (1 bit)
  * - number of channels - 1 (3 bits) 1 == 2 channels
- * - start code (8 bits) == 0x80
+ * - dynamic range (8 bits) 0x80 == neutral
  *
  * LPCM DVD-A header (http://dvd-audio.sourceforge.net/spec/aob.shtml)
  * - continuity counter (8 bits, clipped to 0x00-0x1f)
@@ -193,7 +195,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
 
     /* Misc init */
     p_sys->b_packetizer = b_packetizer;
-    aout_DateSet( &p_sys->end_date, 0 );
+    date_Set( &p_sys->end_date, 0 );
     p_sys->i_type = i_type;
     p_sys->i_header_size = i_header_size;
 
@@ -268,13 +270,13 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
     *pp_block = NULL; /* So the packet doesn't get re-sent */
 
     /* Date management */
-    if( p_block->i_pts > 0 &&
-        p_block->i_pts != aout_DateGet( &p_sys->end_date ) )
+    if( p_block->i_pts > VLC_TS_INVALID &&
+        p_block->i_pts != date_Get( &p_sys->end_date ) )
     {
-        aout_DateSet( &p_sys->end_date, p_block->i_pts );
+        date_Set( &p_sys->end_date, p_block->i_pts );
     }
 
-    if( !aout_DateGet( &p_sys->end_date ) )
+    if( !date_Get( &p_sys->end_date ) )
     {
         /* We've just started the stream, wait for the first PTS. */
         block_Release( p_block );
@@ -289,12 +291,11 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
     }
 
     int i_ret;
-    unsigned i_padding;
+    unsigned i_padding = 0;
     aob_group_t p_aob_group[2];
     switch( p_sys->i_type )
     {
     case LPCM_VOB:
-        i_padding = 0;
         i_ret = VobHeader( &i_rate, &i_channels, &i_original_channels, &i_bits,
                            p_block->p_buffer );
         break;
@@ -303,13 +304,12 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
                            p_aob_group,
                            p_block->p_buffer );
         break;
-    default:
-        assert(0);
     case LPCM_BD:
-        i_padding = 0;
         i_ret = BdHeader( &i_rate, &i_channels, &i_original_channels, &i_bits,
                           p_block->p_buffer );
         break;
+    default:
+        abort();
     }
 
     if( i_ret || p_block->i_buffer <= p_sys->i_header_size + i_padding )
@@ -322,8 +322,8 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
     /* Set output properties */
     if( p_dec->fmt_out.audio.i_rate != i_rate )
     {
-        aout_DateInit( &p_sys->end_date, i_rate );
-        aout_DateSet( &p_sys->end_date, p_block->i_pts );
+        date_Init( &p_sys->end_date, i_rate, 1 );
+        date_Set( &p_sys->end_date, p_block->i_pts );
     }
     p_dec->fmt_out.audio.i_rate = i_rate;
     p_dec->fmt_out.audio.i_channels = i_channels;
@@ -334,9 +334,9 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
 
     if( p_sys->b_packetizer )
     {
-        p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date );
+        p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date );
         p_block->i_length =
-            aout_DateIncrement( &p_sys->end_date, i_frame_length ) -
+            date_Increment( &p_sys->end_date, i_frame_length ) -
             p_block->i_pts;
 
         /* Just pass on the incoming frame */
@@ -362,9 +362,10 @@ static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
         if( !p_aout_buffer )
             return NULL;
 
-        p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date );
-        p_aout_buffer->end_date =
-            aout_DateIncrement( &p_sys->end_date, i_frame_length );
+        p_aout_buffer->i_pts = date_Get( &p_sys->end_date );
+        p_aout_buffer->i_length =
+            date_Increment( &p_sys->end_date, i_frame_length )
+            - p_aout_buffer->i_pts;
 
         p_block->p_buffer += p_sys->i_header_size + i_padding;
         p_block->i_buffer -= p_sys->i_header_size + i_padding;
@@ -599,7 +600,7 @@ static int AobHeader( unsigned *pi_rate,
     *pi_layout   = i_layout1   | ( b_group2_used ? i_layout2   : 0 );
 
     /* */
-    for( int i = 0; i < 2; i++ )
+    for( unsigned i = 0; i < 2; i++ )
     {
         const unsigned *p_aob = i == 0 ? p_aob_group1[i_assignment] :
                                          p_aob_group2[i_assignment];
@@ -609,7 +610,7 @@ static int AobHeader( unsigned *pi_rate,
         g[i].b_used = i == 0 || b_group2_used;
         if( !g[i].b_used )
             continue;
-        for( int j = 0; j < g[i].i_channels; j++ )
+        for( unsigned j = 0; j < g[i].i_channels; j++ )
         {
             g[i].pi_position[j] = 0;
             for( int k = 0; pi_vlc_chan_order_wg4[k] != 0; k++ )
@@ -792,16 +793,16 @@ static void AobExtract( aout_buffer_t *p_aout_buffer,
         for( int i = 0; i < 2; i++ )
         {
             const aob_group_t *g = &p_group[1-i];
-            const int i_group_size = 2 * g->i_channels * i_bits / 8;
+            const unsigned int i_group_size = 2 * g->i_channels * i_bits / 8;
 
             if( p_block->i_buffer < i_group_size )
             {
                 p_block->i_buffer = 0;
                 break;
             }
-            for( int n = 0; n < 2; n++ )
+            for( unsigned n = 0; n < 2; n++ )
             {
-                for( int j = 0; j < g->i_channels && g->b_used; j++ )
+                for( unsigned j = 0; j < g->i_channels && g->b_used; j++ )
                 {
                     const int i_src = n * g->i_channels + j;
                     const int i_dst = n * i_channels + g->pi_position[j];