/*****************************************************************************
* common.c : audio output management of common data structures
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: common.c,v 1.9 2002/11/14 22:38:48 massiot Exp $
+ * Copyright (C) 2002-2007 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* calloc(), malloc(), free() */
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-
-#include "audio_output.h"
+#include <vlc_aout.h>
#include "aout_internal.h"
-
/*
* Instances management (internal and external)
*/
aout_instance_t * __aout_New( vlc_object_t * p_parent )
{
aout_instance_t * p_aout;
+ vlc_value_t val;
/* Allocate descriptor. */
p_aout = vlc_object_create( p_parent, VLC_OBJECT_AOUT );
p_aout->i_nb_inputs = 0;
p_aout->mixer.f_multiplier = 1.0;
p_aout->mixer.b_error = 1;
+ p_aout->output.b_error = 1;
p_aout->output.b_starving = 1;
- vlc_object_attach( p_aout, p_parent->p_vlc );
-
- var_Create( p_aout, "physical-channels", VLC_VAR_INTEGER );
- var_AddCallback( p_aout, "physical-channels", aout_ChannelsRestart,
- NULL );
- var_Create( p_aout, "original-channels", VLC_VAR_INTEGER );
- var_AddCallback( p_aout, "original-channels", aout_ChannelsRestart,
- NULL );
+ var_Create( p_aout, "intf-change", VLC_VAR_BOOL );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_aout, "intf-change", val );
return p_aout;
}
*****************************************************************************/
void aout_Delete( aout_instance_t * p_aout )
{
- var_Destroy( p_aout, "channels" );
+ var_Destroy( p_aout, "intf-change" );
vlc_mutex_destroy( &p_aout->input_fifos_lock );
vlc_mutex_destroy( &p_aout->mixer_lock );
vlc_mutex_destroy( &p_aout->output_fifo_lock );
/* Free structure. */
- vlc_object_destroy( p_aout );
+ vlc_object_release( p_aout );
}
/*****************************************************************************
* aout_FormatNbChannels : return the number of channels
*****************************************************************************/
-int aout_FormatNbChannels( const audio_sample_format_t * p_format )
+unsigned int aout_FormatNbChannels( const audio_sample_format_t * p_format )
{
- static const u32 pi_channels[] =
+ static const uint32_t pi_channels[] =
{ AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
AOUT_CHAN_REARCENTER, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
- AOUT_CHAN_LFE };
- int i_nb = 0, i;
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, AOUT_CHAN_LFE };
+ unsigned int i_nb = 0, i;
- for ( i = 0; i < sizeof(pi_channels)/sizeof(u32); i++ )
+ for ( i = 0; i < sizeof(pi_channels)/sizeof(uint32_t); i++ )
{
if ( p_format->i_physical_channels & pi_channels[i] ) i_nb++;
}
i_result = 2;
break;
+ case VLC_FOURCC('u','2','4','l'):
+ case VLC_FOURCC('s','2','4','l'):
+ case VLC_FOURCC('u','2','4','b'):
+ case VLC_FOURCC('s','2','4','b'):
+ i_result = 3;
+ break;
+
case VLC_FOURCC('f','l','3','2'):
case VLC_FOURCC('f','i','3','2'):
i_result = 4;
break;
case VLC_FOURCC('s','p','d','i'):
+ case VLC_FOURCC('s','p','d','b'): /* Big endian spdif output */
case VLC_FOURCC('a','5','2',' '):
case VLC_FOURCC('d','t','s',' '):
+ case VLC_FOURCC('m','p','g','a'):
+ case VLC_FOURCC('m','p','g','3'):
default:
/* For these formats the caller has to indicate the parameters
* by hand. */
return "Left";
return "Right";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
- if ( p_format->i_original_channels & AOUT_CHAN_DOLBYSTEREO )
- return "Dolby";
- else if ( p_format->i_original_channels & AOUT_CHAN_DUALMONO )
- return "Dual-mono";
- else if ( !(p_format->i_original_channels & AOUT_CHAN_RIGHT) )
- return "Stereo/Left";
- else if ( !(p_format->i_original_channels & AOUT_CHAN_LEFT) )
- return "Stereo/Right";
- return "Stereo";
+ if ( p_format->i_original_channels & AOUT_CHAN_REVERSESTEREO )
+ {
+ if ( p_format->i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+ return "Dolby/Reverse";
+ return "Stereo/Reverse";
+ }
+ else
+ {
+ if ( p_format->i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+ return "Dolby";
+ else if ( p_format->i_original_channels & AOUT_CHAN_DUALMONO )
+ return "Dual-mono";
+ else if ( p_format->i_original_channels == AOUT_CHAN_CENTER )
+ return "Stereo/Mono";
+ else if ( !(p_format->i_original_channels & AOUT_CHAN_RIGHT) )
+ return "Stereo/Left";
+ else if ( !(p_format->i_original_channels & AOUT_CHAN_LEFT) )
+ return "Stereo/Right";
+ return "Stereo";
+ }
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER:
return "3F";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER:
return "Dolby/LFE";
else if ( p_format->i_original_channels & AOUT_CHAN_DUALMONO )
return "Dual-mono/LFE";
+ else if ( p_format->i_original_channels == AOUT_CHAN_CENTER )
+ return "Mono/LFE";
else if ( !(p_format->i_original_channels & AOUT_CHAN_RIGHT) )
return "Stereo/Left/LFE";
else if ( !(p_format->i_original_channels & AOUT_CHAN_LEFT) )
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE:
return "3F2R/LFE";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT
+ | AOUT_CHAN_MIDDLERIGHT:
+ return "3F2M2R";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT
+ | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_LFE:
+ return "3F2M2R/LFE";
}
return "ERROR";
void aout_FormatPrint( aout_instance_t * p_aout, const char * psz_text,
const audio_sample_format_t * p_format )
{
- msg_Dbg( p_aout, "%s format='%4.4s' rate=%d channels=%s", psz_text,
+ msg_Dbg( p_aout, "%s '%4.4s' %d Hz %s frame=%d samples/%d bytes", psz_text,
(char *)&p_format->i_format, p_format->i_rate,
- aout_FormatPrintChannels( p_format ) );
+ aout_FormatPrintChannels( p_format ),
+ p_format->i_frame_length, p_format->i_bytes_per_frame );
}
/*****************************************************************************
const audio_sample_format_t * p_format1,
const audio_sample_format_t * p_format2 )
{
- msg_Dbg( p_aout, "%s format='%4.4s'->'%4.4s' rate=%d->%d channels=%s->%s",
+ msg_Dbg( p_aout, "%s '%4.4s'->'%4.4s' %d Hz->%d Hz %s->%s",
psz_text,
(char *)&p_format1->i_format, (char *)&p_format2->i_format,
p_format1->i_rate, p_format2->i_rate,
* aout_FifoInit : initialize the members of a FIFO
*****************************************************************************/
void aout_FifoInit( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
- u32 i_rate )
+ uint32_t i_rate )
{
+ if( i_rate == 0 )
+ {
+ msg_Err( p_aout, "initialising fifo with zero divider" );
+ }
+
p_fifo->p_first = NULL;
p_fifo->pp_last = &p_fifo->p_first;
aout_DateInit( &p_fifo->end_date, i_rate );
void aout_FifoPush( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
aout_buffer_t * p_buffer )
{
+ (void)p_aout;
*p_fifo->pp_last = p_buffer;
p_fifo->pp_last = &p_buffer->p_next;
*p_fifo->pp_last = NULL;
{
p_buffer->start_date = aout_DateGet( &p_fifo->end_date );
p_buffer->end_date = aout_DateIncrement( &p_fifo->end_date,
- p_buffer->i_nb_samples );
+ p_buffer->i_nb_samples );
}
else
{
mtime_t date )
{
aout_buffer_t * p_buffer;
+ (void)p_aout;
aout_DateSet( &p_fifo->end_date, date );
p_buffer = p_fifo->p_first;
mtime_t difference )
{
aout_buffer_t * p_buffer;
+ (void)p_aout;
aout_DateMove( &p_fifo->end_date, difference );
p_buffer = p_fifo->p_first;
*****************************************************************************/
mtime_t aout_FifoNextStart( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
{
+ (void)p_aout;
return aout_DateGet( &p_fifo->end_date );
}
*****************************************************************************/
mtime_t aout_FifoFirstDate( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
{
+ (void)p_aout;
return p_fifo->p_first ? p_fifo->p_first->start_date : 0;
}
aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
{
aout_buffer_t * p_buffer;
+ (void)p_aout;
+
p_buffer = p_fifo->p_first;
if ( p_buffer == NULL ) return NULL;
p_fifo->p_first = p_buffer->p_next;
void aout_FifoDestroy( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
{
aout_buffer_t * p_buffer;
+ (void)p_aout;
p_buffer = p_fifo->p_first;
while ( p_buffer != NULL )
aout_BufferFree( p_buffer );
p_buffer = p_next;
}
+
+ p_fifo->p_first = NULL;
+ p_fifo->pp_last = &p_fifo->p_first;
}
/*****************************************************************************
* aout_DateInit : set the divider of an audio_date_t
*****************************************************************************/
-void aout_DateInit( audio_date_t * p_date, u32 i_divider )
+void aout_DateInit( audio_date_t * p_date, uint32_t i_divider )
{
p_date->date = 0;
p_date->i_divider = i_divider;
* aout_DateIncrement : increment the date and return the result, taking
* into account rounding errors
*****************************************************************************/
-mtime_t aout_DateIncrement( audio_date_t * p_date, u32 i_nb_samples )
+mtime_t aout_DateIncrement( audio_date_t * p_date, uint32_t i_nb_samples )
{
mtime_t i_dividend = (mtime_t)i_nb_samples * 1000000;
p_date->date += i_dividend / p_date->i_divider;
return p_date->date;
}
+/*****************************************************************************
+ * aout_CheckChannelReorder : Check if we need to do some channel re-ordering
+ *****************************************************************************/
+int aout_CheckChannelReorder( const uint32_t *pi_chan_order_in,
+ const uint32_t *pi_chan_order_out,
+ uint32_t i_channel_mask,
+ int i_channels, int *pi_chan_table )
+{
+ vlc_bool_t b_chan_reorder = VLC_FALSE;
+ int i, j, k, l;
+
+ if( i_channels > AOUT_CHAN_MAX ) return VLC_FALSE;
+
+ for( i = 0, j = 0; pi_chan_order_in[i]; i++ )
+ {
+ if( !(i_channel_mask & pi_chan_order_in[i]) ) continue;
+
+ for( k = 0, l = 0; pi_chan_order_in[i] != pi_chan_order_out[k]; k++ )
+ {
+ if( i_channel_mask & pi_chan_order_out[k] ) l++;
+ }
+
+ pi_chan_table[j++] = l;
+ }
+
+ for( i = 0; i < i_channels; i++ )
+ {
+ if( pi_chan_table[i] != i ) b_chan_reorder = VLC_TRUE;
+ }
+
+ return b_chan_reorder;
+}
+
+/*****************************************************************************
+ * aout_ChannelReorder :
+ *****************************************************************************/
+void aout_ChannelReorder( uint8_t *p_buf, int i_buffer,
+ int i_channels, const int *pi_chan_table,
+ int i_bits_per_sample )
+{
+ uint8_t p_tmp[AOUT_CHAN_MAX * 4];
+ int i, j;
+
+ if( i_bits_per_sample == 8 )
+ {
+ for( i = 0; i < i_buffer / i_channels; i++ )
+ {
+ for( j = 0; j < i_channels; j++ )
+ {
+ p_tmp[pi_chan_table[j]] = p_buf[j];
+ }
+
+ memcpy( p_buf, p_tmp, i_channels );
+ p_buf += i_channels;
+ }
+ }
+ else if( i_bits_per_sample == 16 )
+ {
+ for( i = 0; i < i_buffer / i_channels / 2; i++ )
+ {
+ for( j = 0; j < i_channels; j++ )
+ {
+ p_tmp[2 * pi_chan_table[j]] = p_buf[2 * j];
+ p_tmp[2 * pi_chan_table[j] + 1] = p_buf[2 * j + 1];
+ }
+
+ memcpy( p_buf, p_tmp, 2 * i_channels );
+ p_buf += 2 * i_channels;
+ }
+ }
+ else if( i_bits_per_sample == 24 )
+ {
+ for( i = 0; i < i_buffer / i_channels / 3; i++ )
+ {
+ for( j = 0; j < i_channels; j++ )
+ {
+ p_tmp[3 * pi_chan_table[j]] = p_buf[3 * j];
+ p_tmp[3 * pi_chan_table[j] + 1] = p_buf[3 * j + 1];
+ p_tmp[3 * pi_chan_table[j] + 2] = p_buf[3 * j + 2];
+ }
+
+ memcpy( p_buf, p_tmp, 3 * i_channels );
+ p_buf += 3 * i_channels;
+ }
+ }
+ else if( i_bits_per_sample == 32 )
+ {
+ for( i = 0; i < i_buffer / i_channels / 4; i++ )
+ {
+ for( j = 0; j < i_channels; j++ )
+ {
+ p_tmp[4 * pi_chan_table[j]] = p_buf[4 * j];
+ p_tmp[4 * pi_chan_table[j] + 1] = p_buf[4 * j + 1];
+ p_tmp[4 * pi_chan_table[j] + 2] = p_buf[4 * j + 2];
+ p_tmp[4 * pi_chan_table[j] + 3] = p_buf[4 * j + 3];
+ }
+
+ memcpy( p_buf, p_tmp, 4 * i_channels );
+ p_buf += 4 * i_channels;
+ }
+ }
+}
projects / vlc / blobdiff