git.sesse.net Git - vlc/blob - modules/packetizer/h264.c

   1 /*****************************************************************************
   2  * h264.c: h264/avc video packetizer
   3  *****************************************************************************
   4  * Copyright (C) 2001, 2002 the VideoLAN team
   5  * $Id$
   6  *
   7  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
   8  *          Eric Petit <titer@videolan.org>
   9  *          Gildas Bazin <gbazin@videolan.org>
  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>                                      /* malloc(), free() */
  30
  31 #include <vlc/vlc.h>
  32 #include <vlc/decoder.h>
  33 #include <vlc/sout.h>
  34
  35 #include "vlc_block_helper.h"
  36 #include "vlc_bits.h"
  37
  38 /*****************************************************************************
  39  * Module descriptor
  40  *****************************************************************************/
  41 static int  Open ( vlc_object_t * );
  42 static void Close( vlc_object_t * );
  43
  44 vlc_module_begin();
  45     set_category( CAT_SOUT );
  46     set_subcategory( SUBCAT_SOUT_PACKETIZER );
  47     set_description( _("H264 video packetizer") );
  48     set_capability( "packetizer", 50 );
  49     set_callbacks( Open, Close );
  50 vlc_module_end();
  51
  52
  53 /****************************************************************************
  54  * Local prototypes
  55  ****************************************************************************/
  56 static block_t *Packetize( decoder_t *, block_t ** );
  57 static block_t *PacketizeAVC1( decoder_t *, block_t ** );
  58
  59 struct decoder_sys_t
  60 {
  61     block_bytestream_t bytestream;
  62
  63     int     i_state;
  64     int     i_offset;
  65     uint8_t startcode[4];
  66
  67     vlc_bool_t b_slice;
  68     block_t    *p_frame;
  69
  70     vlc_bool_t   b_sps;
  71     vlc_bool_t   b_pps;
  72
  73     /* avcC data */
  74     int i_avcC_length_size;
  75
  76     /* Useful values of the Sequence Parameter Set */
  77     int i_log2_max_frame_num;
  78     int b_frame_mbs_only;
  79
  80     /* Useful values of the Slice Header */
  81     int i_nal_type;
  82     int i_nal_ref_idc;
  83     int i_idr_pic_id;
  84     int i_frame_num;
  85 };
  86
  87 enum
  88 {
  89     STATE_NOSYNC,
  90     STATE_NEXT_SYNC,
  91 };
  92
  93 enum nal_unit_type_e
  94 {
  95     NAL_UNKNOWN = 0,
  96     NAL_SLICE   = 1,
  97     NAL_SLICE_DPA   = 2,
  98     NAL_SLICE_DPB   = 3,
  99     NAL_SLICE_DPC   = 4,
 100     NAL_SLICE_IDR   = 5,    /* ref_idc != 0 */
 101     NAL_SEI         = 6,    /* ref_idc == 0 */
 102     NAL_SPS         = 7,
 103     NAL_PPS         = 8,
 104     NAL_AU_DELIMITER= 9
 105     /* ref_idc == 0 for 6,9,10,11,12 */
 106 };
 107
 108 enum nal_priority_e
 109 {
 110     NAL_PRIORITY_DISPOSABLE = 0,
 111     NAL_PRIORITY_LOW        = 1,
 112     NAL_PRIORITY_HIGH       = 2,
 113     NAL_PRIORITY_HIGHEST    = 3,
 114 };
 115
 116 static block_t *ParseNALBlock( decoder_t *, block_t * );
 117
 118 static block_t *nal_get_annexeb( decoder_t *, uint8_t *p, int );
 119
 120 /*****************************************************************************
 121  * Open: probe the packetizer and return score
 122  *****************************************************************************/
 123 static int Open( vlc_object_t *p_this )
 124 {
 125     decoder_t     *p_dec = (decoder_t*)p_this;
 126     decoder_sys_t *p_sys;
 127
 128     if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'h', '2', '6', '4') &&
 129         p_dec->fmt_in.i_codec != VLC_FOURCC( 'H', '2', '6', '4') &&
 130         p_dec->fmt_in.i_codec != VLC_FOURCC( 'V', 'S', 'S', 'H') &&
 131         p_dec->fmt_in.i_codec != VLC_FOURCC( 'v', 's', 's', 'h') &&
 132         ( p_dec->fmt_in.i_codec != VLC_FOURCC( 'a', 'v', 'c', '1') ||
 133           p_dec->fmt_in.i_extra < 7 ) )
 134     {
 135         return VLC_EGENERIC;
 136     }
 137
 138     /* Allocate the memory needed to store the decoder's structure */
 139     if( ( p_dec->p_sys = p_sys = malloc( sizeof(decoder_sys_t) ) ) == NULL )
 140     {
 141         msg_Err( p_dec, "out of memory" );
 142         return VLC_EGENERIC;
 143     }
 144     p_sys->i_state = STATE_NOSYNC;
 145     p_sys->i_offset = 0;
 146     p_sys->startcode[0] = 0;
 147     p_sys->startcode[1] = 0;
 148     p_sys->startcode[2] = 0;
 149     p_sys->startcode[3] = 1;
 150     p_sys->bytestream = block_BytestreamInit( p_dec );
 151     p_sys->b_slice = VLC_FALSE;
 152     p_sys->p_frame = NULL;
 153     p_sys->b_sps   = VLC_FALSE;
 154     p_sys->b_pps   = VLC_FALSE;
 155
 156     p_sys->i_nal_type = -1;
 157     p_sys->i_nal_ref_idc = -1;
 158     p_sys->i_idr_pic_id = -1;
 159     p_sys->i_frame_num = -1;
 160
 161     /* Setup properties */
 162     es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
 163     p_dec->fmt_out.i_codec = VLC_FOURCC( 'h', '2', '6', '4' );
 164     /* FIXME: FFMPEG isn't happy at all if you leave this */
 165     if( p_dec->fmt_out.i_extra ) free( p_dec->fmt_out.p_extra );
 166     p_dec->fmt_out.i_extra = 0; p_dec->fmt_out.p_extra = 0;
 167
 168     if( p_dec->fmt_in.i_codec == VLC_FOURCC( 'a', 'v', 'c', '1' ) )
 169     {
 170         uint8_t *p = &((uint8_t*)p_dec->fmt_in.p_extra)[4];
 171         int i_sps, i_pps;
 172         int i;
 173
 174         /* Parse avcC */
 175         p_sys->i_avcC_length_size = 1 + ((*p++)&0x03);
 176
 177         /* Read SPS */
 178         i_sps = (*p++)&0x1f;
 179
 180         for( i = 0; i < i_sps; i++ )
 181         {
 182             int i_length = GetWBE( p );
 183             block_t *p_sps = nal_get_annexeb( p_dec, p + 2, i_length );
 184
 185             p_sps->i_pts = p_sps->i_dts = mdate();
 186             ParseNALBlock( p_dec, p_sps );
 187             p += 2 + i_length;
 188         }
 189         /* Read PPS */
 190         i_pps = *p++;
 191         for( i = 0; i < i_pps; i++ )
 192         {
 193             int i_length = GetWBE( p );
 194             block_t *p_pps = nal_get_annexeb( p_dec, p + 2, i_length );
 195
 196             p_pps->i_pts = p_pps->i_dts = mdate();
 197             ParseNALBlock( p_dec, p_pps );
 198             p += 2 + i_length;
 199         }
 200         msg_Dbg( p_dec, "avcC length size=%d sps=%d pps=%d",
 201                  p_sys->i_avcC_length_size, i_sps, i_pps );
 202
 203         /* Set callback */
 204         p_dec->pf_packetize = PacketizeAVC1;
 205     }
 206     else
 207     {
 208         /* Set callback */
 209         p_dec->pf_packetize = Packetize;
 210
 211         /* */
 212         if( p_dec->fmt_in.i_extra > 0 )
 213         {
 214             block_t *p_init = block_New( p_dec, p_dec->fmt_in.i_extra );
 215             block_t *p_pic;
 216
 217             memcpy( p_init->p_buffer, p_dec->fmt_in.p_extra,
 218                     p_dec->fmt_in.i_extra );
 219
 220             while( ( p_pic = Packetize( p_dec, &p_init ) ) )
 221             {
 222                 /* Should not occur because we should only receive SPS/PPS */
 223                 block_Release( p_pic );
 224             }
 225         }
 226     }
 227
 228     return VLC_SUCCESS;
 229 }
 230
 231 /*****************************************************************************
 232  * Close: clean up the packetizer
 233  *****************************************************************************/
 234 static void Close( vlc_object_t *p_this )
 235 {
 236     decoder_t *p_dec = (decoder_t*)p_this;
 237     decoder_sys_t *p_sys = p_dec->p_sys;
 238
 239     block_BytestreamRelease( &p_sys->bytestream );
 240     free( p_sys );
 241 }
 242
 243 /****************************************************************************
 244  * Packetize: the whole thing
 245  ****************************************************************************/
 246 static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
 247 {
 248     decoder_sys_t *p_sys = p_dec->p_sys;
 249     block_t       *p_pic;
 250
 251     if( !pp_block || !*pp_block ) return NULL;
 252
 253     block_BytestreamPush( &p_sys->bytestream, *pp_block );
 254
 255     for( ;; )
 256     {
 257         switch( p_sys->i_state )
 258         {
 259             case STATE_NOSYNC:
 260                 if( block_FindStartcodeFromOffset( &p_sys->bytestream,
 261                       &p_sys->i_offset, p_sys->startcode+1, 3 ) == VLC_SUCCESS)
 262                 {
 263                     p_sys->i_state = STATE_NEXT_SYNC;
 264                 }
 265
 266                 if( p_sys->i_offset )
 267                 {
 268                     block_SkipBytes( &p_sys->bytestream, p_sys->i_offset );
 269                     p_sys->i_offset = 0;
 270                     block_BytestreamFlush( &p_sys->bytestream );
 271                 }
 272
 273                 if( p_sys->i_state != STATE_NEXT_SYNC )
 274                 {
 275                     /* Need more data */
 276                     return NULL;
 277                 }
 278
 279                 p_sys->i_offset = 1; /* To find next startcode */
 280
 281             case STATE_NEXT_SYNC:
 282                 /* Find the next startcode */
 283                 if( block_FindStartcodeFromOffset( &p_sys->bytestream,
 284                       &p_sys->i_offset, p_sys->startcode, 3 ) != VLC_SUCCESS)
 285                 {
 286                     if( block_FindStartcodeFromOffset( &p_sys->bytestream,
 287                           &p_sys->i_offset, p_sys->startcode+1, 3 ) !=
 288                         VLC_SUCCESS )
 289                     {
 290                         /* Need more data */
 291                         return NULL;
 292                     }
 293                 }
 294
 295                 /* Get the new fragment and set the pts/dts */
 296                 p_pic = block_New( p_dec, p_sys->i_offset );
 297                 p_pic->i_pts = p_sys->bytestream.p_block->i_pts;
 298                 p_pic->i_dts = p_sys->bytestream.p_block->i_dts;
 299
 300                 block_GetBytes( &p_sys->bytestream, p_pic->p_buffer,
 301                                 p_pic->i_buffer );
 302
 303                 p_sys->i_offset = 0;
 304
 305                 /* Parse the NAL */
 306                 if( !( p_pic = ParseNALBlock( p_dec, p_pic ) ) )
 307                 {
 308                     p_sys->i_state = STATE_NOSYNC;
 309                     break;
 310                 }
 311 #if 0
 312                 msg_Dbg( p_dec, "pts="I64Fd" dts="I64Fd,
 313                          p_pic->i_pts, p_pic->i_dts );
 314 #endif
 315
 316                 /* So p_block doesn't get re-added several times */
 317                 *pp_block = block_BytestreamPop( &p_sys->bytestream );
 318
 319                 p_sys->i_state = STATE_NOSYNC;
 320
 321                 return p_pic;
 322         }
 323     }
 324 }
 325
 326 /****************************************************************************
 327  * PacketizeAVC1: the whole thing
 328  ****************************************************************************/
 329 static block_t *PacketizeAVC1( decoder_t *p_dec, block_t **pp_block )
 330 {
 331     decoder_sys_t *p_sys = p_dec->p_sys;
 332     block_t       *p_block;
 333     block_t       *p_ret = NULL;
 334     uint8_t       *p;
 335
 336     if( !pp_block || !*pp_block ) return NULL;
 337
 338     p_block = *pp_block;
 339     *pp_block = NULL;
 340
 341     for( p = p_block->p_buffer; p < &p_block->p_buffer[p_block->i_buffer]; )
 342     {
 343         block_t *p_pic;
 344         int i_size = 0;
 345         int i;
 346
 347         for( i = 0; i < p_sys->i_avcC_length_size; i++ )
 348         {
 349             i_size = (i_size << 8) | (*p++);
 350         }
 351
 352         if( i_size > 0 )
 353         {
 354             block_t *p_part = nal_get_annexeb( p_dec, p, i_size );
 355
 356             p_part->i_dts = p_block->i_dts;
 357             p_part->i_pts = p_block->i_pts;
 358
 359             /* Parse the NAL */
 360             if( ( p_pic = ParseNALBlock( p_dec, p_part ) ) )
 361             {
 362                 block_ChainAppend( &p_ret, p_pic );
 363             }
 364         }
 365         p += i_size;
 366     }
 367
 368     return p_ret;
 369 }
 370
 371 static block_t *nal_get_annexeb( decoder_t *p_dec, uint8_t *p, int i_size )
 372 {
 373     block_t *p_nal;
 374
 375     p_nal = block_New( p_dec, 3 + i_size );
 376
 377     /* Add start code */
 378     p_nal->p_buffer[0] = 0x00;
 379     p_nal->p_buffer[1] = 0x00;
 380     p_nal->p_buffer[2] = 0x01;
 381
 382     /* Copy nalu */
 383     memcpy( &p_nal->p_buffer[3], p, i_size );
 384
 385     return p_nal;
 386 }
 387
 388 static void nal_get_decoded( uint8_t **pp_ret, int *pi_ret,
 389                              uint8_t *src, int i_src )
 390 {
 391     uint8_t *end = &src[i_src];
 392     uint8_t *dst = malloc( i_src );
 393
 394     *pp_ret = dst;
 395
 396     while( src < end )
 397     {
 398         if( src < end - 3 && src[0] == 0x00 && src[1] == 0x00 &&
 399             src[2] == 0x03 )
 400         {
 401             *dst++ = 0x00;
 402             *dst++ = 0x00;
 403
 404             src += 3;
 405             continue;
 406         }
 407         *dst++ = *src++;
 408     }
 409
 410     *pi_ret = dst - *pp_ret;
 411 }
 412
 413 static inline int bs_read_ue( bs_t *s )
 414 {
 415     int i = 0;
 416
 417     while( bs_read1( s ) == 0 && s->p < s->p_end && i < 32 )
 418     {
 419         i++;
 420     }
 421     return( ( 1 << i) - 1 + bs_read( s, i ) );
 422 }
 423
 424 static inline int bs_read_se( bs_t *s )
 425 {
 426     int val = bs_read_ue( s );
 427
 428     return val&0x01 ? (val+1)/2 : -(val/2);
 429 }
 430
 431
 432 static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag )
 433 {
 434     decoder_sys_t *p_sys = p_dec->p_sys;
 435     block_t *p_pic = NULL;
 436
 437     const int i_nal_ref_idc = (p_frag->p_buffer[3] >> 5)&0x03;
 438     const int i_nal_type = p_frag->p_buffer[3]&0x1f;
 439
 440 #define OUTPUT \
 441     do {                                                \
 442         p_pic = block_ChainGather( p_sys->p_frame );    \
 443         p_pic->i_length = 0;    /* FIXME */             \
 444                                                         \
 445         p_sys->p_frame = NULL;                          \
 446         p_sys->b_slice = VLC_FALSE;                     \
 447     } while(0)
 448
 449
 450     if( p_sys->b_slice && !p_sys->b_sps )
 451     {
 452         block_ChainRelease( p_sys->p_frame );
 453         msg_Warn( p_dec, "waiting for SPS" );
 454
 455         /* Reset context */
 456         p_sys->p_frame = NULL;
 457         p_sys->b_slice = VLC_FALSE;
 458     }
 459
 460     if( !p_sys->b_sps &&
 461         i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR )
 462     {
 463         p_sys->b_slice = VLC_TRUE;
 464         /* Fragment will be discarded later on */
 465     }
 466     else if( i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR )
 467     {
 468         uint8_t *dec;
 469         int i_dec, i_first_mb, i_slice_type, i_frame_num, i_pic_flags = 0;
 470         vlc_bool_t b_pic = VLC_FALSE;
 471         bs_t s;
 472
 473         /* do not convert the whole frame */
 474         nal_get_decoded( &dec, &i_dec, &p_frag->p_buffer[4],
 475                          __MIN( p_frag->i_buffer - 4, 60 ) );
 476         bs_init( &s, dec, i_dec );
 477
 478         /* first_mb_in_slice */
 479         i_first_mb = bs_read_ue( &s );
 480
 481         /* slice_type */
 482         switch( (i_slice_type = bs_read_ue( &s )) )
 483         {
 484             case 0: case 5:
 485                 i_pic_flags = BLOCK_FLAG_TYPE_P;
 486                 break;
 487             case 1: case 6:
 488                 i_pic_flags = BLOCK_FLAG_TYPE_B;
 489                 break;
 490             case 2: case 7:
 491                 i_pic_flags = BLOCK_FLAG_TYPE_I;
 492                 break;
 493             case 3: case 8: /* SP */
 494                 i_pic_flags = BLOCK_FLAG_TYPE_P;
 495                 break;
 496             case 4: case 9:
 497                 i_pic_flags = BLOCK_FLAG_TYPE_I;
 498                 break;
 499         }
 500
 501         /* pic_parameter_set_id */
 502         bs_read_ue( &s );
 503         /* frame_num */
 504         i_frame_num = bs_read( &s, p_sys->i_log2_max_frame_num + 4 );
 505
 506         /* Detection of the first VCL NAL unit of a primary coded picture
 507          * (cf. 7.4.1.2.4) */
 508         if( i_frame_num != p_sys->i_frame_num ||
 509             ( (i_nal_ref_idc != p_sys->i_nal_ref_idc) &&
 510               (!i_nal_ref_idc || !p_sys->i_nal_ref_idc) ) )
 511         {
 512             b_pic = VLC_TRUE;
 513         }
 514         p_sys->i_frame_num = i_frame_num;
 515         p_sys->i_nal_ref_idc = i_nal_ref_idc;
 516
 517         if( !p_sys->b_frame_mbs_only )
 518         {
 519             /* field_pic_flag */
 520             if( bs_read( &s, 1 ) )
 521             {
 522                 /* bottom_field_flag */
 523                 bs_read( &s, 1 );
 524             }
 525         }
 526
 527         if( i_nal_type == NAL_SLICE_IDR )
 528         {
 529             /* id_pic_id */
 530             int i_idr_pic_id = bs_read_ue( &s );
 531             if( p_sys->i_nal_type != i_nal_type ) b_pic = VLC_TRUE;
 532             if( p_sys->i_idr_pic_id != i_idr_pic_id ) b_pic = VLC_TRUE;
 533             p_sys->i_idr_pic_id = i_idr_pic_id;
 534         }
 535         p_sys->i_nal_type = i_nal_type;
 536
 537         if( b_pic && p_sys->b_slice )
 538             OUTPUT;
 539
 540         p_sys->b_slice = VLC_TRUE;
 541
 542         free( dec );
 543     }
 544     else if( i_nal_type == NAL_SPS )
 545     {
 546         uint8_t *dec;
 547         int     i_dec;
 548         bs_t s;
 549         int i_tmp;
 550
 551         if( !p_sys->b_sps )
 552             msg_Dbg( p_dec, "found NAL_SPS" );
 553
 554         p_sys->b_sps = VLC_TRUE;
 555
 556         nal_get_decoded( &dec, &i_dec, &p_frag->p_buffer[4],
 557                          p_frag->i_buffer - 4 );
 558
 559         bs_init( &s, dec, i_dec );
 560         /* Skip profile(8), constraint_set012, reserver(5), level(8) */
 561         bs_skip( &s, 8 + 1+1+1 + 5 + 8 );
 562         /* sps id */
 563         bs_read_ue( &s );
 564         /* Skip i_log2_max_frame_num */
 565         p_sys->i_log2_max_frame_num = bs_read_ue( &s );
 566         /* Read poc_type */
 567         i_tmp = bs_read_ue( &s );
 568         if( i_tmp == 0 )
 569         {
 570             /* skip i_log2_max_poc_lsb */
 571             bs_read_ue( &s );
 572         }
 573         else if( i_tmp == 1 )
 574         {
 575             int i_cycle;
 576             /* skip b_delta_pic_order_always_zero */
 577             bs_skip( &s, 1 );
 578             /* skip i_offset_for_non_ref_pic */
 579             bs_read_se( &s );
 580             /* skip i_offset_for_top_to_bottom_field */
 581             bs_read_se( &s );
 582             /* read i_num_ref_frames_in_poc_cycle */
 583             i_cycle = bs_read_ue( &s );
 584             if( i_cycle > 256 ) i_cycle = 256;
 585             while( i_cycle > 0 )
 586             {
 587                 /* skip i_offset_for_ref_frame */
 588                 bs_read_se(&s );
 589             }
 590         }
 591         /* i_num_ref_frames */
 592         bs_read_ue( &s );
 593         /* b_gaps_in_frame_num_value_allowed */
 594         bs_skip( &s, 1 );
 595
 596         /* Read size */
 597         p_dec->fmt_out.video.i_width  = 16 * ( bs_read_ue( &s ) + 1 );
 598         p_dec->fmt_out.video.i_height = 16 * ( bs_read_ue( &s ) + 1 );
 599
 600         /* b_frame_mbs_only */
 601         p_sys->b_frame_mbs_only = bs_read( &s, 1 );
 602         if( p_sys->b_frame_mbs_only == 0 )
 603         {
 604             bs_skip( &s, 1 );
 605         }
 606         /* b_direct8x8_inference */
 607         bs_skip( &s, 1 );
 608
 609         /* crop */
 610         i_tmp = bs_read( &s, 1 );
 611         if( i_tmp )
 612         {
 613             /* left */
 614             bs_read_ue( &s );
 615             /* right */
 616             bs_read_ue( &s );
 617             /* top */
 618             bs_read_ue( &s );
 619             /* bottom */
 620             bs_read_ue( &s );
 621         }
 622
 623         /* vui */
 624         i_tmp = bs_read( &s, 1 );
 625         if( i_tmp )
 626         {
 627             /* read the aspect ratio part if any FIXME check it */
 628             i_tmp = bs_read( &s, 1 );
 629             if( i_tmp )
 630             {
 631                 static const struct { int w, h; } sar[14] =
 632                 {
 633                     { 0,   0 }, { 1,   1 }, { 12, 11 }, { 10, 11 },
 634                     { 16, 11 }, { 40, 33 }, { 24, 11 }, { 20, 11 },
 635                     { 32, 11 }, { 80, 33 }, { 18, 11 }, { 15, 11 },
 636                     { 64, 33 }, { 160,99 },
 637                 };
 638                 int i_sar = bs_read( &s, 8 );
 639                 int w, h;
 640
 641                 if( i_sar < 14 )
 642                 {
 643                     w = sar[i_sar].w;
 644                     h = sar[i_sar].h;
 645                 }
 646                 else
 647                 {
 648                     w = bs_read( &s, 16 );
 649                     h = bs_read( &s, 16 );
 650                 }
 651                 if( h != 0 )
 652                     p_dec->fmt_out.video.i_aspect =
 653                         VOUT_ASPECT_FACTOR * w / h * p_dec->fmt_out.video.i_width /
 654                         p_dec->fmt_out.video.i_height;
 655                 else
 656                     p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR;
 657             }
 658         }
 659
 660         free( dec );
 661
 662
 663         if( p_sys->b_slice )
 664             OUTPUT;
 665     }
 666     else if( i_nal_type == NAL_PPS )
 667     {
 668         bs_t s;
 669         bs_init( &s, &p_frag->p_buffer[4], p_frag->i_buffer - 4 );
 670
 671         if( !p_sys->b_pps )
 672             msg_Dbg( p_dec, "found NAL_PPS" );
 673         p_sys->b_pps = VLC_TRUE;
 674
 675         /* TODO */
 676
 677         if( p_sys->b_slice )
 678             OUTPUT;
 679     }
 680     else if( i_nal_type == NAL_AU_DELIMITER ||
 681              i_nal_type == NAL_SEI ||
 682              ( i_nal_type >= 13 && i_nal_type <= 18 ) )
 683     {
 684         if( p_sys->b_slice )
 685             OUTPUT;
 686     }
 687
 688 #undef OUTPUT
 689
 690     /* Append the block */
 691     block_ChainAppend( &p_sys->p_frame, p_frag );
 692
 693     return p_pic;
 694 }