Attachment #419142 for bug #523366




    }

    /* */
    vlc_mutex_lock( &p_owner->lock );

    if( p_audio && p_owner->b_waiting )
    {
        p_owner->b_has_data = true;


        DecoderWaitDate( p_dec, &b_reject,
                         p_audio->i_pts - AOUT_MAX_PREPARE_TIME );
        vlc_mutex_unlock( &p_owner->lock );

        if( unlikely(p_owner->b_paused != b_paused) )
            continue; /* race with input thread? retry... */


        break;
    }
    vlc_mutex_unlock( &p_owner->lock );
}

static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )


        /* Parameters changed, restart the aout */
        vlc_mutex_lock( &p_owner->lock );

        aout_DecDelete( p_owner->p_aout );
        p_owner->p_aout = NULL;

        vlc_mutex_unlock( &p_owner->lock );
        aout_DecDelete( p_owner->p_aout );

        input_resource_PutAout( p_owner->p_resource, p_aout );
    }


        }

        vlc_mutex_lock( &p_owner->lock );

        p_owner->p_aout = p_aout;
        DecoderUpdateFormatLocked( p_dec );
        if( unlikely(p_owner->b_paused) && p_aout != NULL )

Return to bug 523366

Lines 1145-1152 Link Here

(-)src/input/decoder.c.orig (-7 / +3 lines)
1145	}	1145	}
1146		1146
1147	/* */	1147	/* */
1148	vlc_mutex_lock( &p_owner->lock );
1149
1150	if( p_audio && p_owner->b_waiting )	1148	if( p_audio && p_owner->b_waiting )
1151	{	1149	{
1152	p_owner->b_has_data = true;	1150	p_owner->b_has_data = true;
Lines 1177-1182 Link Here
1177		1175
1178	DecoderWaitDate( p_dec, &b_reject,	1176	DecoderWaitDate( p_dec, &b_reject,
1179	p_audio->i_pts - AOUT_MAX_PREPARE_TIME );	1177	p_audio->i_pts - AOUT_MAX_PREPARE_TIME );
		1178	vlc_mutex_unlock( &p_owner->lock );
1180		1179
1181	if( unlikely(p_owner->b_paused != b_paused) )	1180	if( unlikely(p_owner->b_paused != b_paused) )
1182	continue; /* race with input thread? retry... */	1181	continue; /* race with input thread? retry... */
Lines 1199-1205 Link Here
1199		1198
1200	break;	1199	break;
1201	}	1200	}
1202	vlc_mutex_unlock( &p_owner->lock );
1203	}	1201	}
1204		1202
1205	static void DecoderDecodeAudio( decoder_t p_dec, block_t p_block )	1203	static void DecoderDecodeAudio( decoder_t p_dec, block_t p_block )
Lines 1961-1971 Link Here
1961		1959
1962	/* Parameters changed, restart the aout */	1960	/* Parameters changed, restart the aout */
1963	vlc_mutex_lock( &p_owner->lock );	1961	vlc_mutex_lock( &p_owner->lock );
1964
1965	aout_DecDelete( p_owner->p_aout );
1966	p_owner->p_aout = NULL;	1962	p_owner->p_aout = NULL;
1967
1968	vlc_mutex_unlock( &p_owner->lock );	1963	vlc_mutex_unlock( &p_owner->lock );
		1964	aout_DecDelete( p_owner->p_aout );
		1965
1969	input_resource_PutAout( p_owner->p_resource, p_aout );	1966	input_resource_PutAout( p_owner->p_resource, p_aout );
1970	}	1967	}
1971		1968
Lines 2014-2020 Link Here
2014	}	2011	}
2015		2012
2016	vlc_mutex_lock( &p_owner->lock );	2013	vlc_mutex_lock( &p_owner->lock );
2017
2018	p_owner->p_aout = p_aout;	2014	p_owner->p_aout = p_aout;
2019	DecoderUpdateFormatLocked( p_dec );	2015	DecoderUpdateFormatLocked( p_dec );
2020	if( unlikely(p_owner->b_paused) && p_aout != NULL )	2016	if( unlikely(p_owner->b_paused) && p_aout != NULL )