Revert the DVD LPCM header description changes; will be added back later.

[vlc] / modules / codec / lpcm.c

diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index 908fb934fc663f04bbf72e9007ecb530a63de4bb..8e62b152d41ac8bfefbc15afed91464ab9fb135e 100644 (file)
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -64,11 +64,13 @@ vlc_module_begin ()
     set_capability( "packetizer", 100 )
     set_callbacks( OpenPacketizer, CloseCommon )
 
+#ifdef ENABLE_SOUT
     add_submodule ()
     set_description( N_("Linear PCM audio encoder") )
     set_capability( "encoder", 100 )
     set_callbacks( OpenEncoder, CloseEncoder )
     add_shortcut( "lpcm" )
+#endif
 
 vlc_module_end ()
 
@@ -91,6 +93,7 @@ struct decoder_sys_t
     int      i_type;
 };
 
+#ifdef ENABLE_SOUT
 struct encoder_sys_t
 {
     int     i_channels;
@@ -101,20 +104,19 @@ struct encoder_sys_t
     int     i_buffer_used;
     int     i_frame_num;
 };
+#endif
 
 /*
  * LPCM DVD header :
- * - 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)
+ * - 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 channels - 1 (3 bits) 1 == 2 channels
- * - dynamic range (8 bits) 0x80 == neutral
+ * - start code (8 bits) == 0x80
  *
  * LPCM DVD-A header (http://dvd-audio.sourceforge.net/spec/aob.shtml)
  * - continuity counter (8 bits, clipped to 0x00-0x1f)
@@ -422,6 +424,7 @@ static void CloseCommon( vlc_object_t *p_this )
     free( p_dec->p_sys );
 }
 
+#ifdef ENABLE_SOUT
 /*****************************************************************************
  * OpenEncoder: lpcm encoder construction
  *****************************************************************************/
@@ -443,7 +446,19 @@ static int OpenEncoder( vlc_object_t *p_this )
     if( ( p_enc->p_sys = p_sys =
           (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL )
         return VLC_ENOMEM;
+    
+    /* In DVD LCPM, a frame is always 150 PTS ticks. */
+    p_sys->i_frame_samples = p_enc->fmt_in.audio.i_rate * 150 / 90000;
+    p_sys->p_buffer = (uint8_t *)malloc(
+        p_sys->i_frame_samples *
+        p_enc->fmt_in.audio.i_channels *
+        p_enc->fmt_in.audio.i_bitspersample);
+    p_sys->i_buffer_used = 0;
+    p_sys->i_frame_num = 0;
 
+    p_sys->i_channels = p_enc->fmt_in.audio.i_channels;
+    p_sys->i_rate = p_enc->fmt_in.audio.i_rate;
+    
     p_enc->pf_encode_audio = EncodeFrames;
     p_enc->fmt_in.i_codec = p_enc->fmt_out.i_codec;
 
@@ -453,20 +468,10 @@ static int OpenEncoder( vlc_object_t *p_this )
     p_enc->fmt_out.i_bitrate =
         p_enc->fmt_in.audio.i_channels *
         p_enc->fmt_in.audio.i_rate *
-        p_enc->fmt_in.audio.i_bitspersample;
-    
-    p_sys->i_channels = p_enc->fmt_in.audio.i_channels;
-    p_sys->i_rate = p_enc->fmt_in.audio.i_rate;
+        p_enc->fmt_in.audio.i_bitspersample *
+        (p_sys->i_frame_samples + LPCM_VOB_HEADER_LEN) /
+        p_sys->i_frame_samples;
     
-    /* In DVD LCPM, a frame is always 150 PTS ticks. */
-    p_sys->i_frame_samples = p_enc->fmt_in.audio.i_rate * 150 / 90000;
-    p_sys->p_buffer = (uint8_t *)malloc(
-        p_sys->i_frame_samples *
-        p_enc->fmt_in.audio.i_channels *
-        p_enc->fmt_in.audio.i_bitspersample);
-    p_sys->i_buffer_used = 0;
-    p_sys->i_frame_num = 0;
-
     return VLC_SUCCESS;
 }
 
@@ -493,6 +498,7 @@ static block_t *EncodeFrames( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
     const int i_leftover_samples = ( p_sys->i_buffer_used + p_aout_buf->i_nb_samples ) %
         p_sys->i_frame_samples;
     const int i_frame_size = p_sys->i_frame_samples * p_sys->i_channels * 2 + LPCM_VOB_HEADER_LEN;
+    const int i_start_offset = -p_sys->i_buffer_used;
 
     uint8_t i_freq_code = 0;
 
@@ -538,17 +544,14 @@ static block_t *EncodeFrames( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
         p_sys->i_buffer_used = 0;
         i_bytes_consumed += i_consume_bytes;
 
-        /* 
-         * The pts is strictly not correct if we have samples kept from
-         * a previous buffer, but the frames are so small it should be OK.
-         */
-        p_block->i_dts = p_block->i_pts = p_aout_buf->i_pts + i * p_sys->i_frame_samples * CLOCK_FREQ / p_sys->i_rate;
+        p_block->i_dts = p_block->i_pts = p_aout_buf->i_pts +
+            (i * p_sys->i_frame_samples + i_start_offset) * CLOCK_FREQ / p_sys->i_rate;
         p_block->i_length = p_sys->i_frame_samples * CLOCK_FREQ / p_sys->i_rate;
     
         if( !p_first_block )
             p_first_block = p_last_block = p_block;
         else
-            block_ChainLastAppend( &p_last_block, p_block );
+            p_last_block = p_last_block->p_next = p_block;
     }
 
     memcpy( p_sys->p_buffer,
@@ -558,6 +561,7 @@ static block_t *EncodeFrames( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
 
     return p_first_block;
 }
+#endif
 
 /*****************************************************************************
  *