]> git.sesse.net Git - vlc/blob - src/input/decoder.c
* all: rework of the input.
[vlc] / src / input / decoder.c
1 /*****************************************************************************
2  * decoder.c: Functions for the management of decoders
3  *****************************************************************************
4  * Copyright (C) 1999-2004 VideoLAN
5  * $Id$
6  *
7  * Authors: Christophe Massiot <massiot@via.ecp.fr>
8  *          Gildas Bazin <gbazin@netcourrier.com>
9  *          Laurent Aimar <fenrir@via.ecp.fr>
10  *
11  * This program is free software; you can redistribute it and/or modify
12  * it under the terms of the GNU General Public License as published by
13  * the Free Software Foundation; either version 2 of the License, or
14  * (at your option) any later version.
15  *
16  * This program is distributed in the hope that it will be useful,
17  * but WITHOUT ANY WARRANTY; without even the implied warranty of
18  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
19  * GNU General Public License for more details.
20  *
21  * You should have received a copy of the GNU General Public License
22  * along with this program; if not, write to the Free Software
23  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
24  *****************************************************************************/
25
26 /*****************************************************************************
27  * Preamble
28  *****************************************************************************/
29 #include <stdlib.h>
30 #include <vlc/vlc.h>
31
32 #include <vlc/decoder.h>
33 #include <vlc/vout.h>
34 #include <vlc/input.h>
35
36 #include "stream_output.h"
37 #include "input_internal.h"
38
39 static decoder_t * CreateDecoder( input_thread_t *, es_format_t *, int );
40 static void        DeleteDecoder( decoder_t * );
41
42 static int         DecoderThread( decoder_t * );
43 static int         DecoderDecode( decoder_t * p_dec, block_t *p_block );
44
45 /* Buffers allocation callbacks for the decoders */
46 static aout_buffer_t *aout_new_buffer( decoder_t *, int );
47 static void aout_del_buffer( decoder_t *, aout_buffer_t * );
48
49 static picture_t *vout_new_buffer( decoder_t * );
50 static void vout_del_buffer( decoder_t *, picture_t * );
51 static void vout_link_picture( decoder_t *, picture_t * );
52 static void vout_unlink_picture( decoder_t *, picture_t * );
53
54 static es_format_t null_es_format = {0};
55
56 struct decoder_owner_sys_t
57 {
58     vlc_bool_t      b_own_thread;
59
60     input_thread_t  *p_input;
61
62     aout_instance_t *p_aout;
63     aout_input_t    *p_aout_input;
64
65     vout_thread_t   *p_vout;
66
67     sout_instance_t         *p_sout;
68     sout_packetizer_input_t *p_sout_input;
69
70     /* Some decoders require already packetized data (ie. not truncated) */
71     decoder_t *p_packetizer;
72
73     /* Current format in use by the output */
74     video_format_t video;
75     audio_format_t audio;
76     es_format_t    sout;
77
78     /* fifo */
79     block_fifo_t *p_fifo;
80 };
81
82
83 /**
84  * Spawns a new decoder thread
85  *
86  * \param p_input the input thread
87  * \param p_es the es descriptor
88  * \return the spawned decoder object
89  */
90 decoder_t *input_DecoderNew( input_thread_t *p_input,
91                              es_format_t *fmt, vlc_bool_t b_force_decoder )
92 {
93     decoder_t   *p_dec = NULL;
94     vlc_value_t val;
95
96     /* If we are in sout mode, search for packetizer module */
97     if( p_input->p_sout && !b_force_decoder )
98     {
99         /* Create the decoder configuration structure */
100         p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_PACKETIZER );
101         if( p_dec == NULL )
102         {
103             msg_Err( p_input, "could not create packetizer" );
104             return NULL;
105         }
106     }
107     else
108     {
109         /* Create the decoder configuration structure */
110         p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_DECODER );
111         if( p_dec == NULL )
112         {
113             msg_Err( p_input, "could not create decoder" );
114             return NULL;
115         }
116     }
117
118     if( !p_dec->p_module )
119     {
120         msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'.\n"
121                  "VLC probably does not support this sound or video format.",
122                  (char*)&p_dec->fmt_in.i_codec );
123
124         DeleteDecoder( p_dec );
125         vlc_object_destroy( p_dec );
126         return NULL;
127     }
128
129     if( p_input->p_sout && p_input->input.b_can_pace_control &&
130         !b_force_decoder )
131     {
132         msg_Dbg( p_input, "stream out mode -> no decoder thread" );
133         p_dec->p_owner->b_own_thread = VLC_FALSE;
134     }
135     else
136     {
137         var_Get( p_input, "minimize-threads", &val );
138         p_dec->p_owner->b_own_thread = !val.b_bool;
139     }
140
141     if( p_dec->p_owner->b_own_thread )
142     {
143         int i_priority;
144         if( fmt->i_cat == AUDIO_ES )
145             i_priority = VLC_THREAD_PRIORITY_AUDIO;
146         else
147             i_priority = VLC_THREAD_PRIORITY_VIDEO;
148
149         /* Spawn the decoder thread */
150         if( vlc_thread_create( p_dec, "decoder", DecoderThread,
151                                i_priority, VLC_FALSE ) )
152         {
153             msg_Err( p_dec, "cannot spawn decoder thread \"%s\"",
154                              p_dec->p_module->psz_object_name );
155             module_Unneed( p_dec, p_dec->p_module );
156             DeleteDecoder( p_dec );
157             vlc_object_destroy( p_dec );
158             return NULL;
159         }
160     }
161
162     return p_dec;
163 }
164
165 /**
166  * Kills a decoder thread and waits until it's finished
167  *
168  * \param p_input the input thread
169  * \param p_es the es descriptor
170  * \return nothing
171  */
172 void input_DecoderDelete( decoder_t *p_dec )
173 {
174     p_dec->b_die = VLC_TRUE;
175
176     if( p_dec->p_owner->b_own_thread )
177     {
178         /* Make sure the thread leaves the function by
179          * sending it an empty block. */
180         block_t *p_block = block_New( p_dec, 0 );
181         input_DecoderDecode( p_dec, p_block );
182
183         vlc_thread_join( p_dec );
184
185         /* Don't module_Unneed() here because of the dll loader that wants
186          * close() in the same thread than open()/decode() */
187     }
188     else
189     {
190         module_Unneed( p_dec, p_dec->p_module );
191     }
192
193     /* Delete decoder configuration */
194     DeleteDecoder( p_dec );
195
196     /* Delete the decoder */
197     vlc_object_destroy( p_dec );
198 }
199
200 /**
201  * Put a block_t in the decoder's fifo.
202  *
203  * \param p_dec the decoder object
204  * \param p_block the data block
205  */
206 void input_DecoderDecode( decoder_t * p_dec, block_t *p_block )
207 {
208     if( p_dec->p_owner->b_own_thread )
209     {
210         block_FifoPut( p_dec->p_owner->p_fifo, p_block );
211
212         if( p_dec->p_owner->p_input->b_out_pace_control )
213         {
214             /* FIXME !!!!! */
215             while( !p_dec->b_die && !p_dec->b_error &&
216                    p_dec->p_owner->p_fifo->i_depth > 10 )
217             {
218                 msleep( 1000 );
219             }
220         }
221     }
222     else
223     {
224         if( p_dec->b_error || p_block->i_buffer <= 0 )
225         {
226             block_Release( p_block );
227         }
228         else
229         {
230             DecoderDecode( p_dec, p_block );
231         }
232     }
233 }
234
235 void input_DecoderDiscontinuity( decoder_t * p_dec )
236 {
237     block_t *p_null;
238
239     /* Empty the fifo */
240     if( p_dec->p_owner->b_own_thread )
241     {
242         block_FifoEmpty( p_dec->p_owner->p_fifo );
243     }
244
245     /* Send a special block */
246     p_null = block_New( p_dec, 128 );
247     p_null->i_flags |= BLOCK_FLAG_DISCONTINUITY;
248     memset( p_null->p_buffer, 0, p_null->i_buffer );
249
250     input_DecoderDecode( p_dec, p_null );
251 }
252
253 #if 0
254 /**
255  * Create a NULL packet for padding in case of a data loss
256  *
257  * \param p_input the input thread
258  * \param p_es es descriptor
259  * \return nothing
260  */
261 static void input_NullPacket( input_thread_t * p_input,
262                               es_descriptor_t * p_es )
263 {
264 #if 0
265     block_t *p_block = block_New( p_input, PADDING_PACKET_SIZE );
266     if( p_block )
267     {
268         memset( p_block->p_buffer, 0, PADDING_PACKET_SIZE );
269         p_block->i_flags |= BLOCK_FLAG_DISCONTINUITY;
270
271         block_FifoPut( p_es->p_dec->p_owner->p_fifo, p_block );
272     }
273 #endif
274 }
275
276 /**
277  * Send a NULL packet to the decoders
278  *
279  * \param p_input the input thread
280  * \return nothing
281  */
282 void input_EscapeDiscontinuity( input_thread_t * p_input )
283 {
284 #if 0
285     unsigned int i_es, i;
286
287     for( i_es = 0; i_es < p_input->stream.i_selected_es_number; i_es++ )
288     {
289         es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es];
290
291         if( p_es->p_dec != NULL )
292         {
293             for( i = 0; i < PADDING_PACKET_NUMBER; i++ )
294             {
295                 input_NullPacket( p_input, p_es );
296             }
297         }
298     }
299 #endif
300 }
301
302 /**
303  * Send a NULL packet to the audio decoders
304  *
305  * \param p_input the input thread
306  * \return nothing
307  */
308 void input_EscapeAudioDiscontinuity( input_thread_t * p_input )
309 {
310 #if 0
311     unsigned int i_es, i;
312
313     for( i_es = 0; i_es < p_input->stream.i_selected_es_number; i_es++ )
314     {
315         es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es];
316
317         if( p_es->p_dec != NULL && p_es->i_cat == AUDIO_ES )
318         {
319             for( i = 0; i < PADDING_PACKET_NUMBER; i++ )
320             {
321                 input_NullPacket( p_input, p_es );
322             }
323         }
324     }
325 #endif
326 }
327 #endif
328
329 /**
330  * Create a decoder object
331  *
332  * \param p_input the input thread
333  * \param p_es the es descriptor
334  * \param i_object_type Object type as define in include/vlc_objects.h
335  * \return the decoder object
336  */
337 static decoder_t * CreateDecoder( input_thread_t *p_input,
338                                   es_format_t *fmt, int i_object_type )
339 {
340     decoder_t *p_dec;
341
342     p_dec = vlc_object_create( p_input, i_object_type );
343     if( p_dec == NULL )
344     {
345         msg_Err( p_input, "out of memory" );
346         return NULL;
347     }
348
349     p_dec->pf_decode_audio = 0;
350     p_dec->pf_decode_video = 0;
351     p_dec->pf_decode_sub = 0;
352     p_dec->pf_packetize = 0;
353
354     /* Initialize the decoder fifo */
355     p_dec->p_module = NULL;
356
357
358     es_format_Copy( &p_dec->fmt_in, fmt );
359     es_format_Copy( &p_dec->fmt_out, &null_es_format );
360
361     /* Allocate our private structure for the decoder */
362     p_dec->p_owner = malloc( sizeof( decoder_owner_sys_t ) );
363     if( p_dec->p_owner == NULL )
364     {
365         msg_Err( p_dec, "out of memory" );
366         return NULL;
367     }
368     p_dec->p_owner->b_own_thread = VLC_TRUE;
369     p_dec->p_owner->p_input = p_input;
370     p_dec->p_owner->p_aout = NULL;
371     p_dec->p_owner->p_aout_input = NULL;
372     p_dec->p_owner->p_vout = NULL;
373     p_dec->p_owner->p_sout = p_input->p_sout;
374     p_dec->p_owner->p_sout_input = NULL;
375     p_dec->p_owner->p_packetizer = NULL;
376
377
378     /* decoder fifo */
379     if( ( p_dec->p_owner->p_fifo = block_FifoNew( p_dec ) ) == NULL )
380     {
381         msg_Err( p_dec, "out of memory" );
382         return NULL;
383     }
384     /* Set buffers allocation callbacks for the decoders */
385     p_dec->pf_aout_buffer_new = aout_new_buffer;
386     p_dec->pf_aout_buffer_del = aout_del_buffer;
387     p_dec->pf_vout_buffer_new = vout_new_buffer;
388     p_dec->pf_vout_buffer_del = vout_del_buffer;
389     p_dec->pf_picture_link    = vout_link_picture;
390     p_dec->pf_picture_unlink  = vout_unlink_picture;
391
392     vlc_object_attach( p_dec, p_input );
393
394     /* Find a suitable decoder/packetizer module */
395     if( i_object_type == VLC_OBJECT_DECODER )
396         p_dec->p_module = module_Need( p_dec, "decoder", "$codec", 0 );
397     else
398         p_dec->p_module = module_Need( p_dec, "packetizer", "$packetizer", 0 );
399
400     /* Check if decoder requires already packetized data */
401     if( i_object_type == VLC_OBJECT_DECODER &&
402         p_dec->b_need_packetized && !p_dec->fmt_in.b_packetized )
403     {
404         p_dec->p_owner->p_packetizer =
405             vlc_object_create( p_input, VLC_OBJECT_PACKETIZER );
406         if( p_dec->p_owner->p_packetizer )
407         {
408             es_format_Copy( &p_dec->p_owner->p_packetizer->fmt_in,
409                             &p_dec->fmt_in );
410
411             es_format_Copy( &p_dec->p_owner->p_packetizer->fmt_out,
412                             &null_es_format );
413
414             vlc_object_attach( p_dec->p_owner->p_packetizer, p_input );
415
416             p_dec->p_owner->p_packetizer->p_module =
417                 module_Need( p_dec->p_owner->p_packetizer,
418                              "packetizer", "$packetizer", 0 );
419
420             if( !p_dec->p_owner->p_packetizer->p_module )
421             {
422                 es_format_Clean( &p_dec->p_owner->p_packetizer->fmt_in );
423                 vlc_object_detach( p_dec->p_owner->p_packetizer );
424                 vlc_object_destroy( p_dec->p_owner->p_packetizer );
425             }
426         }
427     }
428
429     return p_dec;
430 }
431
432 /**
433  * The decoding main loop
434  *
435  * \param p_dec the decoder
436  * \return 0
437  */
438 static int DecoderThread( decoder_t * p_dec )
439 {
440     block_t *p_block;
441
442     /* The decoder's main loop */
443     while( !p_dec->b_die && !p_dec->b_error )
444     {
445         if( ( p_block = block_FifoGet( p_dec->p_owner->p_fifo ) ) == NULL )
446         {
447             p_dec->b_error = 1;
448             break;
449         }
450         if( DecoderDecode( p_dec, p_block ) != VLC_SUCCESS )
451         {
452             break;
453         }
454     }
455
456     while( !p_dec->b_die )
457     {
458         /* Trash all received PES packets */
459         p_block = block_FifoGet( p_dec->p_owner->p_fifo );
460         if( p_block ) block_Release( p_block );
461     }
462
463     /* We do it here because of the dll loader that wants close() in the
464      * same thread than open()/decode() */
465     module_Unneed( p_dec, p_dec->p_module );
466
467     return 0;
468 }
469
470 /**
471  * Decode a block
472  *
473  * \param p_dec the decoder object
474  * \param p_block the block to decode
475  * \return VLC_SUCCESS or an error code
476  */
477 static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
478 {
479     if( p_block->i_buffer <= 0 )
480     {
481         block_Release( p_block );
482         return VLC_SUCCESS;
483     }
484
485     if( p_dec->i_object_type == VLC_OBJECT_PACKETIZER )
486     {
487         block_t *p_sout_block;
488
489         while( (p_sout_block = p_dec->pf_packetize( p_dec, &p_block )) )
490         {
491             if( !p_dec->p_owner->p_sout_input )
492             {
493                 es_format_Copy( &p_dec->p_owner->sout, &p_dec->fmt_out );
494
495                 p_dec->p_owner->sout.i_group =p_dec->fmt_in.i_group;
496                 p_dec->p_owner->sout.i_id = p_dec->fmt_in.i_id;
497                 if( p_dec->fmt_in.psz_language )
498                 {
499                     p_dec->p_owner->sout.psz_language =
500                         strdup( p_dec->fmt_in.psz_language );
501                 }
502
503                 p_dec->p_owner->p_sout_input =
504                     sout_InputNew( p_dec->p_owner->p_sout,
505                                    &p_dec->p_owner->sout );
506
507                 if( p_dec->p_owner->p_sout_input == NULL )
508                 {
509                     msg_Err( p_dec, "cannot create packetizer output" );
510                     p_dec->b_error = VLC_TRUE;
511
512                     while( p_sout_block )
513                     {
514                         block_t *p_next = p_sout_block->p_next;
515                         block_Release( p_sout_block );
516                         p_sout_block = p_next;
517                     }
518                     break;
519                 }
520             }
521
522             while( p_sout_block )
523             {
524                 block_t       *p_next = p_sout_block->p_next;
525
526                 p_sout_block->p_next = NULL;
527
528                 sout_InputSendBuffer( p_dec->p_owner->p_sout_input,
529                                       p_sout_block );
530
531                 p_sout_block = p_next;
532             }
533
534             /* For now it's enough, as only sout inpact on this flag */
535             if( p_dec->p_owner->p_sout->i_out_pace_nocontrol > 0 &&
536                 p_dec->p_owner->p_input->b_out_pace_control )
537             {
538                 msg_Dbg( p_dec, "switching to synch mode" );
539                 p_dec->p_owner->p_input->b_out_pace_control = VLC_FALSE;
540             }
541             else if( p_dec->p_owner->p_sout->i_out_pace_nocontrol <= 0 &&
542                      !p_dec->p_owner->p_input->b_out_pace_control )
543             {
544                 msg_Dbg( p_dec, "switching to asynch mode" );
545                 p_dec->p_owner->p_input->b_out_pace_control = VLC_TRUE;
546             }
547         }
548     }
549     else if( p_dec->fmt_in.i_cat == AUDIO_ES )
550     {
551         aout_buffer_t *p_aout_buf;
552
553         if( p_dec->p_owner->p_packetizer )
554         {
555             block_t *p_packetized_block;
556             decoder_t *p_packetizer = p_dec->p_owner->p_packetizer;
557
558             while( (p_packetized_block =
559                     p_packetizer->pf_packetize( p_packetizer, &p_block )) )
560             {
561                 while( (p_aout_buf =
562                         p_dec->pf_decode_audio( p_dec, &p_packetized_block )) )
563                 {
564                     aout_DecPlay( p_dec->p_owner->p_aout,
565                                   p_dec->p_owner->p_aout_input, p_aout_buf );
566                 }
567             }
568         }
569         else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
570         {
571             aout_DecPlay( p_dec->p_owner->p_aout,
572                           p_dec->p_owner->p_aout_input, p_aout_buf );
573         }
574     }
575     else if( p_dec->fmt_in.i_cat == VIDEO_ES )
576     {
577         picture_t *p_pic;
578
579         if( p_dec->p_owner->p_packetizer )
580         {
581             block_t *p_packetized_block;
582             decoder_t *p_packetizer = p_dec->p_owner->p_packetizer;
583
584             while( (p_packetized_block =
585                     p_packetizer->pf_packetize( p_packetizer, &p_block )) )
586             {
587                 while( (p_pic =
588                         p_dec->pf_decode_video( p_dec, &p_packetized_block )) )
589                 {
590                     vout_DatePicture( p_dec->p_owner->p_vout, p_pic,
591                                       p_pic->date );
592                     vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
593                 }
594             }
595         }
596         else while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
597         {
598             vout_DatePicture( p_dec->p_owner->p_vout, p_pic, p_pic->date );
599             vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
600         }
601     }
602     else if( p_dec->fmt_in.i_cat == SPU_ES )
603     {
604         p_dec->pf_decode_sub( p_dec, &p_block );
605     }
606     else
607     {
608         msg_Err( p_dec, "unknown ES format" );
609         p_dec->b_error = 1;
610     }
611
612     return p_dec->b_error ? VLC_EGENERIC : VLC_SUCCESS;
613 }
614
615 /**
616  * Destroys a decoder object
617  *
618  * \param p_dec the decoder object
619  * \return nothing
620  */
621 static void DeleteDecoder( decoder_t * p_dec )
622 {
623     vlc_object_detach( p_dec );
624
625     msg_Dbg( p_dec, "killing decoder fourcc `%4.4s', %d PES in FIFO",
626              (char*)&p_dec->fmt_in.i_codec,
627              p_dec->p_owner->p_fifo->i_depth );
628
629     /* Free all packets still in the decoder fifo. */
630     block_FifoEmpty( p_dec->p_owner->p_fifo );
631     block_FifoRelease( p_dec->p_owner->p_fifo );
632
633    /* Cleanup */
634     if( p_dec->p_owner->p_aout_input )
635         aout_DecDelete( p_dec->p_owner->p_aout, p_dec->p_owner->p_aout_input );
636
637     if( p_dec->p_owner->p_vout )
638     {
639         int i_pic;
640
641 #define p_pic p_dec->p_owner->p_vout->render.pp_picture[i_pic]
642         /* Hack to make sure all the the pictures are freed by the decoder */
643         for( i_pic = 0; i_pic < p_dec->p_owner->p_vout->render.i_pictures;
644              i_pic++ )
645         {
646             if( p_pic->i_status == RESERVED_PICTURE )
647                 vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
648             if( p_pic->i_refcount > 0 )
649                 vout_UnlinkPicture( p_dec->p_owner->p_vout, p_pic );
650         }
651 #undef p_pic
652
653         /* We are about to die. Reattach video output to p_vlc. */
654         vout_Request( p_dec, p_dec->p_owner->p_vout, 0, 0, 0, 0 );
655     }
656
657     if( p_dec->p_owner->p_sout_input )
658     {
659         sout_InputDelete( p_dec->p_owner->p_sout_input );
660         es_format_Clean( &p_dec->p_owner->sout );
661     }
662
663     es_format_Clean( &p_dec->fmt_in );
664     es_format_Clean( &p_dec->fmt_out );
665
666     if( p_dec->p_owner->p_packetizer )
667     {
668         module_Unneed( p_dec->p_owner->p_packetizer,
669                        p_dec->p_owner->p_packetizer->p_module );
670         es_format_Clean( &p_dec->p_owner->p_packetizer->fmt_in );
671         es_format_Clean( &p_dec->p_owner->p_packetizer->fmt_out );
672         vlc_object_detach( p_dec->p_owner->p_packetizer );
673         vlc_object_destroy( p_dec->p_owner->p_packetizer );
674     }
675
676     free( p_dec->p_owner );
677 }
678
679 /*****************************************************************************
680  * Buffers allocation callbacks for the decoders
681  *****************************************************************************/
682 static aout_buffer_t *aout_new_buffer( decoder_t *p_dec, int i_samples )
683 {
684     decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
685     aout_buffer_t *p_buffer;
686
687     if( p_sys->p_aout_input != NULL &&
688         ( p_dec->fmt_out.audio.i_rate != p_sys->audio.i_rate ||
689           p_dec->fmt_out.audio.i_original_channels !=
690               p_sys->audio.i_original_channels ||
691           p_dec->fmt_out.audio.i_bytes_per_frame !=
692               p_sys->audio.i_bytes_per_frame ) )
693     {
694         /* Parameters changed, restart the aout */
695         aout_DecDelete( p_sys->p_aout, p_sys->p_aout_input );
696         p_sys->p_aout_input = NULL;
697     }
698
699     if( p_sys->p_aout_input == NULL )
700     {
701         p_dec->fmt_out.audio.i_format = p_dec->fmt_out.i_codec;
702         p_sys->audio = p_dec->fmt_out.audio;
703         p_sys->p_aout_input =
704             aout_DecNew( p_dec, &p_sys->p_aout, &p_sys->audio );
705         if( p_sys->p_aout_input == NULL )
706         {
707             msg_Err( p_dec, "failed to create audio output" );
708             p_dec->b_error = VLC_TRUE;
709             return NULL;
710         }
711         p_dec->fmt_out.audio.i_bytes_per_frame =
712             p_sys->audio.i_bytes_per_frame;
713     }
714
715     p_buffer = aout_DecNewBuffer( p_sys->p_aout, p_sys->p_aout_input,
716                                   i_samples );
717
718     return p_buffer;
719 }
720
721 static void aout_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
722 {
723     aout_DecDeleteBuffer( p_dec->p_owner->p_aout,
724                           p_dec->p_owner->p_aout_input, p_buffer );
725 }
726
727 static picture_t *vout_new_buffer( decoder_t *p_dec )
728 {
729     decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
730     picture_t *p_pic;
731
732     if( p_sys->p_vout == NULL ||
733         p_dec->fmt_out.video.i_width != p_sys->video.i_width ||
734         p_dec->fmt_out.video.i_height != p_sys->video.i_height ||
735         p_dec->fmt_out.video.i_chroma != p_sys->video.i_chroma ||
736         p_dec->fmt_out.video.i_aspect != p_sys->video.i_aspect )
737     {
738         if( !p_dec->fmt_out.video.i_width ||
739             !p_dec->fmt_out.video.i_height )
740         {
741             /* Can't create a new vout without display size */
742             return NULL;
743         }
744
745         p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
746         p_sys->video = p_dec->fmt_out.video;
747
748         p_sys->p_vout = vout_Request( p_dec, p_sys->p_vout,
749                                       p_sys->video.i_width,
750                                       p_sys->video.i_height,
751                                       p_sys->video.i_chroma,
752                                       p_sys->video.i_aspect );
753
754         if( p_sys->p_vout == NULL )
755         {
756             msg_Err( p_dec, "failed to create video output" );
757             p_dec->b_error = VLC_TRUE;
758             return NULL;
759         }
760     }
761
762     /* Get a new picture */
763     while( !(p_pic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 ) ) )
764     {
765         int i_pic, i_ready_pic = 0;
766
767         if( p_dec->b_die || p_dec->b_error )
768         {
769             return NULL;
770         }
771
772 #define p_pic p_dec->p_owner->p_vout->render.pp_picture[i_pic]
773         /* Check the decoder doesn't leak pictures */
774         for( i_pic = 0; i_pic < p_dec->p_owner->p_vout->render.i_pictures;
775              i_pic++ )
776         {
777             if( p_pic->i_status == READY_PICTURE && i_ready_pic++ > 0 ) break;
778
779             if( p_pic->i_status != DISPLAYED_PICTURE &&
780                 p_pic->i_status != RESERVED_PICTURE &&
781                 p_pic->i_status != READY_PICTURE ) break;
782
783             if( !p_pic->i_refcount ) break;
784         }
785         if( i_pic == p_dec->p_owner->p_vout->render.i_pictures )
786         {
787             msg_Err( p_dec, "decoder is leaking pictures, resetting the heap" );
788
789             /* Just free all the pictures */
790             for( i_pic = 0; i_pic < p_dec->p_owner->p_vout->render.i_pictures;
791                  i_pic++ )
792             {
793                 if( p_pic->i_status == RESERVED_PICTURE )
794                     vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
795                 if( p_pic->i_refcount > 0 )
796                 vout_UnlinkPicture( p_dec->p_owner->p_vout, p_pic );
797             }
798         }
799 #undef p_pic
800
801         msleep( VOUT_OUTMEM_SLEEP );
802     }
803
804     return p_pic;
805 }
806
807 static void vout_del_buffer( decoder_t *p_dec, picture_t *p_pic )
808 {
809     vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
810 }
811
812 static void vout_link_picture( decoder_t *p_dec, picture_t *p_pic )
813 {
814     vout_LinkPicture( p_dec->p_owner->p_vout, p_pic );
815 }
816
817 static void vout_unlink_picture( decoder_t *p_dec, picture_t *p_pic )
818 {
819     vout_UnlinkPicture( p_dec->p_owner->p_vout, p_pic );
820 }