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