* common.c : audio output management of common data structures
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: common.c,v 1.4 2002/10/21 20:00:10 massiot Exp $
+ * $Id: common.c,v 1.13 2003/01/15 10:58:48 massiot Exp $
*
* 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
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->mixer.b_error = 1;
p_aout->output.b_starving = 1;
+ var_Create( p_aout, "intf-change", VLC_VAR_BOOL );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_aout, "intf-change", val );
+
vlc_object_attach( p_aout, p_parent->p_vlc );
return p_aout;
*****************************************************************************/
void aout_Delete( aout_instance_t * p_aout )
{
+ 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 );
/*****************************************************************************
* aout_FormatNbChannels : return the number of channels
*****************************************************************************/
-int aout_FormatNbChannels( audio_sample_format_t * p_format )
+unsigned int aout_FormatNbChannels( const audio_sample_format_t * p_format )
{
- int i_nb;
+ 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 };
+ unsigned int i_nb = 0, i;
- switch ( p_format->i_channels & AOUT_CHAN_MASK )
+ for ( i = 0; i < sizeof(pi_channels)/sizeof(uint32_t); i++ )
{
- case AOUT_CHAN_CHANNEL1:
- case AOUT_CHAN_CHANNEL2:
- case AOUT_CHAN_MONO:
- i_nb = 1;
- break;
-
- case AOUT_CHAN_CHANNEL:
- case AOUT_CHAN_STEREO:
- case AOUT_CHAN_DOLBY:
- i_nb = 2;
- break;
-
- case AOUT_CHAN_3F:
- case AOUT_CHAN_2F1R:
- i_nb = 3;
- break;
-
- case AOUT_CHAN_3F1R:
- case AOUT_CHAN_2F2R:
- i_nb = 4;
- break;
-
- case AOUT_CHAN_3F2R:
- i_nb = 5;
- break;
-
- default:
- i_nb = 0;
+ if ( p_format->i_physical_channels & pi_channels[i] ) i_nb++;
}
- if ( p_format->i_channels & AOUT_CHAN_LFE )
- return i_nb + 1;
- else
- return i_nb;
+ return i_nb;
}
/*****************************************************************************
case VLC_FOURCC('s','p','d','i'):
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. */
}
/*****************************************************************************
- * FormatPrintChannels : print a channel in a human-readable form
+ * aout_FormatPrintChannels : print a channel in a human-readable form
*****************************************************************************/
-static const char * FormatPrintChannels( int i_channels )
+const char * aout_FormatPrintChannels( const audio_sample_format_t * p_format )
{
- switch ( i_channels )
+ switch ( p_format->i_physical_channels & AOUT_CHAN_PHYSMASK )
{
- case AOUT_CHAN_CHANNEL: return "CHANNEL";
- case AOUT_CHAN_CHANNEL1: return "CHANNEL1";
- case AOUT_CHAN_CHANNEL2: return "CHANNEL2";
- case AOUT_CHAN_MONO: return "MONO";
- case AOUT_CHAN_STEREO: return "STEREO";
- case AOUT_CHAN_3F: return "3F";
- case AOUT_CHAN_2F1R: return "2F1R";
- case AOUT_CHAN_3F1R: return "3F1R";
- case AOUT_CHAN_2F2R: return "2F2R";
- case AOUT_CHAN_3F2R: return "3F2R";
- case AOUT_CHAN_DOLBY: return "DOLBY";
- case AOUT_CHAN_CHANNEL | AOUT_CHAN_LFE: return "CHANNEL|LFE";
- case AOUT_CHAN_CHANNEL1 | AOUT_CHAN_LFE: return "CHANNEL1|LFE";
- case AOUT_CHAN_CHANNEL2 | AOUT_CHAN_LFE: return "CHANNEL2|LFE";
- case AOUT_CHAN_MONO | AOUT_CHAN_LFE: return "MONO|LFE";
- case AOUT_CHAN_STEREO | AOUT_CHAN_LFE: return "STEREO|LFE";
- case AOUT_CHAN_3F | AOUT_CHAN_LFE: return "3F|LFE";
- case AOUT_CHAN_2F1R | AOUT_CHAN_LFE: return "2F1R|LFE";
- case AOUT_CHAN_3F1R | AOUT_CHAN_LFE: return "3F1R|LFE";
- case AOUT_CHAN_2F2R | AOUT_CHAN_LFE: return "2F2R|LFE";
- case AOUT_CHAN_3F2R | AOUT_CHAN_LFE: return "3F2R|LFE";
- case AOUT_CHAN_DOLBY | AOUT_CHAN_LFE: return "DOLBY|LFE";
+ case AOUT_CHAN_CENTER:
+ if ( (p_format->i_original_channels & AOUT_CHAN_CENTER)
+ || (p_format->i_original_channels
+ & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
+ return "Mono";
+ else if ( p_format->i_original_channels & AOUT_CHAN_LEFT )
+ 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_CENTER )
+ return "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 "2F1R";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARCENTER:
+ return "3F1R";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
+ return "2F2R";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
+ return "3F2R";
+
+ case AOUT_CHAN_CENTER | AOUT_CHAN_LFE:
+ if ( (p_format->i_original_channels & AOUT_CHAN_CENTER)
+ || (p_format->i_original_channels
+ & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
+ return "Mono/LFE";
+ else if ( p_format->i_original_channels & AOUT_CHAN_LEFT )
+ return "Left/LFE";
+ return "Right/LFE";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_LFE:
+ if ( p_format->i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+ 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) )
+ return "Stereo/Right/LFE";
+ return "Stereo/LFE";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_LFE:
+ return "3F/LFE";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER
+ | AOUT_CHAN_LFE:
+ return "2F1R/LFE";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARCENTER | AOUT_CHAN_LFE:
+ return "3F1R/LFE";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE:
+ return "2F2R/LFE";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE:
+ return "3F2R/LFE";
}
return "ERROR";
* aout_FormatPrint : print a format in a human-readable form
*****************************************************************************/
void aout_FormatPrint( aout_instance_t * p_aout, const char * psz_text,
- audio_sample_format_t * p_format )
+ 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,
- FormatPrintChannels( p_format->i_channels ) );
+ aout_FormatPrintChannels( p_format ),
+ p_format->i_frame_length, p_format->i_bytes_per_frame );
}
/*****************************************************************************
* aout_FormatsPrint : print two formats in a human-readable form
*****************************************************************************/
void aout_FormatsPrint( aout_instance_t * p_aout, const char * psz_text,
- audio_sample_format_t * p_format1,
- audio_sample_format_t * p_format2 )
+ 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,
- FormatPrintChannels( p_format1->i_channels ),
- FormatPrintChannels( p_format2->i_channels ) );
+ aout_FormatPrintChannels( p_format1 ),
+ aout_FormatPrintChannels( p_format2 ) );
}
* 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 )
{
p_fifo->p_first = NULL;
p_fifo->pp_last = &p_fifo->p_first;
{
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
{
return aout_DateGet( &p_fifo->end_date );
}
+/*****************************************************************************
+ * aout_FifoFirstDate : return the playing date of the first buffer in the
+ * FIFO
+ *****************************************************************************/
+mtime_t aout_FifoFirstDate( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
+{
+ return p_fifo->p_first ? p_fifo->p_first->start_date : 0;
+}
+
/*****************************************************************************
* aout_FifoPop : get the next buffer out of the FIFO
*****************************************************************************/
aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
{
aout_buffer_t * p_buffer;
+
p_buffer = p_fifo->p_first;
if ( p_buffer == NULL ) return NULL;
p_fifo->p_first = p_buffer->p_next;
/*****************************************************************************
* 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;
- p_date->i_remainder += i_dividend % p_date->i_divider;
+ p_date->i_remainder += (int)(i_dividend % p_date->i_divider);
if ( p_date->i_remainder >= p_date->i_divider )
{
/* This is Bresenham algorithm. */
projects / vlc / blobdiff