X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fdec.c;h=823cce058fefe68b38533fd55ffd4bd2f92fa79a;hb=d23bca379e5eed844f90c74741f41d2107e1532b;hp=d390d0087ab292b9360da0d434577047ddb3642d;hpb=20aa3c15801a8639070a87b5bbe3958e1d6654aa;p=vlc diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c index d390d0087a..823cce058f 100644 --- a/src/audio_output/dec.c +++ b/src/audio_output/dec.c @@ -28,11 +28,9 @@ # include "config.h" #endif -#include +#include -#ifdef HAVE_ALLOCA_H -# include -#endif +#include #include #include @@ -42,9 +40,10 @@ /***************************************************************************** * aout_DecNew : create a decoder *****************************************************************************/ -static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout, +static aout_input_t * DecNew( aout_instance_t * p_aout, audio_sample_format_t *p_format, - audio_replay_gain_t *p_replay_gain ) + const audio_replay_gain_t *p_replay_gain, + const aout_request_vout_t *p_request_vout ) { aout_input_t * p_input; @@ -60,6 +59,11 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout, msg_Err( p_aout, "no audio channels" ); return NULL; } + if( p_format->i_channels != aout_FormatNbChannels( p_format ) ) + { + msg_Err( p_aout, "incompatible audio channels count with layout mask" ); + return NULL; + } if( p_format->i_rate > 192000 ) { @@ -84,10 +88,9 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout, goto error; } - p_input = malloc(sizeof(aout_input_t)); - if( p_input == NULL ) + p_input = calloc( 1, sizeof(aout_input_t)); + if( !p_input ) goto error; - memset( p_input, 0, sizeof(aout_input_t) ); vlc_mutex_init( &p_input->lock ); @@ -107,7 +110,7 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout, p_aout->pp_inputs[p_aout->i_nb_inputs] = p_input; p_aout->i_nb_inputs++; - if ( p_aout->mixer.b_error ) + if ( !p_aout->p_mixer ) { int i; @@ -131,10 +134,12 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout, /* Create other input streams. */ for ( i = 0; i < p_aout->i_nb_inputs - 1; i++ ) { - aout_lock_input( p_aout, p_aout->pp_inputs[i] ); - aout_InputDelete( p_aout, p_aout->pp_inputs[i] ); - aout_InputNew( p_aout, p_aout->pp_inputs[i] ); - aout_unlock_input( p_aout, p_aout->pp_inputs[i] ); + aout_input_t *p_input = p_aout->pp_inputs[i]; + + aout_lock_input( p_aout, p_input ); + aout_InputDelete( p_aout, p_input ); + aout_InputNew( p_aout, p_input, &p_input->request_vout ); + aout_unlock_input( p_aout, p_input ); } } else @@ -149,7 +154,7 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout, goto error; } - aout_InputNew( p_aout, p_input ); + aout_InputNew( p_aout, p_input, p_request_vout ); aout_unlock_input_fifos( p_aout ); aout_unlock_mixer( p_aout ); @@ -164,7 +169,8 @@ error: aout_input_t * __aout_DecNew( vlc_object_t * p_this, aout_instance_t ** pp_aout, audio_sample_format_t * p_format, - audio_replay_gain_t *p_replay_gain ) + const audio_replay_gain_t *p_replay_gain, + const aout_request_vout_t *p_request_video ) { aout_instance_t *p_aout = *pp_aout; if ( p_aout == NULL ) @@ -180,7 +186,7 @@ aout_input_t * __aout_DecNew( vlc_object_t * p_this, *pp_aout = p_aout; } - return DecNew( p_this, p_aout, p_format, p_replay_gain ); + return DecNew( p_aout, p_format, p_replay_gain, p_request_video ); } /***************************************************************************** @@ -223,14 +229,8 @@ int aout_DecDelete( aout_instance_t * p_aout, aout_input_t * p_input ) { aout_OutputDelete( p_aout ); aout_MixerDelete( p_aout ); - if ( var_Type( p_aout, "audio-device" ) != 0 ) - { - var_Destroy( p_aout, "audio-device" ); - } - if ( var_Type( p_aout, "audio-channels" ) != 0 ) - { - var_Destroy( p_aout, "audio-channels" ); - } + var_Destroy( p_aout, "audio-device" ); + var_Destroy( p_aout, "audio-channels" ); } aout_unlock_mixer( p_aout ); @@ -263,9 +263,9 @@ aout_buffer_t * aout_DecNewBuffer( aout_input_t * p_input, duration = (1000000 * (mtime_t)i_nb_samples) / p_input->input.i_rate; /* This necessarily allocates in the heap. */ - aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_buffer ); + p_buffer = aout_BufferAlloc( &p_input->input_alloc, duration, NULL ); if( p_buffer != NULL ) - p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame + p_buffer->i_buffer = i_nb_samples * p_input->input.i_bytes_per_frame / p_input->input.i_frame_length; /* Suppose the decoder doesn't have more than one buffered buffer */ @@ -277,7 +277,7 @@ aout_buffer_t * aout_DecNewBuffer( aout_input_t * p_input, return NULL; p_buffer->i_nb_samples = i_nb_samples; - p_buffer->start_date = p_buffer->end_date = 0; + p_buffer->i_pts = p_buffer->i_length = 0; return p_buffer; } @@ -300,10 +300,9 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input, assert( i_input_rate >= INPUT_RATE_DEFAULT / AOUT_MAX_INPUT_RATE && i_input_rate <= INPUT_RATE_DEFAULT * AOUT_MAX_INPUT_RATE ); - assert( p_buffer->start_date > 0 ); + assert( p_buffer->i_pts > 0 ); - p_buffer->end_date = p_buffer->start_date - + (mtime_t)p_buffer->i_nb_samples * 1000000 + p_buffer->i_length = (mtime_t)p_buffer->i_nb_samples * 1000000 / p_input->input.i_rate; aout_lock_input( p_aout, p_input ); @@ -322,13 +321,13 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input, mtime_t duration = (1000000 * (mtime_t)p_buffer->i_nb_samples) / p_input->input.i_rate; - aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_new_buffer ); + p_new_buffer = aout_BufferAlloc( &p_input->input_alloc, duration, NULL); vlc_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer, - p_buffer->i_nb_bytes ); + p_buffer->i_buffer ); p_new_buffer->i_nb_samples = p_buffer->i_nb_samples; - p_new_buffer->i_nb_bytes = p_buffer->i_nb_bytes; - p_new_buffer->start_date = p_buffer->start_date; - p_new_buffer->end_date = p_buffer->end_date; + p_new_buffer->i_buffer = p_buffer->i_buffer; + p_new_buffer->i_pts = p_buffer->i_pts; + p_new_buffer->i_length = p_buffer->i_length; aout_BufferFree( p_buffer ); p_buffer = p_new_buffer; p_input->b_changed = false; @@ -377,10 +376,9 @@ void aout_DecChangePause( aout_instance_t *p_aout, aout_input_t *p_input, bool b if( i_duration != 0 ) { aout_lock_mixer( p_aout ); - for( aout_buffer_t *p = p_input->fifo.p_first; p != NULL; p = p->p_next ) + for( aout_buffer_t *p = p_input->mixer.fifo.p_first; p != NULL; p = p->p_next ) { - p->start_date += i_duration; - p->end_date += i_duration; + p->i_pts += i_duration; } aout_unlock_mixer( p_aout ); } @@ -390,8 +388,8 @@ void aout_DecFlush( aout_instance_t *p_aout, aout_input_t *p_input ) { aout_lock_input_fifos( p_aout ); - aout_FifoSet( p_aout, &p_input->fifo, 0 ); - p_input->p_first_byte_to_mix = NULL; + aout_FifoSet( p_aout, &p_input->mixer.fifo, 0 ); + p_input->mixer.begin = NULL; aout_unlock_input_fifos( p_aout ); }