libmpeg2.c 21.5 KB
Newer Older
gbazin's avatar
 
gbazin committed
1 2 3 4
/*****************************************************************************
 * libmpeg2.c: mpeg2 video decoder module making use of libmpeg2.
 *****************************************************************************
 * Copyright (C) 1999-2001 VideoLAN
5
 * $Id: libmpeg2.c,v 1.22 2003/06/10 23:01:40 massiot Exp $
gbazin's avatar
 
gbazin committed
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * 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
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/
#include <vlc/vlc.h>
#include <vlc/vout.h>
#include <vlc/input.h>
#include <vlc/decoder.h>

#include <stdlib.h>                                      /* malloc(), free() */
#include <string.h>                                    /* memcpy(), memset() */

#include <mpeg2dec/mpeg2.h>

37 38
#include "vout_synchro.h"

gbazin's avatar
 
gbazin committed
39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
/* Aspect ratio (ISO/IEC 13818-2 section 6.3.3, table 6-3) */
#define AR_SQUARE_PICTURE       1                           /* square pixels */
#define AR_3_4_PICTURE          2                        /* 3:4 picture (TV) */
#define AR_16_9_PICTURE         3              /* 16:9 picture (wide screen) */
#define AR_221_1_PICTURE        4                  /* 2.21:1 picture (movie) */

/*****************************************************************************
 * dec_thread_t : libmpeg2 decoder thread descriptor
 *****************************************************************************/
typedef struct dec_thread_t
{
    /*
     * libmpeg2 properties
     */
    mpeg2dec_t          *p_mpeg2dec;
    const mpeg2_info_t  *p_info;
55
    vlc_bool_t          b_skip;
gbazin's avatar
 
gbazin committed
56 57 58 59 60 61 62 63 64 65

    /*
     * Input properties
     */
    decoder_fifo_t   *p_fifo;                  /* stores the PES stream data */
    pes_packet_t     *p_pes;                  /* current PES we are decoding */
    mtime_t          i_pts;
    mtime_t          i_previous_pts;
    mtime_t          i_current_pts;
    mtime_t          i_period_remainder;
66 67
    int              i_current_rate;
    picture_t *      p_picture_to_destroy;
68 69 70 71
    vlc_bool_t       b_garbage_pic;
    vlc_bool_t       b_after_sequence_header; /* is it the next frame after
                                               * the sequence header ?    */
    vlc_bool_t       b_slice_i;             /* intra-slice refresh stream */
gbazin's avatar
 
gbazin committed
72 73 74 75 76

    /*
     * Output properties
     */
    vout_thread_t *p_vout;
77
    vout_synchro_t *p_synchro;
gbazin's avatar
 
gbazin committed
78 79 80 81 82 83 84 85 86 87

} dec_thread_t;

/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
static int  OpenDecoder  ( vlc_object_t * );
static int  RunDecoder   ( decoder_fifo_t * );
static void CloseDecoder ( dec_thread_t * );

gbazin's avatar
 
gbazin committed
88 89
static picture_t *GetNewPicture( dec_thread_t *, uint8_t ** );

gbazin's avatar
 
gbazin committed
90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114
/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
vlc_module_begin();
    set_description( _("MPEG I/II video decoder (using libmpeg2)") );
    set_capability( "decoder", 40 );
    set_callbacks( OpenDecoder, NULL );
    add_shortcut( "libmpeg2" );
vlc_module_end();

/*****************************************************************************
 * OpenDecoder: probe the decoder and return score
 *****************************************************************************/
static int OpenDecoder( vlc_object_t *p_this )
{
    decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this;

    if( p_fifo->i_fourcc != VLC_FOURCC('m','p','g','v') )
    {
        return VLC_EGENERIC;
    }

    p_fifo->pf_run = RunDecoder;
    return VLC_SUCCESS;
}
115

gbazin's avatar
 
gbazin committed
116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140
/*****************************************************************************
 * RunDecoder: the libmpeg2 decoder
 *****************************************************************************/
static int RunDecoder( decoder_fifo_t *p_fifo )
{
    dec_thread_t    *p_dec;
    data_packet_t   *p_data = NULL;
    mpeg2_state_t   state;
    picture_t       *p_pic;
    int             i_aspect, i_chroma;

    /* Allocate the memory needed to store the thread's structure */
    if( (p_dec = (dec_thread_t *)malloc (sizeof(dec_thread_t)) )
        == NULL)
    {
        msg_Err( p_fifo, "out of memory" );
        goto error;
    }

    /* Initialize the thread properties */
    memset( p_dec, 0, sizeof(dec_thread_t) );
    p_dec->p_fifo     = p_fifo;
    p_dec->p_pes      = NULL;
    p_dec->p_vout     = NULL;
    p_dec->p_mpeg2dec = NULL;
gbazin's avatar
 
gbazin committed
141
    p_dec->p_synchro  = NULL;
gbazin's avatar
 
gbazin committed
142 143 144 145 146
    p_dec->p_info     = NULL;
    p_dec->i_pts      = mdate() + DEFAULT_PTS_DELAY;
    p_dec->i_current_pts  = 0;
    p_dec->i_previous_pts = 0;
    p_dec->i_period_remainder = 0;
147
    p_dec->p_picture_to_destroy = NULL;
148 149
    p_dec->b_garbage_pic = 0;
    p_dec->b_slice_i  = 0;
150
    p_dec->b_skip     = 0;
gbazin's avatar
 
gbazin committed
151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181

    /* Initialize decoder */
    p_dec->p_mpeg2dec = mpeg2_init();
    if( p_dec->p_mpeg2dec == NULL)
        goto error;

    p_dec->p_info = mpeg2_info( p_dec->p_mpeg2dec );

    /* libmpeg2 decoder thread's main loop */
    while( (!p_dec->p_fifo->b_die) && (!p_dec->p_fifo->b_error) )
    {
        state = mpeg2_parse( p_dec->p_mpeg2dec );

        switch( state )
        {
        case STATE_BUFFER:
            /* Feed libmpeg2 a data packet at a time */
            if( p_data == NULL )
            {
                /* Get the next PES */
                if( p_dec->p_pes )
                    input_DeletePES( p_dec->p_fifo->p_packets_mgt,
                                     p_dec->p_pes );

                input_ExtractPES( p_dec->p_fifo, &p_dec->p_pes );
                if( !p_dec->p_pes )
                {
                    p_dec->p_fifo->b_error = 1;
                    break;
                }

182 183
                if( p_dec->p_pes->b_discontinuity && p_dec->p_synchro 
                     && p_dec->p_info->sequence->width != (unsigned)-1 )
184 185
                {
                    vout_SynchroReset( p_dec->p_synchro );
186 187
                    if ( p_dec->p_info->current_fbuf != NULL
                          && p_dec->p_info->current_fbuf->id != NULL )
188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218
                    {
                        p_dec->b_garbage_pic = 1;
                        p_pic = p_dec->p_info->current_fbuf->id;
                    }
                    else
                    {
                        uint8_t *buf[3];
                        buf[0] = buf[1] = buf[2] = NULL;
                        if( (p_pic = GetNewPicture( p_dec, buf )) == NULL )
                            break;
                        mpeg2_set_buf( p_dec->p_mpeg2dec, buf, p_pic );
                    }
                    p_dec->p_picture_to_destroy = p_pic;

                    memset( p_pic->p[0].p_pixels, 0,
                            p_dec->p_info->sequence->width
                             * p_dec->p_info->sequence->height );
                    memset( p_pic->p[1].p_pixels, 0x80,
                            p_dec->p_info->sequence->width
                             * p_dec->p_info->sequence->height / 4 );
                    memset( p_pic->p[2].p_pixels, 0x80,
                            p_dec->p_info->sequence->width
                             * p_dec->p_info->sequence->height / 4 );

                    if ( p_dec->b_slice_i )
                    {
                        vout_SynchroNewPicture( p_dec->p_synchro,
                            I_CODING_TYPE, 2, 0, 0, p_dec->i_current_rate );
                        vout_SynchroDecode( p_dec->p_synchro );
                        vout_SynchroEnd( p_dec->p_synchro, I_CODING_TYPE, 0 );
                    }
219 220
                }

gbazin's avatar
 
gbazin committed
221 222 223 224 225 226 227
                if( p_dec->p_pes->i_pts )
                {
                    mpeg2_pts( p_dec->p_mpeg2dec,
                               (uint32_t)p_dec->p_pes->i_pts );
                    p_dec->i_previous_pts = p_dec->i_current_pts;
                    p_dec->i_current_pts = p_dec->p_pes->i_pts;
                }
228 229

                p_dec->i_current_rate = p_dec->p_pes->i_rate;
gbazin's avatar
 
gbazin committed
230 231 232 233 234 235 236 237 238 239 240 241 242 243
                p_data = p_dec->p_pes->p_first;
            }

            if( p_data != NULL )
            {
                mpeg2_buffer( p_dec->p_mpeg2dec,
                              p_data->p_payload_start,
                              p_data->p_payload_end );

                p_data = p_data->p_next;
            }
            break;

        case STATE_SEQUENCE:
gbazin's avatar
 
gbazin committed
244
        {
gbazin's avatar
 
gbazin committed
245
            /* Initialize video output */
gbazin's avatar
 
gbazin committed
246
            uint8_t *buf[3];
247
            buf[0] = buf[1] = buf[2] = NULL;
gbazin's avatar
 
gbazin committed
248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275

            /* Check whether the input gives a particular aspect ratio */
            if( p_dec->p_fifo->p_demux_data
                && ( *(int*)(p_dec->p_fifo->p_demux_data) & 0x7 ) )
            {
                i_aspect = *(int*)(p_dec->p_fifo->p_demux_data);
                switch( i_aspect )
                {
                case AR_3_4_PICTURE:
                    i_aspect = VOUT_ASPECT_FACTOR * 4 / 3;
                    break;
                case AR_16_9_PICTURE:
                    i_aspect = VOUT_ASPECT_FACTOR * 16 / 9;
                    break;
                case AR_221_1_PICTURE:
                    i_aspect = VOUT_ASPECT_FACTOR * 221 / 100;
                    break;
                case AR_SQUARE_PICTURE:
                default:
                    i_aspect = VOUT_ASPECT_FACTOR *
                                   p_dec->p_info->sequence->width /
                                   p_dec->p_info->sequence->height;
                    break;
                }
            }
            else
            {
                /* Use the value provided in the MPEG sequence header */
gbazin's avatar
 
gbazin committed
276
                i_aspect = ((uint64_t)p_dec->p_info->sequence->display_width) *
gbazin's avatar
 
gbazin committed
277
                    p_dec->p_info->sequence->pixel_width * VOUT_ASPECT_FACTOR /
gbazin's avatar
 
gbazin committed
278
                    p_dec->p_info->sequence->display_height /
gbazin's avatar
 
gbazin committed
279 280 281 282 283 284 285 286 287
                    p_dec->p_info->sequence->pixel_height;
            }

            i_chroma = VLC_FOURCC('Y','V','1','2');

            p_dec->p_vout = vout_Request( p_dec->p_fifo, p_dec->p_vout,
                                          p_dec->p_info->sequence->width,
                                          p_dec->p_info->sequence->height,
                                          i_chroma, i_aspect );
gbazin's avatar
 
gbazin committed
288

289 290 291 292 293 294
            msg_Dbg( p_dec->p_fifo, "%dx%d, aspect %d, %u.%03u fps",
                     p_dec->p_info->sequence->width,
                     p_dec->p_info->sequence->height, i_aspect,
                     (u32)((u64)1001000000 * 27 / p_dec->p_info->sequence->frame_period / 1001),
                     (u32)((u64)1001000000 * 27 / p_dec->p_info->sequence->frame_period % 1001) );

gbazin's avatar
 
gbazin committed
295 296 297
            mpeg2_custom_fbuf( p_dec->p_mpeg2dec, 1 );

            /* Set the first 2 reference frames */
298
            mpeg2_set_buf( p_dec->p_mpeg2dec, buf, NULL );
299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316

            if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) break;
            memset( p_pic->p[0].p_pixels, 0,
                    p_dec->p_info->sequence->width
                     * p_dec->p_info->sequence->height );
            memset( p_pic->p[1].p_pixels, 0x80,
                    p_dec->p_info->sequence->width
                     * p_dec->p_info->sequence->height / 4 );
            memset( p_pic->p[2].p_pixels, 0x80,
                    p_dec->p_info->sequence->width
                     * p_dec->p_info->sequence->height / 4 );
            mpeg2_set_buf( p_dec->p_mpeg2dec, buf, p_pic );
            /* This picture will never go through display_picture. */
            vout_DatePicture( p_dec->p_vout, p_pic, 0 );
            vout_DisplayPicture( p_dec->p_vout, p_pic );
            /* For some reason, libmpeg2 will put this pic twice in
             * discard_picture. This can be considered a bug in libmpeg2. */
            vout_LinkPicture( p_dec->p_vout, p_pic );
317

318 319 320 321
            if ( p_dec->p_synchro )
            {
                vout_SynchroRelease( p_dec->p_synchro );
            }
322
            p_dec->p_synchro = vout_SynchroInit( p_dec->p_fifo, p_dec->p_vout,
323
                (u32)((u64)1001000000 * 27 / p_dec->p_info->sequence->frame_period) );
324
            p_dec->b_after_sequence_header = 1;
gbazin's avatar
 
gbazin committed
325 326
        }
        break;
gbazin's avatar
 
gbazin committed
327

328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344
        case STATE_PICTURE_2ND:
            vout_SynchroNewPicture( p_dec->p_synchro,
                p_dec->p_info->current_picture->flags & PIC_MASK_CODING_TYPE,
                p_dec->p_info->current_picture->nb_fields,
                0, 0,
                p_dec->i_current_rate );

            if ( p_dec->b_skip )
            {
                vout_SynchroTrash( p_dec->p_synchro );
            }
            else
            {
                vout_SynchroDecode( p_dec->p_synchro );
            }
            break;

gbazin's avatar
 
gbazin committed
345 346 347
        case STATE_PICTURE:
        {
            uint8_t *buf[3];
348 349
            buf[0] = buf[1] = buf[2] = NULL;

350 351 352 353 354 355 356 357 358 359 360 361 362 363 364
            if ( p_dec->b_after_sequence_header
                  && ((p_dec->p_info->current_picture->flags
                        & PIC_MASK_CODING_TYPE)
                       == PIC_FLAG_CODING_TYPE_P) )
            {
                /* Intra-slice refresh. Simulate a blank I picture. */
                msg_Dbg( p_dec->p_fifo, "intra-slice refresh stream" );
                vout_SynchroNewPicture( p_dec->p_synchro,
                    I_CODING_TYPE, 2, 0, 0, p_dec->i_current_rate );
                vout_SynchroDecode( p_dec->p_synchro );
                vout_SynchroEnd( p_dec->p_synchro, I_CODING_TYPE, 0 );
                p_dec->b_slice_i = 1;
            }
            p_dec->b_after_sequence_header = 0;

365 366 367 368 369 370 371 372 373 374
            vout_SynchroNewPicture( p_dec->p_synchro,
                p_dec->p_info->current_picture->flags & PIC_MASK_CODING_TYPE,
                p_dec->p_info->current_picture->nb_fields,
                (p_dec->p_info->current_picture->flags & PIC_FLAG_PTS) ?
                    ( (p_dec->p_info->current_picture->pts ==
                                (uint32_t)p_dec->i_current_pts) ?
                              p_dec->i_current_pts : p_dec->i_previous_pts ) : 0,
                0,
                p_dec->i_current_rate );

375 376 377 378 379 380
            if ( !(p_dec->b_slice_i
                   && ((p_dec->p_info->current_picture->flags
                         & PIC_MASK_CODING_TYPE) == P_CODING_TYPE))
                   && !vout_SynchroChoose( p_dec->p_synchro,
                              p_dec->p_info->current_picture->flags
                                & PIC_MASK_CODING_TYPE ) )
381 382
            {
                mpeg2_skip( p_dec->p_mpeg2dec, 1 );
383
                p_dec->b_skip = 1;
384 385 386 387
                vout_SynchroTrash( p_dec->p_synchro );
                mpeg2_set_buf( p_dec->p_mpeg2dec, buf, NULL );
            }
            else
gbazin's avatar
 
gbazin committed
388
            {
389
                mpeg2_skip( p_dec->p_mpeg2dec, 0 );
390
                p_dec->b_skip = 0;
391 392 393
                vout_SynchroDecode( p_dec->p_synchro );
                if( (p_pic = GetNewPicture( p_dec, buf )) == NULL ) break;
                mpeg2_set_buf( p_dec->p_mpeg2dec, buf, p_pic );
gbazin's avatar
 
gbazin committed
394 395
            }
        }
396
        break;
gbazin's avatar
 
gbazin committed
397 398

        case STATE_END:
399
        case STATE_SLICE:
gbazin's avatar
 
gbazin committed
400 401 402 403 404
            if( p_dec->p_info->display_fbuf
                && p_dec->p_info->display_fbuf->id )
            {
                p_pic = (picture_t *)p_dec->p_info->display_fbuf->id;

405
                vout_SynchroEnd( p_dec->p_synchro,
406 407
                            p_dec->p_info->display_picture->flags
                             & PIC_MASK_CODING_TYPE,
408 409 410 411 412 413 414 415 416 417 418 419 420
                            p_dec->b_garbage_pic );
                p_dec->b_garbage_pic = 0;
                vout_DisplayPicture( p_dec->p_vout, p_pic );

                if ( p_dec->p_picture_to_destroy != p_pic )
                {
                    vout_DatePicture( p_dec->p_vout, p_pic,
                        vout_SynchroDate( p_dec->p_synchro ) );
                }
                else
                {
                    p_dec->p_picture_to_destroy = NULL;
                    vout_DatePicture( p_dec->p_vout, p_pic, 0 );
gbazin's avatar
 
gbazin committed
421
                }
422 423 424 425 426 427 428
            }

            if( p_dec->p_info->discard_fbuf &&
                p_dec->p_info->discard_fbuf->id )
            {
                p_pic = (picture_t *)p_dec->p_info->discard_fbuf->id;
                vout_UnlinkPicture( p_dec->p_vout, p_pic );
gbazin's avatar
 
gbazin committed
429 430 431
            }
            break;

432
        case STATE_INVALID:
433 434 435 436
        {
            uint8_t *buf[3];
            buf[0] = buf[1] = buf[2] = NULL;

437
            msg_Warn( p_dec->p_fifo, "invalid picture encountered" );
438 439 440
            if ( ( p_dec->p_info->current_picture == NULL ) || 
               ( ( p_dec->p_info->current_picture->flags & PIC_MASK_CODING_TYPE)
                  != B_CODING_TYPE ) )
441 442 443
            {
                vout_SynchroReset( p_dec->p_synchro );
            }
444
            mpeg2_skip( p_dec->p_mpeg2dec, 1 );
445
            p_dec->b_skip = 1;
446 447 448

            if( p_dec->p_info->current_fbuf &&
                p_dec->p_info->current_fbuf->id )
449
            {
450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476
                p_dec->b_garbage_pic = 1;
                p_pic = p_dec->p_info->current_fbuf->id;
            }
            else
            {
                if( (p_pic = GetNewPicture( p_dec, buf )) == NULL )
                    break;
                mpeg2_set_buf( p_dec->p_mpeg2dec, buf, p_pic );
            }
            p_dec->p_picture_to_destroy = p_pic;

            memset( p_pic->p[0].p_pixels, 0,
                    p_dec->p_info->sequence->width
                     * p_dec->p_info->sequence->height );
            memset( p_pic->p[1].p_pixels, 0x80,
                    p_dec->p_info->sequence->width
                     * p_dec->p_info->sequence->height / 4 );
            memset( p_pic->p[2].p_pixels, 0x80,
                    p_dec->p_info->sequence->width
                     * p_dec->p_info->sequence->height / 4 );

            if ( p_dec->b_slice_i )
            {
                vout_SynchroNewPicture( p_dec->p_synchro,
                            I_CODING_TYPE, 2, 0, 0, p_dec->i_current_rate );
                vout_SynchroDecode( p_dec->p_synchro );
                vout_SynchroEnd( p_dec->p_synchro, I_CODING_TYPE, 0 );
477
            }
478
            break;
479
        }
480

gbazin's avatar
 
gbazin committed
481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517
        default:
            break;
        }
    }

    /* If b_error is set, the libmpeg2 decoder thread enters the error loop */
    if( p_dec->p_fifo->b_error )
    {
        DecoderError( p_dec->p_fifo );
    }

    /* End of the libmpeg2 decoder thread */
    CloseDecoder( p_dec );

    return 0;

 error:
    DecoderError( p_fifo );
    if( p_dec )
    {
        if( p_dec->p_fifo )
            p_dec->p_fifo->b_error = 1;

        /* End of the libmpeg2 decoder thread */
        CloseDecoder( p_dec );
    }

    return -1;
}

/*****************************************************************************
 * CloseDecoder: libmpeg2 decoder destruction
 *****************************************************************************/
static void CloseDecoder( dec_thread_t * p_dec )
{
    if( p_dec )
    {
gbazin's avatar
 
gbazin committed
518 519
        int i_pic;

gbazin's avatar
 
gbazin committed
520 521 522
        if( p_dec->p_pes )
            input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_dec->p_pes );

523 524 525
        if( p_dec->p_synchro )
            vout_SynchroRelease( p_dec->p_synchro );

gbazin's avatar
 
gbazin committed
526 527 528 529 530 531 532 533 534
        if( p_dec->p_vout )
        {
            /* Temporary hack to free the pictures in use by libmpeg2 */
            for( i_pic = 0; i_pic < p_dec->p_vout->render.i_pictures; i_pic++ )
            {
                if( p_dec->p_vout->render.pp_picture[i_pic]->i_status ==
                      RESERVED_PICTURE )
                    vout_DestroyPicture( p_dec->p_vout,
                                     p_dec->p_vout->render.pp_picture[i_pic] );
gbazin's avatar
 
gbazin committed
535 536 537
                if( p_dec->p_vout->render.pp_picture[i_pic]->i_refcount > 0 )
                    vout_UnlinkPicture( p_dec->p_vout,
                                     p_dec->p_vout->render.pp_picture[i_pic] );
gbazin's avatar
 
gbazin committed
538 539 540 541
            }

            vout_Request( p_dec->p_fifo, p_dec->p_vout, 0, 0, 0, 0 );
        }
gbazin's avatar
 
gbazin committed
542 543 544 545 546 547

        if( p_dec->p_mpeg2dec ) mpeg2_close( p_dec->p_mpeg2dec );

        free( p_dec );
    }
}
gbazin's avatar
 
gbazin committed
548 549 550 551 552 553 554

/*****************************************************************************
 * GetNewPicture: Get a new picture from the vout and set the buf struct
 *****************************************************************************/
static picture_t *GetNewPicture( dec_thread_t *p_dec, uint8_t **pp_buf )
{
    picture_t *p_pic;
555 556 557 558 559 560 561 562
    vlc_bool_t b_progressive = p_dec->p_info->current_picture != NULL ?
        p_dec->p_info->current_picture->flags & PIC_FLAG_PROGRESSIVE_FRAME :
        1;
    vlc_bool_t b_top_field_first = p_dec->p_info->current_picture != NULL ?
        p_dec->p_info->current_picture->flags & PIC_FLAG_TOP_FIELD_FIRST :
        1;
    unsigned int i_nb_fields = p_dec->p_info->current_picture != NULL ?
        p_dec->p_info->current_picture->nb_fields : 2;
gbazin's avatar
 
gbazin committed
563 564

    /* Get a new picture */
565 566
    while( !(p_pic = vout_CreatePicture( p_dec->p_vout,
        b_progressive, b_top_field_first, i_nb_fields )) )
gbazin's avatar
 
gbazin committed
567 568 569 570 571 572 573 574
    {
        if( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error )
            break;

        msleep( VOUT_OUTMEM_SLEEP );
    }
    if( p_pic == NULL )
        return NULL;
575
    vout_LinkPicture( p_dec->p_vout, p_pic );
gbazin's avatar
 
gbazin committed
576 577 578 579 580 581 582

    pp_buf[0] = p_pic->p[0].p_pixels;
    pp_buf[1] = p_pic->p[1].p_pixels;
    pp_buf[2] = p_pic->p[2].p_pixels;

    return p_pic;
}