X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Flpcm.c;h=1360a4f1c44965e7d7eb0bab78188cbaadb399c9;hb=5a2f258ce8cd94f83fd6f0808be2154272e632f3;hp=ffa571258415d8510301523d9cac2765a77c5165;hpb=2aeeef147747e5c8e6c4519bebbad8aacbf3021e;p=vlc

diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index ffa5712584..1360a4f1c4 100644
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -109,15 +109,17 @@ struct encoder_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)
@@ -491,7 +493,11 @@ static int OpenEncoder( vlc_object_t *p_this )
  *****************************************************************************/
 static void CloseEncoder ( vlc_object_t *p_this )
 {
-    VLC_UNUSED(p_this);
+    encoder_t     *p_enc = (encoder_t *)p_this;
+    encoder_sys_t *p_sys = p_enc->p_sys;
+
+    free( p_sys->p_buffer );
+    free( p_sys );
 }
 
 /*****************************************************************************
@@ -557,9 +563,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;
 
-        p_block->i_dts = p_block->i_pts = p_aout_buf->i_pts +
+        /* We need to find i_length by means of next_pts due to possible roundoff errors. */
+        mtime_t this_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;
+        mtime_t next_pts = p_aout_buf->i_pts +
+            ((i + 1) * p_sys->i_frame_samples + i_start_offset) * CLOCK_FREQ / p_sys->i_rate;
+
+        p_block->i_pts = p_block->i_dts = this_pts;
+        p_block->i_length = next_pts - this_pts;
 
         if( !p_first_block )
             p_first_block = p_last_block = p_block;