Commit b685d614 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

filters: drain filter chains after the regular picture filtering

parent bd9c8829
...@@ -597,13 +597,13 @@ static void decoder_queue_video( decoder_t *p_dec, picture_t *p_pic ) ...@@ -597,13 +597,13 @@ static void decoder_queue_video( decoder_t *p_dec, picture_t *p_pic )
if( p_sys->p_vf2 ) if( p_sys->p_vf2 )
{ {
/* push the picture in the mosaic-struct structure */ /* push the picture in the mosaic-struct structure */
p_new_pic = filter_chain_VideoFilter( p_sys->p_vf2, NULL ); p_new_pic = filter_chain_VideoDrain( p_sys->p_vf2 );
while ( p_new_pic != NULL ) while ( p_new_pic != NULL )
{ {
vlc_global_lock( VLC_MOSAIC_MUTEX ); vlc_global_lock( VLC_MOSAIC_MUTEX );
vlc_picture_chain_Append( &p_es->pictures, p_new_pic ); vlc_picture_chain_Append( &p_es->pictures, p_new_pic );
vlc_global_unlock( VLC_MOSAIC_MUTEX ); vlc_global_unlock( VLC_MOSAIC_MUTEX );
p_new_pic = filter_chain_VideoFilter( p_sys->p_vf2, NULL ); p_new_pic = filter_chain_VideoDrain( p_sys->p_vf2 );
} }
} }
} }
......
...@@ -589,11 +589,11 @@ void VideoDecodedStream::Output(picture_t *p_pic) ...@@ -589,11 +589,11 @@ void VideoDecodedStream::Output(picture_t *p_pic)
outputbuffer->Enqueue(p_pic); outputbuffer->Enqueue(p_pic);
if(p_filters_chain) if(p_filters_chain)
{ {
p_pic = filter_chain_VideoFilter(p_filters_chain, NULL); p_pic = filter_chain_VideoDrain(p_filters_chain);
while (p_pic) while (p_pic)
{ {
outputbuffer->Enqueue(p_pic); outputbuffer->Enqueue(p_pic);
p_pic = filter_chain_VideoFilter(p_filters_chain, NULL); p_pic = filter_chain_VideoDrain(p_filters_chain);
} }
} }
} }
......
Supports Markdown
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