/*****************************************************************************
* vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis.
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: vorbis.c,v 1.21 2003/10/27 17:50:54 gbazin Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: vorbis.c,v 1.28 2003/12/22 02:24:51 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* memcpy(), memset() */
-
#include <vlc/vlc.h>
-#include <vlc/aout.h>
#include <vlc/decoder.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
-#include <input_ext-dec.h>
-
-#include <vlc/input.h>
#include <ogg/ogg.h>
* decoder */
vorbis_block vb; /* local working space for packet->PCM decode */
- /*
- * Output properties
- */
- aout_instance_t *p_aout;
- aout_input_t *p_aout_input;
- audio_sample_format_t aout_format;
-
- /*
- * Packetizer output properties
- */
- sout_packetizer_input_t *p_sout_input;
- sout_format_t sout_format;
-
/*
* Common properties
*/
- audio_date_t end_date;
- int i_last_block_size;
+ audio_date_t end_date;
+ int i_last_block_size;
};
-static int pi_channels_maps[6] =
+static int pi_channels_maps[7] =
{
0,
- AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
+ AOUT_CHAN_CENTER,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
AOUT_CHAN_CENTER | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
| AOUT_CHAN_REARRIGHT,
AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE
};
/****************************************************************************
* Local prototypes
****************************************************************************/
-static int OpenDecoder ( vlc_object_t * );
-static int OpenPacketizer( vlc_object_t * );
+static int OpenDecoder ( vlc_object_t * );
+static int OpenPacketizer( vlc_object_t * );
+static void CloseDecoder ( vlc_object_t * );
+static void *DecodeBlock ( decoder_t *, block_t ** );
-static int InitDecoder ( decoder_t * );
-static int RunDecoder ( decoder_t *, block_t * );
-static int EndDecoder ( decoder_t * );
+static void *ProcessPacket ( decoder_t *, ogg_packet *, block_t ** );
-static int ProcessPacket ( decoder_t *, ogg_packet *, mtime_t );
-static int DecodePacket ( decoder_t *, ogg_packet * );
-static int SendPacket ( decoder_t *, ogg_packet * );
+static aout_buffer_t *DecodePacket ( decoder_t *, ogg_packet * );
+static block_t *SendPacket( decoder_t *, ogg_packet *, block_t * );
static void ParseVorbisComments( decoder_t * );
#else
set_capability( "decoder", 100 );
#endif
- set_callbacks( OpenDecoder, NULL );
+ set_callbacks( OpenDecoder, CloseDecoder );
add_submodule();
set_description( _("Vorbis audio packetizer") );
set_capability( "packetizer", 100 );
- set_callbacks( OpenPacketizer, NULL );
+ set_callbacks( OpenPacketizer, CloseDecoder );
#ifndef MODULE_NAME_IS_tremor
add_submodule();
set_description( _("Vorbis audio encoder") );
- set_capability( "audio encoder", 100 );
+ set_capability( "encoder", 100 );
set_callbacks( OpenEncoder, CloseEncoder );
#endif
static int OpenDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys;
- if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('v','o','r','b') )
+ if( p_dec->fmt_in.i_codec != VLC_FOURCC('v','o','r','b') )
{
return VLC_EGENERIC;
}
- p_dec->pf_init = InitDecoder;
- p_dec->pf_decode = RunDecoder;
- p_dec->pf_end = EndDecoder;
-
/* Allocate the memory needed to store the decoder's structure */
- if( ( p_dec->p_sys =
+ if( ( p_dec->p_sys = p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
{
msg_Err( p_dec, "out of memory" );
return VLC_EGENERIC;
}
- p_dec->p_sys->b_packetizer = VLC_FALSE;
+
+ /* Misc init */
+ aout_DateSet( &p_sys->end_date, 0 );
+ p_sys->b_packetizer = VLC_FALSE;
+ p_sys->i_headers = 0;
+
+ /* Take care of vorbis init */
+ vorbis_info_init( &p_sys->vi );
+ vorbis_comment_init( &p_sys->vc );
+
+ /* Set output properties */
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+#ifdef MODULE_NAME_IS_tremor
+ p_dec->fmt_out.i_codec = VLC_FOURCC('f','i','3','2');
+#else
+ p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
+#endif
+
+ /* Set callbacks */
+ p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
+ DecodeBlock;
+ p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **))
+ DecodeBlock;
return VLC_SUCCESS;
}
int i_ret = OpenDecoder( p_this );
- if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = VLC_TRUE;
+ if( i_ret == VLC_SUCCESS )
+ {
+ p_dec->p_sys->b_packetizer = VLC_TRUE;
+ p_dec->fmt_out.i_codec = VLC_FOURCC('v','o','r','b');
+ }
return i_ret;
}
-/*****************************************************************************
- * InitDecoder: Initalize the decoder
- *****************************************************************************/
-static int InitDecoder( decoder_t *p_dec )
-{
- decoder_sys_t *p_sys = p_dec->p_sys;
-
- aout_DateSet( &p_sys->end_date, 0 );
-
- p_sys->p_aout = NULL;
- p_sys->p_aout_input = NULL;
- p_sys->aout_format.i_format = VLC_FOURCC('v','o','r','b');
-
- p_sys->p_sout_input = NULL;
- p_sys->sout_format.i_cat = AUDIO_ES;
- p_sys->sout_format.i_fourcc = VLC_FOURCC( 'v', 'o', 'r', 'b' );
- p_sys->sout_format.i_block_align = 0;
- p_sys->sout_format.i_bitrate = 0;
- p_sys->sout_format.i_extra_data = 0;
- p_sys->sout_format.p_extra_data = NULL;
-
- /* Take care of vorbis init */
- vorbis_info_init( &p_sys->vi );
- vorbis_comment_init( &p_sys->vc );
-
- p_sys->i_headers = 0;
-
- return VLC_SUCCESS;
-}
-
/****************************************************************************
- * RunDecoder: the whole thing
+ * DecodeBlock: the whole thing
****************************************************************************
* This function must be fed with ogg packets.
****************************************************************************/
-static int RunDecoder( decoder_t *p_dec, block_t *p_block )
+static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
ogg_packet oggpacket;
- int i_ret;
- /* Block to Ogg packet */
- oggpacket.packet = p_block->p_buffer;
- oggpacket.bytes = p_block->i_buffer;
+ if( !pp_block ) return NULL;
+
+ if( *pp_block )
+ {
+ /* Block to Ogg packet */
+ oggpacket.packet = (*pp_block)->p_buffer;
+ oggpacket.bytes = (*pp_block)->i_buffer;
+ }
+ else
+ {
+ if( p_sys->b_packetizer ) return NULL;
+
+ /* Block to Ogg packet */
+ oggpacket.packet = NULL;
+ oggpacket.bytes = 0;
+ }
+
oggpacket.granulepos = -1;
oggpacket.b_o_s = 0;
oggpacket.e_o_s = 0;
if( vorbis_synthesis_headerin( &p_sys->vi, &p_sys->vc,
&oggpacket ) < 0 )
{
- msg_Err( p_dec->p_fifo, "This bitstream does not contain Vorbis "
+ msg_Err( p_dec, "This bitstream does not contain Vorbis "
"audio data");
- block_Release( p_block );
- return VLC_EGENERIC;
+ block_Release( *pp_block );
+ return NULL;
}
p_sys->i_headers++;
-
- if( p_sys->b_packetizer )
- {
- /* add a input for the stream ouput */
- p_sys->sout_format.i_sample_rate = p_sys->vi.rate;
- p_sys->sout_format.i_channels = p_sys->vi.channels;
- p_sys->sout_format.i_block_align = 1;
- p_sys->sout_format.i_bitrate = p_sys->vi.bitrate_nominal;
-
- p_sys->p_sout_input =
- sout_InputNew( p_dec, &p_sys->sout_format );
-
- if( !p_sys->p_sout_input )
- {
- msg_Err( p_dec, "cannot add a new stream" );
- block_Release( p_block );
- return VLC_EGENERIC;
- }
- }
- else
- {
-#ifdef MODULE_NAME_IS_tremor
- p_sys->aout_format.i_format = VLC_FOURCC('f','i','3','2');
-#else
- p_sys->aout_format.i_format = VLC_FOURCC('f','l','3','2');
-#endif
- p_sys->aout_format.i_physical_channels =
- p_sys->aout_format.i_original_channels =
- pi_channels_maps[p_sys->vi.channels];
- p_sys->aout_format.i_rate = p_sys->vi.rate;
-
- p_sys->p_aout = NULL;
- p_sys->p_aout_input = aout_DecNew( p_dec, &p_sys->p_aout,
- &p_sys->aout_format );
-
- if( p_sys->p_aout_input == NULL )
- {
- msg_Err( p_dec, "failed to create aout fifo" );
- block_Release( p_block );
- return VLC_EGENERIC;
- }
- }
+ /* Setup the format */
+ p_dec->fmt_out.audio.i_rate = p_sys->vi.rate;
+ p_dec->fmt_out.audio.i_channels = p_sys->vi.channels;
+ p_dec->fmt_out.audio.i_physical_channels =
+ p_dec->fmt_out.audio.i_original_channels =
+ pi_channels_maps[p_sys->vi.channels];
+ p_dec->fmt_out.i_bitrate = p_sys->vi.bitrate_nominal;
aout_DateInit( &p_sys->end_date, p_sys->vi.rate );
p_sys->vi.channels, p_sys->vi.rate,
p_sys->vi.bitrate_nominal );
- if( p_sys->b_packetizer )
- {
- i_ret = ProcessPacket( p_dec, &oggpacket, p_block->i_pts );
- block_Release( p_block );
- return i_ret;
- }
- else
- {
- block_Release( p_block );
- return VLC_SUCCESS;
- }
+ return ProcessPacket( p_dec, &oggpacket, pp_block );
}
if( p_sys->i_headers == 1 )
< 0 )
{
msg_Err( p_dec, "2nd Vorbis header is corrupted" );
- return VLC_EGENERIC;
+ block_Release( *pp_block );
+ return NULL;
}
p_sys->i_headers++;
-
+
ParseVorbisComments( p_dec );
- if( p_sys->b_packetizer )
- {
- i_ret = ProcessPacket( p_dec, &oggpacket, p_block->i_pts );
- block_Release( p_block );
- return i_ret;
- }
- else
- {
- block_Release( p_block );
- return VLC_SUCCESS;
- }
+ return ProcessPacket( p_dec, &oggpacket, pp_block );
}
if( p_sys->i_headers == 2 )
< 0 )
{
msg_Err( p_dec, "3rd Vorbis header is corrupted" );
- return VLC_EGENERIC;
+ block_Release( *pp_block );
+ return NULL;
}
p_sys->i_headers++;
-
+
if( !p_sys->b_packetizer )
{
/* Initialize the Vorbis packet->PCM decoder */
vorbis_block_init( &p_sys->vd, &p_sys->vb );
}
- if( p_sys->b_packetizer )
- {
- i_ret = ProcessPacket( p_dec, &oggpacket, p_block->i_pts );
- block_Release( p_block );
- return i_ret;
- }
- else
- {
- block_Release( p_block );
- return VLC_SUCCESS;
- }
+ return ProcessPacket( p_dec, &oggpacket, pp_block );
}
- i_ret = ProcessPacket( p_dec, &oggpacket, p_block->i_pts );
- block_Release( p_block );
- return i_ret;
+ return ProcessPacket( p_dec, &oggpacket, pp_block );
}
/*****************************************************************************
* ProcessPacket: processes a Vorbis packet.
*****************************************************************************/
-static int ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
- mtime_t i_pts )
+static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
+ block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block = *pp_block;
/* Date management */
- if( i_pts > 0 && i_pts != aout_DateGet( &p_sys->end_date ) )
+ if( p_block && p_block->i_pts > 0 &&
+ p_block->i_pts != aout_DateGet( &p_sys->end_date ) )
{
- aout_DateSet( &p_sys->end_date, i_pts );
+ aout_DateSet( &p_sys->end_date, p_block->i_pts );
}
if( !aout_DateGet( &p_sys->end_date ) )
{
/* We've just started the stream, wait for the first PTS. */
- return VLC_SUCCESS;
+ if( p_block ) block_Release( p_block );
+ return NULL;
}
+ *pp_block = NULL; /* To avoid being fed the same packet again */
+
if( p_sys->b_packetizer )
{
- return SendPacket( p_dec, p_oggpacket );
+ return SendPacket( p_dec, p_oggpacket, p_block );
}
else
{
- return DecodePacket( p_dec, p_oggpacket );
+ aout_buffer_t *p_aout_buffer;
+
+ if( p_sys->i_headers >= 3 )
+ p_aout_buffer = DecodePacket( p_dec, p_oggpacket );
+ else
+ p_aout_buffer = NULL;
+
+ if( p_block )
+ {
+ block_Release( p_block );
+ }
+ return p_aout_buffer;
}
}
/*****************************************************************************
* DecodePacket: decodes a Vorbis packet.
*****************************************************************************/
-static int DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
+static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
{
decoder_sys_t *p_sys = p_dec->p_sys;
int i_samples;
float **pp_pcm;
#endif
- if( vorbis_synthesis( &p_sys->vb, p_oggpacket ) == 0 )
+ if( p_oggpacket->bytes &&
+ vorbis_synthesis( &p_sys->vb, p_oggpacket ) == 0 )
vorbis_synthesis_blockin( &p_sys->vd, &p_sys->vb );
/* **pp_pcm is a multichannel float vector. In stereo, for
* the size of each channel. Convert the float values
* (-1.<=range<=1.) to whatever PCM format and write it out */
- while( ( i_samples = vorbis_synthesis_pcmout( &p_sys->vd, &pp_pcm ) ) > 0 )
+ if( ( i_samples = vorbis_synthesis_pcmout( &p_sys->vd, &pp_pcm ) ) > 0 )
{
aout_buffer_t *p_aout_buffer;
- p_aout_buffer = aout_DecNewBuffer( p_sys->p_aout, p_sys->p_aout_input,
- i_samples );
- if( !p_aout_buffer )
- {
- msg_Err( p_dec, "cannot get aout buffer" );
- return VLC_SUCCESS;
- }
+
+ p_aout_buffer =
+ p_dec->pf_aout_buffer_new( p_dec, i_samples );
+
+ if( p_aout_buffer == NULL ) return NULL;
/* Interleave the samples */
#ifdef MODULE_NAME_IS_tremor
p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date );
p_aout_buffer->end_date = aout_DateIncrement( &p_sys->end_date,
i_samples );
-
- aout_DecPlay( p_sys->p_aout, p_sys->p_aout_input, p_aout_buffer );
+ return p_aout_buffer;
+ }
+ else
+ {
+ return NULL;
}
-
}
/*****************************************************************************
- * SendPacket: send an ogg packet to the stream output.
+ * SendPacket: send an ogg dated packet to the stream output.
*****************************************************************************/
-static int SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
+static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
+ block_t *p_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- int i_block_size, i_samples;
-
- sout_buffer_t *p_sout_buffer =
- sout_BufferNew( p_sys->p_sout_input->p_sout, p_oggpacket->bytes );
-
- if( !p_sout_buffer ) return VLC_EGENERIC;
+ int i_block_size, i_samples;
i_block_size = vorbis_packet_blocksize( &p_sys->vi, p_oggpacket );
if( i_block_size < 0 ) i_block_size = 0; /* non audio packet */
i_samples = ( p_sys->i_last_block_size + i_block_size ) >> 2;
p_sys->i_last_block_size = i_block_size;
- p_dec->p_vlc->pf_memcpy( p_sout_buffer->p_buffer,
- p_oggpacket->packet,
- p_oggpacket->bytes );
-
- p_sout_buffer->i_bitrate = p_sys->vi.bitrate_nominal;
-
/* Date management */
- p_sout_buffer->i_dts = p_sout_buffer->i_pts =
- aout_DateGet( &p_sys->end_date );
+ p_block->i_dts = p_block->i_pts = aout_DateGet( &p_sys->end_date );
if( p_sys->i_headers >= 3 )
- p_sout_buffer->i_length =
- aout_DateIncrement( &p_sys->end_date, i_samples ) -
- p_sout_buffer->i_pts;
+ p_block->i_length = aout_DateIncrement( &p_sys->end_date, i_samples ) -
+ p_block->i_pts;
else
- p_sout_buffer->i_length = 0;
+ p_block->i_length = 0;
- sout_InputSendBuffer( p_sys->p_sout_input, p_sout_buffer );
-
- return VLC_SUCCESS;
+ return p_block;
}
/*****************************************************************************
{
input_thread_t *p_input = (input_thread_t *)p_dec->p_parent;
input_info_category_t *p_cat =
- input_InfoCategory( p_input, _("Vorbis Comment") );
+ input_InfoCategory( p_input, _("Vorbis comment") );
int i = 0;
char *psz_name, *psz_value, *psz_comment;
while ( i < p_dec->p_sys->vc.comments )
/*****************************************************************************
* Interleave: helper function to interleave channels
*****************************************************************************/
+static void Interleave(
#ifdef MODULE_NAME_IS_tremor
-static void Interleave( int32_t *p_out, const int32_t **pp_in,
+ int32_t *p_out, const int32_t **pp_in,
#else
-static void Interleave( float *p_out, const float **pp_in,
+ float *p_out, const float **pp_in,
#endif
int i_nb_channels, int i_samples )
{
}
/*****************************************************************************
- * EndDecoder: vorbis decoder destruction
+ * CloseDecoder: vorbis decoder destruction
*****************************************************************************/
-static int EndDecoder( decoder_t * p_dec )
+static void CloseDecoder( vlc_object_t *p_this )
{
+ decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
- if( p_sys->p_aout_input != NULL )
- {
- aout_DecDelete( p_sys->p_aout, p_sys->p_aout_input );
- }
-
- if( p_sys->p_sout_input != NULL )
- {
- sout_InputDelete( p_sys->p_sout_input );
- }
-
if( !p_sys->b_packetizer && p_sys->i_headers >= 3 )
{
vorbis_block_clear( &p_sys->vb );
vorbis_info_clear( &p_sys->vi ); /* must be called last */
free( p_sys );
-
- return VLC_SUCCESS;
}
-
#if defined(HAVE_VORBIS_VORBISENC_H) && !defined(MODULE_NAME_IS_tremor)
/*****************************************************************************
int i_samples_delay;
int i_channels;
- /*
- * Packetizer output properties
- */
- sout_packetizer_input_t *p_sout_input;
- sout_format_t sout_format;
-
/*
* Common properties
*/
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys;
- if( p_enc->i_fourcc != VLC_FOURCC('v','o','r','b') )
+ if( p_enc->fmt_out.i_codec != VLC_FOURCC('v','o','r','b') )
{
return VLC_EGENERIC;
}
p_enc->pf_header = Headers;
p_enc->pf_encode_audio = Encode;
- p_enc->format.audio.i_format = VLC_FOURCC('f','l','3','2');
+ p_enc->fmt_in.i_codec = VLC_FOURCC('f','l','3','2');
/* Initialize vorbis encoder */
vorbis_info_init( &p_sys->vi );
if( vorbis_encode_setup_managed( &p_sys->vi,
- aout_FormatNbChannels( &p_enc->format.audio ),
- p_enc->format.audio.i_rate, -1, p_enc->i_bitrate, -1 ) ||
+ p_enc->fmt_in.audio.i_channels, p_enc->fmt_in.audio.i_rate,
+ -1, p_enc->fmt_out.i_bitrate, -1 ) ||
vorbis_encode_ctl( &p_sys->vi, OV_ECTL_RATEMANAGE_AVG, NULL ) ||
- vorbis_encode_setup_init( &p_sys->vi ) ){}
+ vorbis_encode_setup_init( &p_sys->vi ) )
+ {
+ ;
+ }
/* add a comment */
vorbis_comment_init( &p_sys->vc);
vorbis_analysis_init( &p_sys->vd, &p_sys->vi );
vorbis_block_init( &p_sys->vd, &p_sys->vb );
- p_sys->i_channels = aout_FormatNbChannels( &p_enc->format.audio );
+ p_sys->i_channels = p_enc->fmt_in.audio.i_channels;
p_sys->i_last_block_size = 0;
p_sys->i_samples_delay = 0;
p_sys->i_headers = 0;
ogg_packet oggpacket;
block_t *p_block, *p_chain = NULL;
float **buffer;
- int i, j;
+ int i;
+ unsigned int j;
p_sys->i_pts = p_aout_buf->start_date -
(mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay /
- (mtime_t)p_enc->format.audio.i_rate;
+ (mtime_t)p_enc->fmt_in.audio.i_rate;
p_sys->i_samples_delay += p_aout_buf->i_nb_samples;
buffer = vorbis_analysis_buffer( &p_sys->vd, p_aout_buf->i_nb_samples );
-#if 0
- if( id->ff_dec_c->channels != id->ff_enc_c->channels )
- {
- int i, j;
-
- /* dumb downmixing */
- for( i = 0; i < id->ff_enc_c->frame_size; i++ )
- {
- for( j = 0 ; j < id->f_dst.i_channels; j++ )
- {
- p_buffer[i*id->f_dst.i_channels+j] =
- p_buffer[i*id->f_src.i_channels+j];
- }
- }
- }
-#endif
-
/* convert samples to float and uninterleave */
for( i = 0; i < p_sys->i_channels; i++ )
{
p_sys->i_last_block_size = i_block_size;
p_block->i_length = (mtime_t)1000000 *
- (mtime_t)i_samples / (mtime_t)p_enc->format.audio.i_rate;
+ (mtime_t)i_samples / (mtime_t)p_enc->fmt_in.audio.i_rate;
p_block->i_dts = p_block->i_pts = p_sys->i_pts;