Commit bae3f95d authored by Christophe Massiot's avatar Christophe Massiot

* modules/codec/*: Fixed a PTS bug at the initialization of some codecs

* modules/audio_filter/resampler/coreaudio.c: Set score to 0
parent d9a789d1
/***************************************************************************** /*****************************************************************************
* ugly.c : ugly resampler (changes pitch) * coreaudio.c resampler based on CoreAudio's AudioConverter
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: coreaudio.c,v 1.1 2003/03/30 01:13:37 massiot Exp $ * $Id: coreaudio.c,v 1.2 2003/03/31 22:39:27 massiot Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Jon Lech Johansen <jon-vl@nanocrew.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -60,13 +61,13 @@ struct aout_filter_sys_t ...@@ -60,13 +61,13 @@ struct aout_filter_sys_t
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( _("audio filter for ugly resampling") ); set_description( _("audio filter using CoreAudio for resampling") );
set_capability( "audio filter", 50 ); set_capability( "audio filter", 0 );
set_callbacks( Create, Close ); set_callbacks( Create, Close );
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
* Create: allocate ugly resampler * Create: allocate resampler
*****************************************************************************/ *****************************************************************************/
static int Create( vlc_object_t *p_this ) static int Create( vlc_object_t *p_this )
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* a52.c: A/52 basic parser * a52.c: A/52 basic parser
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2002 VideoLAN * Copyright (C) 2001-2002 VideoLAN
* $Id: a52.c,v 1.21 2003/01/15 10:58:47 massiot Exp $ * $Id: a52.c,v 1.22 2003/03/31 22:39:27 massiot Exp $
* *
* Authors: Stphane Borel <stef@via.ecp.fr> * Authors: Stphane Borel <stef@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -197,6 +197,7 @@ static int RunDecoder( decoder_fifo_t *p_fifo ) ...@@ -197,6 +197,7 @@ static int RunDecoder( decoder_fifo_t *p_fifo )
p_dec->output_format.i_bytes_per_frame = i_frame_size; p_dec->output_format.i_bytes_per_frame = i_frame_size;
p_dec->output_format.i_frame_length = A52_FRAME_NB; p_dec->output_format.i_frame_length = A52_FRAME_NB;
aout_DateInit( &end_date, i_rate ); aout_DateInit( &end_date, i_rate );
aout_DateSet( &end_date, pts );
p_dec->p_aout_input = aout_DecNew( p_dec->p_fifo, p_dec->p_aout_input = aout_DecNew( p_dec->p_fifo,
&p_dec->p_aout, &p_dec->p_aout,
&p_dec->output_format ); &p_dec->output_format );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* lpcm.c: lpcm decoder module * lpcm.c: lpcm decoder module
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: lpcm.c,v 1.14 2003/03/18 01:22:13 sam Exp $ * $Id: lpcm.c,v 1.15 2003/03/31 22:39:28 massiot Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* Henri Fallon <henri@videolan.org> * Henri Fallon <henri@videolan.org>
...@@ -297,6 +297,7 @@ static void DecodeFrame( dec_thread_t * p_dec ) ...@@ -297,6 +297,7 @@ static void DecodeFrame( dec_thread_t * p_dec )
p_dec->output_format.i_physical_channels p_dec->output_format.i_physical_channels
= i_original_channels & AOUT_CHAN_PHYSMASK; = i_original_channels & AOUT_CHAN_PHYSMASK;
aout_DateInit( &p_dec->end_date, i_rate ); aout_DateInit( &p_dec->end_date, i_rate );
aout_DateSet( &p_dec->end_date, i_pts );
p_dec->p_aout_input = aout_DecNew( p_dec->p_fifo, p_dec->p_aout_input = aout_DecNew( p_dec->p_fifo,
&p_dec->p_aout, &p_dec->p_aout,
&p_dec->output_format ); &p_dec->output_format );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mpeg_audio.c: parse MPEG audio sync info and packetize the stream * mpeg_audio.c: parse MPEG audio sync info and packetize the stream
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2003 VideoLAN * Copyright (C) 2001-2003 VideoLAN
* $Id: mpeg_audio.c,v 1.13 2003/02/20 16:07:38 gbazin Exp $ * $Id: mpeg_audio.c,v 1.14 2003/03/31 22:39:28 massiot Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org> * Eric Petit <titer@videolan.org>
...@@ -272,6 +272,7 @@ static int RunDecoder( decoder_fifo_t *p_fifo ) ...@@ -272,6 +272,7 @@ static int RunDecoder( decoder_fifo_t *p_fifo )
+ MAD_BUFFER_GUARD; + MAD_BUFFER_GUARD;
p_dec->output_format.i_frame_length = i_frame_length; p_dec->output_format.i_frame_length = i_frame_length;
aout_DateInit( &end_date, i_rate ); aout_DateInit( &end_date, i_rate );
aout_DateSet( &end_date, pts );
p_dec->p_aout_input = aout_DecNew( p_dec->p_fifo, p_dec->p_aout_input = aout_DecNew( p_dec->p_fifo,
&p_dec->p_aout, &p_dec->p_aout,
&p_dec->output_format ); &p_dec->output_format );
......
...@@ -391,7 +391,7 @@ create_familiar (void) ...@@ -391,7 +391,7 @@ create_familiar (void)
gtk_widget_show (vbox3); gtk_widget_show (vbox3);
gtk_container_add (GTK_CONTAINER (mediabook), vbox3); gtk_container_add (GTK_CONTAINER (mediabook), vbox3);
network_multicast = gtk_radio_button_new_with_label (network_group, _("UDP/RTP (Adress when Multicast)")); network_multicast = gtk_radio_button_new_with_label (network_group, _("UDP/RTP (Address when Multicast)"));
network_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_multicast)); network_group = gtk_radio_button_group (GTK_RADIO_BUTTON (network_multicast));
gtk_widget_set_name (network_multicast, "network_multicast"); gtk_widget_set_name (network_multicast, "network_multicast");
gtk_widget_ref (network_multicast); gtk_widget_ref (network_multicast);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment