* Christophe Massiot <massiot@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
* Lauren Aimar <fenrir _AT_ videolan _DOT_ org >
+ * Steinar H. Gunderson <steinar+vlc@gunderson.no>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/*
* 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)
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_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;
p_enc->fmt_in.audio.i_bitspersample *
(p_sys->i_frame_samples + LPCM_VOB_HEADER_LEN) /
p_sys->i_frame_samples;
-
+
return VLC_SUCCESS;
}
*****************************************************************************/
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 );
}
/*****************************************************************************
case 32000:
i_freq_code = 3;
break;
+ default:
+ assert(0);
}
int i_bytes_consumed = 0;
memcpy( frame + 6, p_sys->p_buffer, i_kept_bytes );
memcpy( frame + 6 + i_kept_bytes, p_aout_buf->p_buffer + i_bytes_consumed, i_consume_bytes );
-
+
p_sys->i_frame_num++;
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;
else