h264.c 36.3 KB
Newer Older
1 2 3
/*****************************************************************************
 * h264.c: h264/avc video packetizer
 *****************************************************************************
4
 * Copyright (C) 2001, 2002, 2006 the VideoLAN team
Laurent Aimar's avatar
Laurent Aimar committed
5
 * $Id$
6 7 8
 *
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
 *          Eric Petit <titer@videolan.org>
9
 *          Gildas Bazin <gbazin@videolan.org>
10
 *          Derk-Jan Hartman <hartman at videolan dot org>
11 12 13 14 15 16 17 18 19 20 21 22 23
 *
 * 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
Antoine Cellerier's avatar
Antoine Cellerier committed
24
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
25 26 27 28 29 30
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/

31 32 33
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
34
#include <assert.h>
35

36
#include <vlc_common.h>
37
#include <vlc_plugin.h>
Clément Stenac's avatar
Clément Stenac committed
38 39 40
#include <vlc_sout.h>
#include <vlc_codec.h>
#include <vlc_block.h>
41

42 43
#include <vlc_block_helper.h>
#include <vlc_bits.h>
44
#include "../codec/cc.h"
45
#include "packetizer_helper.h"
46 47 48 49 50 51 52

/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
static int  Open ( vlc_object_t * );
static void Close( vlc_object_t * );

53 54 55 56 57 58 59
vlc_module_begin ()
    set_category( CAT_SOUT )
    set_subcategory( SUBCAT_SOUT_PACKETIZER )
    set_description( N_("H.264 video packetizer") )
    set_capability( "packetizer", 50 )
    set_callbacks( Open, Close )
vlc_module_end ()
60 61 62 63 64


/****************************************************************************
 * Local prototypes
 ****************************************************************************/
65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
typedef struct
{
    int i_nal_type;
    int i_nal_ref_idc;

    int i_frame_type;
    int i_pic_parameter_set_id;
    int i_frame_num;

    int i_field_pic_flag;
    int i_bottom_field_flag;

    int i_idr_pic_id;

    int i_pic_order_cnt_lsb;
    int i_delta_pic_order_cnt_bottom;

    int i_delta_pic_order_cnt0;
    int i_delta_pic_order_cnt1;
} slice_t;

86 87
#define SPS_MAX (32)
#define PPS_MAX (256)
88 89
struct decoder_sys_t
{
90 91
    /* */
    packetizer_t packetizer;
92

93
    /* */
94 95
    bool    b_slice;
    block_t *p_frame;
96 97
    bool    b_frame_sps;
    bool    b_frame_pps;
98

99
    bool   b_header;
100 101
    bool   b_sps;
    bool   b_pps;
102 103
    block_t *pp_sps[SPS_MAX];
    block_t *pp_pps[PPS_MAX];
104
    int    i_recovery_frames;  /* -1 = no recovery */
105 106 107

    /* avcC data */
    int i_avcC_length_size;
108 109 110 111

    /* Useful values of the Sequence Parameter Set */
    int i_log2_max_frame_num;
    int b_frame_mbs_only;
112 113 114 115 116 117
    int i_pic_order_cnt_type;
    int i_delta_pic_order_always_zero_flag;
    int i_log2_max_pic_order_cnt_lsb;

    /* Value from Picture Parameter Set */
    int i_pic_order_present_flag;
118 119

    /* Useful values of the Slice Header */
120
    slice_t slice;
Laurent Aimar's avatar
Laurent Aimar committed
121 122 123 124

    /* */
    mtime_t i_frame_pts;
    mtime_t i_frame_dts;
125 126 127 128 129 130

    /* */
    uint32_t i_cc_flags;
    mtime_t i_cc_pts;
    mtime_t i_cc_dts;
    cc_data_t cc;
131 132

    cc_data_t cc_next;
133 134 135 136 137 138 139 140 141 142 143 144
};

enum nal_unit_type_e
{
    NAL_UNKNOWN = 0,
    NAL_SLICE   = 1,
    NAL_SLICE_DPA   = 2,
    NAL_SLICE_DPB   = 3,
    NAL_SLICE_DPC   = 4,
    NAL_SLICE_IDR   = 5,    /* ref_idc != 0 */
    NAL_SEI         = 6,    /* ref_idc == 0 */
    NAL_SPS         = 7,
145 146
    NAL_PPS         = 8,
    NAL_AU_DELIMITER= 9
147 148 149 150 151 152 153 154 155 156 157
    /* ref_idc == 0 for 6,9,10,11,12 */
};

enum nal_priority_e
{
    NAL_PRIORITY_DISPOSABLE = 0,
    NAL_PRIORITY_LOW        = 1,
    NAL_PRIORITY_HIGH       = 2,
    NAL_PRIORITY_HIGHEST    = 3,
};

158 159
#define BLOCK_FLAG_PRIVATE_AUD (1 << BLOCK_FLAG_PRIVATE_SHIFT)

160 161 162
static block_t *Packetize( decoder_t *, block_t ** );
static block_t *PacketizeAVC1( decoder_t *, block_t ** );
static block_t *GetCc( decoder_t *p_dec, bool pb_present[4] );
163

164 165 166 167 168
static void PacketizeReset( void *p_private, bool b_broken );
static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t * );
static int PacketizeValidate( void *p_private, block_t * );

static block_t *ParseNALBlock( decoder_t *, bool *pb_used_ts, block_t * );
Laurent Aimar's avatar
Laurent Aimar committed
169
static block_t *CreateAnnexbNAL( decoder_t *, const uint8_t *p, int );
170

171 172 173 174 175
static block_t *OutputPicture( decoder_t *p_dec );
static void PutSPS( decoder_t *p_dec, block_t *p_frag );
static void PutPPS( decoder_t *p_dec, block_t *p_frag );
static void ParseSlice( decoder_t *p_dec, bool *pb_new_picture, slice_t *p_slice,
                        int i_nal_ref_idc, int i_nal_type, const block_t *p_frag );
176
static void ParseSei( decoder_t *, block_t * );
177 178


179 180
static const uint8_t p_h264_startcode[3] = { 0x00, 0x00, 0x01 };

181 182
/*****************************************************************************
 * Open: probe the packetizer and return score
183 184
 * When opening after demux, the packetizer is only loaded AFTER the decoder
 * That means that what you set in fmt_out is ignored by the decoder in this special case
185 186 187 188 189
 *****************************************************************************/
static int Open( vlc_object_t *p_this )
{
    decoder_t     *p_dec = (decoder_t*)p_this;
    decoder_sys_t *p_sys;
190
    int i;
191

192 193 194 195
    if( p_dec->fmt_in.i_codec != VLC_CODEC_H264 )
        return VLC_EGENERIC;
    if( p_dec->fmt_in.i_original_fourcc == VLC_FOURCC( 'a', 'v', 'c', '1') &&
        p_dec->fmt_in.i_extra < 7 )
196 197 198 199 200
        return VLC_EGENERIC;

    /* Allocate the memory needed to store the decoder's structure */
    if( ( p_dec->p_sys = p_sys = malloc( sizeof(decoder_sys_t) ) ) == NULL )
    {
201
        return VLC_ENOMEM;
202
    }
203 204 205

    packetizer_Init( &p_sys->packetizer,
                     p_h264_startcode, sizeof(p_h264_startcode),
206
                     p_h264_startcode, 1, 5,
207 208
                     PacketizeReset, PacketizeParse, PacketizeValidate, p_dec );

209
    p_sys->b_slice = false;
210
    p_sys->p_frame = NULL;
211 212 213
    p_sys->b_frame_sps = false;
    p_sys->b_frame_pps = false;

214
    p_sys->b_header= false;
215 216
    p_sys->b_sps   = false;
    p_sys->b_pps   = false;
217 218 219 220
    for( i = 0; i < SPS_MAX; i++ )
        p_sys->pp_sps[i] = NULL;
    for( i = 0; i < PPS_MAX; i++ )
        p_sys->pp_pps[i] = NULL;
221
    p_sys->i_recovery_frames = -1;
222

223 224 225 226 227 228 229 230 231 232
    p_sys->slice.i_nal_type = -1;
    p_sys->slice.i_nal_ref_idc = -1;
    p_sys->slice.i_idr_pic_id = -1;
    p_sys->slice.i_frame_num = -1;
    p_sys->slice.i_frame_type = 0;
    p_sys->slice.i_pic_parameter_set_id = -1;
    p_sys->slice.i_field_pic_flag = 0;
    p_sys->slice.i_bottom_field_flag = -1;
    p_sys->slice.i_pic_order_cnt_lsb = -1;
    p_sys->slice.i_delta_pic_order_cnt_bottom = -1;
233

234 235
    p_sys->i_frame_dts = VLC_TS_INVALID;
    p_sys->i_frame_pts = VLC_TS_INVALID;
Laurent Aimar's avatar
Laurent Aimar committed
236

237 238
    /* Setup properties */
    es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
239
    p_dec->fmt_out.i_codec = VLC_CODEC_H264;
240

241
    if( p_dec->fmt_in.i_original_fourcc == VLC_FOURCC( 'a', 'v', 'c', '1' ) )
242
    {
243 244 245 246
        /* This type of stream is produced by mp4 and matroska
         * when we want to store it in another streamformat, you need to convert
         * The fmt_in.p_extra should ALWAYS contain the avcC
         * The fmt_out.p_extra should contain all the SPS and PPS with 4 byte startcodes */
247 248
        uint8_t *p = &((uint8_t*)p_dec->fmt_in.p_extra)[4];
        int i_sps, i_pps;
Laurent Aimar's avatar
Laurent Aimar committed
249
        bool b_dummy;
250 251 252 253 254 255 256 257 258
        int i;

        /* Parse avcC */
        p_sys->i_avcC_length_size = 1 + ((*p++)&0x03);

        /* Read SPS */
        i_sps = (*p++)&0x1f;
        for( i = 0; i < i_sps; i++ )
        {
259 260 261 262 263 264
            uint16_t i_length = GetWBE( p ); p += 2;
            if( i_length >
                (uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p )
            {
                return VLC_EGENERIC;
            }
Laurent Aimar's avatar
Laurent Aimar committed
265
            block_t *p_sps = CreateAnnexbNAL( p_dec, p, i_length );
266 267
            if( !p_sps )
                return VLC_EGENERIC;
Laurent Aimar's avatar
Laurent Aimar committed
268
            ParseNALBlock( p_dec, &b_dummy, p_sps );
269
            p += i_length;
270 271 272 273 274
        }
        /* Read PPS */
        i_pps = *p++;
        for( i = 0; i < i_pps; i++ )
        {
275 276 277 278 279 280
            uint16_t i_length = GetWBE( p ); p += 2;
            if( i_length >
                (uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p )
            {
                return VLC_EGENERIC;
            }
Laurent Aimar's avatar
Laurent Aimar committed
281
            block_t *p_pps = CreateAnnexbNAL( p_dec, p, i_length );
282 283
            if( !p_pps )
                return VLC_EGENERIC;
Laurent Aimar's avatar
Laurent Aimar committed
284
            ParseNALBlock( p_dec, &b_dummy, p_pps );
285
            p += i_length;
286
        }
287
        msg_Dbg( p_dec, "avcC length size=%d, sps=%d, pps=%d",
288 289
                 p_sys->i_avcC_length_size, i_sps, i_pps );

290
        if( !p_sys->b_sps || !p_sys->b_pps )
291 292
            return VLC_EGENERIC;

293
        /* FIXME: FFMPEG isn't happy at all if you leave this */
294 295
        if( p_dec->fmt_out.i_extra > 0 )
            free( p_dec->fmt_out.p_extra );
296 297
        p_dec->fmt_out.i_extra = 0;
        p_dec->fmt_out.p_extra = NULL;
298

299
        /* Set the new extradata */
300 301 302 303 304 305 306 307 308 309
        for( i = 0; i < SPS_MAX; i++ )
        {
            if( p_sys->pp_sps[i] )
                p_dec->fmt_out.i_extra += p_sys->pp_sps[i]->i_buffer;
        }
        for( i = 0; i < PPS_MAX; i++ )
        {
            if( p_sys->pp_pps[i] )
                p_dec->fmt_out.i_extra += p_sys->pp_pps[i]->i_buffer;
        }
310
        p_dec->fmt_out.p_extra = malloc( p_dec->fmt_out.i_extra );
311 312
        if( p_dec->fmt_out.p_extra )
        {
313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330
            uint8_t *p_dst = p_dec->fmt_out.p_extra;

            for( i = 0; i < SPS_MAX; i++ )
            {
                if( p_sys->pp_sps[i] )
                {
                    memcpy( p_dst, p_sys->pp_sps[i]->p_buffer, p_sys->pp_sps[i]->i_buffer );
                    p_dst += p_sys->pp_sps[i]->i_buffer;
                }
            }
            for( i = 0; i < PPS_MAX; i++ )
            {
                if( p_sys->pp_pps[i] )
                {
                    memcpy( p_dst, p_sys->pp_pps[i]->p_buffer, p_sys->pp_pps[i]->i_buffer );
                    p_dst += p_sys->pp_pps[i]->i_buffer;
                }
            }
331
            p_sys->b_header = true;
332
        }
333 334 335 336
        else
        {
            p_dec->fmt_out.i_extra = 0;
        }
337

338 339
        /* Set callback */
        p_dec->pf_packetize = PacketizeAVC1;
340
        /* TODO CC ? */
341 342 343
    }
    else
    {
344
        /* This type of stream contains data with 3 of 4 byte startcodes
345 346
         * The fmt_in.p_extra MAY contain SPS/PPS with 4 byte startcodes
         * The fmt_out.p_extra should be the same */
347

348 349
        /* Set callback */
        p_dec->pf_packetize = Packetize;
350 351 352
        p_dec->pf_get_cc = GetCc;

        /* */
353 354
        p_sys->i_cc_pts = VLC_TS_INVALID;
        p_sys->i_cc_dts = VLC_TS_INVALID;
355 356
        p_sys->i_cc_flags = 0;
        cc_Init( &p_sys->cc );
357
        cc_Init( &p_sys->cc_next );
358 359 360

        /* */
        if( p_dec->fmt_in.i_extra > 0 )
361 362
            packetizer_Header( &p_sys->packetizer,
                               p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra );
363 364 365 366 367 368 369 370 371 372 373 374
    }

    return VLC_SUCCESS;
}

/*****************************************************************************
 * Close: clean up the packetizer
 *****************************************************************************/
static void Close( vlc_object_t *p_this )
{
    decoder_t *p_dec = (decoder_t*)p_this;
    decoder_sys_t *p_sys = p_dec->p_sys;
375
    int i;
376

377 378
    if( p_sys->p_frame )
        block_ChainRelease( p_sys->p_frame );
379 380 381 382 383 384 385 386 387 388
    for( i = 0; i < SPS_MAX; i++ )
    {
        if( p_sys->pp_sps[i] )
            block_Release( p_sys->pp_sps[i] );
    }
    for( i = 0; i < PPS_MAX; i++ )
    {
        if( p_sys->pp_pps[i] )
            block_Release( p_sys->pp_pps[i] );
    }
389 390
    packetizer_Clean( &p_sys->packetizer );

391
    if( p_dec->pf_get_cc )
392 393
    {
         cc_Exit( &p_sys->cc_next );
394
         cc_Exit( &p_sys->cc );
395
    }
396

397 398 399 400 401
    free( p_sys );
}

/****************************************************************************
 * Packetize: the whole thing
402 403
 * Search for the startcodes 3 or more bytes
 * Feed ParseNALBlock ALWAYS with 4 byte startcode prepended NALs
404 405 406 407 408
 ****************************************************************************/
static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
{
    decoder_sys_t *p_sys = p_dec->p_sys;

409
    return packetizer_Packetize( &p_sys->packetizer, pp_block );
410 411
}

412
/****************************************************************************
413 414
 * PacketizeAVC1: Takes VCL blocks of data and creates annexe B type NAL stream
 * Will always use 4 byte 0 0 0 1 startcodes
415
 * Will prepend a SPS and PPS before each keyframe
416 417 418 419 420 421 422 423
 ****************************************************************************/
static block_t *PacketizeAVC1( decoder_t *p_dec, block_t **pp_block )
{
    decoder_sys_t *p_sys = p_dec->p_sys;
    block_t       *p_block;
    block_t       *p_ret = NULL;
    uint8_t       *p;

424 425 426 427 428 429 430
    if( !pp_block || !*pp_block )
        return NULL;
    if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
    {
        block_Release( *pp_block );
        return NULL;
    }
431 432 433 434 435 436 437

    p_block = *pp_block;
    *pp_block = NULL;

    for( p = p_block->p_buffer; p < &p_block->p_buffer[p_block->i_buffer]; )
    {
        block_t *p_pic;
Laurent Aimar's avatar
Laurent Aimar committed
438
        bool b_dummy;
439 440 441 442 443 444 445 446
        int i_size = 0;
        int i;

        for( i = 0; i < p_sys->i_avcC_length_size; i++ )
        {
            i_size = (i_size << 8) | (*p++);
        }

447
        if( i_size <= 0 ||
448
            i_size > ( p_block->p_buffer + p_block->i_buffer - p ) )
449
        {
450 451 452
            msg_Err( p_dec, "Broken frame : size %d is too big", i_size );
            break;
        }
453

Laurent Aimar's avatar
Laurent Aimar committed
454
        block_t *p_part = CreateAnnexbNAL( p_dec, p, i_size );
455 456
        if( !p_part )
            break;
Laurent Aimar's avatar
Laurent Aimar committed
457

458 459 460 461
        p_part->i_dts = p_block->i_dts;
        p_part->i_pts = p_block->i_pts;

        /* Parse the NAL */
Laurent Aimar's avatar
Laurent Aimar committed
462
        if( ( p_pic = ParseNALBlock( p_dec, &b_dummy, p_part ) ) )
463 464
        {
            block_ChainAppend( &p_ret, p_pic );
465 466 467
        }
        p += i_size;
    }
468
    block_Release( p_block );
469 470 471 472

    return p_ret;
}

473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498
/*****************************************************************************
 * GetCc:
 *****************************************************************************/
static block_t *GetCc( decoder_t *p_dec, bool pb_present[4] )
{
    decoder_sys_t *p_sys = p_dec->p_sys;
    block_t *p_cc;

    for( int i = 0; i < 4; i++ )
        pb_present[i] = p_sys->cc.pb_present[i];

    if( p_sys->cc.i_data <= 0 )
        return NULL;

    p_cc = block_New( p_dec, p_sys->cc.i_data);
    if( p_cc )
    {
        memcpy( p_cc->p_buffer, p_sys->cc.p_data, p_sys->cc.i_data );
        p_cc->i_dts =
        p_cc->i_pts = p_sys->cc.b_reorder ? p_sys->i_cc_pts : p_sys->i_cc_dts;
        p_cc->i_flags = ( p_sys->cc.b_reorder  ? p_sys->i_cc_flags : BLOCK_FLAG_TYPE_P ) & BLOCK_FLAG_TYPE_MASK;
    }
    cc_Flush( &p_sys->cc );
    return p_cc;
}

Laurent Aimar's avatar
Laurent Aimar committed
499 500 501
/****************************************************************************
 * Helpers
 ****************************************************************************/
502 503 504 505 506 507 508 509 510 511
static void PacketizeReset( void *p_private, bool b_broken )
{
    decoder_t *p_dec = p_private;
    decoder_sys_t *p_sys = p_dec->p_sys;

    if( b_broken )
    {
        if( p_sys->p_frame )
            block_ChainRelease( p_sys->p_frame );
        p_sys->p_frame = NULL;
512 513
        p_sys->b_frame_sps = false;
        p_sys->b_frame_pps = false;
514 515 516
        p_sys->slice.i_frame_type = 0;
        p_sys->b_slice = false;
    }
517 518
    p_sys->i_frame_pts = VLC_TS_INVALID;
    p_sys->i_frame_dts = VLC_TS_INVALID;
519 520 521 522 523 524
}
static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t *p_block )
{
    decoder_t *p_dec = p_private;

    /* Remove trailing 0 bytes */
525
    while( p_block->i_buffer > 5 && p_block->p_buffer[p_block->i_buffer-1] == 0x00 )
526 527 528 529 530 531 532 533 534 535 536
        p_block->i_buffer--;

    return ParseNALBlock( p_dec, pb_ts_used, p_block );
}
static int PacketizeValidate( void *p_private, block_t *p_au )
{
    VLC_UNUSED(p_private);
    VLC_UNUSED(p_au);
    return VLC_SUCCESS;
}

Laurent Aimar's avatar
Laurent Aimar committed
537
static block_t *CreateAnnexbNAL( decoder_t *p_dec, const uint8_t *p, int i_size )
538 539 540
{
    block_t *p_nal;

541
    p_nal = block_New( p_dec, 4 + i_size );
542
    if( !p_nal ) return NULL;
543

544 545 546
    /* Add start code */
    p_nal->p_buffer[0] = 0x00;
    p_nal->p_buffer[1] = 0x00;
547 548
    p_nal->p_buffer[2] = 0x00;
    p_nal->p_buffer[3] = 0x01;
549

550
    /* Copy nalu */
551
    memcpy( &p_nal->p_buffer[4], p, i_size );
552

553
    VLC_UNUSED(p_dec);
554 555 556
    return p_nal;
}

Laurent Aimar's avatar
Laurent Aimar committed
557
static void CreateDecodedNAL( uint8_t **pp_ret, int *pi_ret,
Laurent Aimar's avatar
Laurent Aimar committed
558
                              const uint8_t *src, int i_src )
559
{
Laurent Aimar's avatar
Laurent Aimar committed
560
    const uint8_t *end = &src[i_src];
561 562
    uint8_t *dst = malloc( i_src );

563 564
    *pp_ret = dst;

565
    if( dst )
566
    {
567
        while( src < end )
568
        {
569 570 571 572 573
            if( src < end - 3 && src[0] == 0x00 && src[1] == 0x00 &&
                src[2] == 0x03 )
            {
                *dst++ = 0x00;
                *dst++ = 0x00;
574

575 576 577 578
                src += 3;
                continue;
            }
            *dst++ = *src++;
579 580 581 582 583 584 585 586 587 588 589 590 591 592 593
        }
    }
    *pi_ret = dst - *pp_ret;
}

static inline int bs_read_ue( bs_t *s )
{
    int i = 0;

    while( bs_read1( s ) == 0 && s->p < s->p_end && i < 32 )
    {
        i++;
    }
    return( ( 1 << i) - 1 + bs_read( s, i ) );
}
594

595
static inline int bs_read_se( bs_t *s )
596 597 598 599 600 601
{
    int val = bs_read_ue( s );

    return val&0x01 ? (val+1)/2 : -(val/2);
}

602 603
/*****************************************************************************
 * ParseNALBlock: parses annexB type NALs
604
 * All p_frag blocks are required to start with 0 0 0 1 4-byte startcode
605
 *****************************************************************************/
Laurent Aimar's avatar
Laurent Aimar committed
606
static block_t *ParseNALBlock( decoder_t *p_dec, bool *pb_used_ts, block_t *p_frag )
607 608 609 610
{
    decoder_sys_t *p_sys = p_dec->p_sys;
    block_t *p_pic = NULL;

611 612
    const int i_nal_ref_idc = (p_frag->p_buffer[4] >> 5)&0x03;
    const int i_nal_type = p_frag->p_buffer[4]&0x1f;
Laurent Aimar's avatar
Laurent Aimar committed
613 614
    const mtime_t i_frag_dts = p_frag->i_dts;
    const mtime_t i_frag_pts = p_frag->i_pts;
615

616
    if( p_sys->b_slice && ( !p_sys->b_sps || !p_sys->b_pps ) )
617
    {
618
        block_ChainRelease( p_sys->p_frame );
619
        msg_Warn( p_dec, "waiting for SPS/PPS" );
620

621
        /* Reset context */
622
        p_sys->slice.i_frame_type = 0;
623
        p_sys->p_frame = NULL;
624 625
        p_sys->b_frame_sps = false;
        p_sys->b_frame_pps = false;
626
        p_sys->b_slice = false;
627
        cc_Flush( &p_sys->cc_next );
628 629
    }

630
    if( ( !p_sys->b_sps || !p_sys->b_pps ) &&
631 632
        i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR )
    {
633
        p_sys->b_slice = true;
634 635 636
        /* Fragment will be discarded later on */
    }
    else if( i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR )
637
    {
638
        slice_t slice;
Laurent Aimar's avatar
Laurent Aimar committed
639
        bool  b_new_picture;
640

641
        ParseSlice( p_dec, &b_new_picture, &slice, i_nal_ref_idc, i_nal_type, p_frag );
642

643
        /* */
644 645
        if( b_new_picture && p_sys->b_slice )
            p_pic = OutputPicture( p_dec );
646 647 648

        /* */
        p_sys->slice = slice;
649 650 651 652 653
        p_sys->b_slice = true;
    }
    else if( i_nal_type == NAL_SPS )
    {
        if( p_sys->b_slice )
654
            p_pic = OutputPicture( p_dec );
655
        p_sys->b_frame_sps = true;
656

657
        PutSPS( p_dec, p_frag );
658

659
        /* Do not append the SPS because we will insert it on keyframes */
Laurent Aimar's avatar
Laurent Aimar committed
660
        p_frag = NULL;
661
    }
662
    else if( i_nal_type == NAL_PPS )
663
    {
664 665
        if( p_sys->b_slice )
            p_pic = OutputPicture( p_dec );
666
        p_sys->b_frame_pps = true;
667 668

        PutPPS( p_dec, p_frag );
669

670
        /* Do not append the PPS because we will insert it on keyframes */
Laurent Aimar's avatar
Laurent Aimar committed
671
        p_frag = NULL;
672 673 674 675 676
    }
    else if( i_nal_type == NAL_AU_DELIMITER ||
             i_nal_type == NAL_SEI ||
             ( i_nal_type >= 13 && i_nal_type <= 18 ) )
    {
677 678
        if( p_sys->b_slice )
            p_pic = OutputPicture( p_dec );
Laurent Aimar's avatar
Laurent Aimar committed
679

680
        /* Parse SEI for CC support */
681
        if( i_nal_type == NAL_SEI )
682
        {
683
            ParseSei( p_dec, p_frag );
684 685 686 687 688 689 690 691 692 693 694 695 696
        }
        else if( i_nal_type == NAL_AU_DELIMITER )
        {
            if( p_sys->p_frame && (p_sys->p_frame->i_flags & BLOCK_FLAG_PRIVATE_AUD) )
            {
                block_Release( p_frag );
                p_frag = NULL;
            }
            else
            {
                p_frag->i_flags |= BLOCK_FLAG_PRIVATE_AUD;
            }
        }
697 698
    }

699
    /* Append the block */
Laurent Aimar's avatar
Laurent Aimar committed
700 701
    if( p_frag )
        block_ChainAppend( &p_sys->p_frame, p_frag );
702

Laurent Aimar's avatar
Laurent Aimar committed
703
    *pb_used_ts = false;
704 705
    if( p_sys->i_frame_dts <= VLC_TS_INVALID && 
        p_sys->i_frame_pts <= VLC_TS_INVALID )
Laurent Aimar's avatar
Laurent Aimar committed
706 707 708 709 710
    {
        p_sys->i_frame_dts = i_frag_dts;
        p_sys->i_frame_pts = i_frag_pts;
        *pb_used_ts = true;
    }
711 712
    return p_pic;
}
713

714 715 716 717
static block_t *OutputPicture( decoder_t *p_dec )
{
    decoder_sys_t *p_sys = p_dec->p_sys;
    block_t *p_pic;
718

719 720 721 722 723 724 725 726 727 728 729 730
    if ( !p_sys->b_header && p_sys->i_recovery_frames != -1 )
    {
        if( p_sys->i_recovery_frames == 0 )
        {
            msg_Dbg( p_dec, "Recovery from SEI recovery point complete" );
            p_sys->b_header = true;
        }
        --p_sys->i_recovery_frames;
    }

    if( !p_sys->b_header && p_sys->i_recovery_frames == -1 &&
         p_sys->slice.i_frame_type != BLOCK_FLAG_TYPE_I)
731 732
        return NULL;

733 734 735 736
    const bool b_sps_pps_i = p_sys->slice.i_frame_type == BLOCK_FLAG_TYPE_I &&
                             p_sys->b_sps &&
                             p_sys->b_pps;
    if( b_sps_pps_i || p_sys->b_frame_sps || p_sys->b_frame_pps )
737
    {
738 739 740 741 742 743
        block_t *p_head = NULL;
        if( p_sys->p_frame->i_flags & BLOCK_FLAG_PRIVATE_AUD )
        {
            p_head = p_sys->p_frame;
            p_sys->p_frame = p_sys->p_frame->p_next;
        }
744

745
        block_t *p_list = NULL;
746
        for( int i = 0; i < SPS_MAX && (b_sps_pps_i || p_sys->b_frame_sps); i++ )
747 748 749 750
        {
            if( p_sys->pp_sps[i] )
                block_ChainAppend( &p_list, block_Duplicate( p_sys->pp_sps[i] ) );
        }
751
        for( int i = 0; i < PPS_MAX && (b_sps_pps_i || p_sys->b_frame_pps); i++ )
752 753 754 755
        {
            if( p_sys->pp_pps[i] )
                block_ChainAppend( &p_list, block_Duplicate( p_sys->pp_pps[i] ) );
        }
756
        if( b_sps_pps_i && p_list )
757
            p_sys->b_header = true;
Laurent Aimar's avatar
Laurent Aimar committed
758

759 760 761 762 763 764 765
        if( p_head )
            p_head->p_next = p_list;
        else
            p_head = p_list;
        block_ChainAppend( &p_head, p_sys->p_frame );

        p_pic = block_ChainGather( p_head );
766 767 768 769 770
    }
    else
    {
        p_pic = block_ChainGather( p_sys->p_frame );
    }
Laurent Aimar's avatar
Laurent Aimar committed
771 772
    p_pic->i_dts = p_sys->i_frame_dts;
    p_pic->i_pts = p_sys->i_frame_pts;
773 774
    p_pic->i_length = 0;    /* FIXME */
    p_pic->i_flags |= p_sys->slice.i_frame_type;
775
    p_pic->i_flags &= ~BLOCK_FLAG_PRIVATE_AUD;
776 777
    if( !p_sys->b_header )
        p_pic->i_flags |= BLOCK_FLAG_PREROLL;
778 779 780

    p_sys->slice.i_frame_type = 0;
    p_sys->p_frame = NULL;
781 782
    p_sys->i_frame_dts = VLC_TS_INVALID;
    p_sys->i_frame_pts = VLC_TS_INVALID;
783 784
    p_sys->b_frame_sps = false;
    p_sys->b_frame_pps = false;
785 786
    p_sys->b_slice = false;

787 788 789 790 791
    /* CC */
    p_sys->i_cc_pts = p_pic->i_pts;
    p_sys->i_cc_dts = p_pic->i_dts;
    p_sys->i_cc_flags = p_pic->i_flags;

792 793 794 795 796 797 798
    /* Swap cc buffer */
    cc_data_t cc_tmp = p_sys->cc;
    p_sys->cc = p_sys->cc_next;
    p_sys->cc_next = cc_tmp;

    cc_Flush( &p_sys->cc_next );

799 800
    return p_pic;
}
801

802 803 804
static void PutSPS( decoder_t *p_dec, block_t *p_frag )
{
    decoder_sys_t *p_sys = p_dec->p_sys;
805

806
    uint8_t *pb_dec = NULL;
807 808 809
    int     i_dec = 0;
    bs_t s;
    int i_tmp;
810
    int i_sps_id;
811

812
    CreateDecodedNAL( &pb_dec, &i_dec, &p_frag->p_buffer[5],
813 814
                     p_frag->i_buffer - 5 );

815
    bs_init( &s, pb_dec, i_dec );
816
    int i_profile_idc = bs_read( &s, 8 );
817 818 819 820
    p_dec->fmt_out.i_profile = i_profile_idc;
    /* Skip constraint_set0123, reserved(4) */
    bs_skip( &s, 1+1+1+1 + 4 );
    p_dec->fmt_out.i_level = bs_read( &s, 8 );
821
    /* sps id */
822 823 824 825 826 827 828 829 830
    i_sps_id = bs_read_ue( &s );
    if( i_sps_id >= SPS_MAX )
    {
        msg_Warn( p_dec, "invalid SPS (sps_id=%d)", i_sps_id );
        free( pb_dec );
        block_Release( p_frag );
        return;
    }

Laurent Aimar's avatar
Laurent Aimar committed
831 832 833 834
    if( i_profile_idc == 100 || i_profile_idc == 110 ||
        i_profile_idc == 122 || i_profile_idc == 244 ||
        i_profile_idc ==  44 || i_profile_idc ==  83 ||
        i_profile_idc ==  86 )
835 836
    {
        /* chroma_format_idc */
Laurent Aimar's avatar
Laurent Aimar committed
837 838
        const int i_chroma_format_idc = bs_read_ue( &s );
        if( i_chroma_format_idc == 3 )
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
839
            bs_skip( &s, 1 ); /* separate_colour_plane_flag */
840 841 842 843 844 845 846 847 848 849
        /* bit_depth_luma_minus8 */
        bs_read_ue( &s );
        /* bit_depth_chroma_minus8 */
        bs_read_ue( &s );
        /* qpprime_y_zero_transform_bypass_flag */
        bs_skip( &s, 1 );
        /* seq_scaling_matrix_present_flag */
        i_tmp = bs_read( &s, 1 );
        if( i_tmp )
        {
Laurent Aimar's avatar
Laurent Aimar committed
850 851
            for( int i = 0; i < ((3 != i_chroma_format_idc) ? 8 : 12); i++ )
            {
852 853 854 855
                /* seq_scaling_list_present_flag[i] */
                i_tmp = bs_read( &s, 1 );
                if( !i_tmp )
                    continue;
Laurent Aimar's avatar
Laurent Aimar committed
856
                const int i_size_of_scaling_list = (i < 6 ) ? 16 : 64;
857 858 859
                /* scaling_list (...) */
                int i_lastscale = 8;
                int i_nextscale = 8;
Laurent Aimar's avatar
Laurent Aimar committed
860 861 862 863
                for( int j = 0; j < i_size_of_scaling_list; j++ )
                {
                    if( i_nextscale != 0 )
                    {
864
                        /* delta_scale */
865
                        i_tmp = bs_read_se( &s );
866 867 868 869 870 871 872 873 874 875
                        i_nextscale = ( i_lastscale + i_tmp + 256 ) % 256;
                        /* useDefaultScalingMatrixFlag = ... */
                    }
                    /* scalinglist[j] */
                    i_lastscale = ( i_nextscale == 0 ) ? i_lastscale : i_nextscale;
                }
            }
        }
    }

876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901
    /* Skip i_log2_max_frame_num */
    p_sys->i_log2_max_frame_num = bs_read_ue( &s );
    if( p_sys->i_log2_max_frame_num > 12)
        p_sys->i_log2_max_frame_num = 12;
    /* Read poc_type */
    p_sys->i_pic_order_cnt_type = bs_read_ue( &s );
    if( p_sys->i_pic_order_cnt_type == 0 )
    {
        /* skip i_log2_max_poc_lsb */
        p_sys->i_log2_max_pic_order_cnt_lsb = bs_read_ue( &s );
        if( p_sys->i_log2_max_pic_order_cnt_lsb > 12 )
            p_sys->i_log2_max_pic_order_cnt_lsb = 12;
    }
    else if( p_sys->i_pic_order_cnt_type == 1 )
    {
        int i_cycle;
        /* skip b_delta_pic_order_always_zero */
        p_sys->i_delta_pic_order_always_zero_flag = bs_read( &s, 1 );
        /* skip i_offset_for_non_ref_pic */
        bs_read_se( &s );
        /* skip i_offset_for_top_to_bottom_field */
        bs_read_se( &s );
        /* read i_num_ref_frames_in_poc_cycle */
        i_cycle = bs_read_ue( &s );
        if( i_cycle > 256 ) i_cycle = 256;
        while( i_cycle > 0 )
902
        {
903 904
            /* skip i_offset_for_ref_frame */
            bs_read_se(&s );
Laurent Aimar's avatar
Laurent Aimar committed
905
            i_cycle--;
906
        }
907 908 909 910 911 912 913 914 915 916 917 918 919 920
    }
    /* i_num_ref_frames */
    bs_read_ue( &s );
    /* b_gaps_in_frame_num_value_allowed */
    bs_skip( &s, 1 );

    /* Read size */
    p_dec->fmt_out.video.i_width  = 16 * ( bs_read_ue( &s ) + 1 );
    p_dec->fmt_out.video.i_height = 16 * ( bs_read_ue( &s ) + 1 );

    /* b_frame_mbs_only */
    p_sys->b_frame_mbs_only = bs_read( &s, 1 );
    if( p_sys->b_frame_mbs_only == 0 )
    {
921
        bs_skip( &s, 1 );
922 923 924
    }
    /* b_direct8x8_inference */
    bs_skip( &s, 1 );
925

926 927 928 929 930 931 932 933 934 935 936 937 938
    /* crop */
    i_tmp = bs_read( &s, 1 );
    if( i_tmp )
    {
        /* left */
        bs_read_ue( &s );
        /* right */
        bs_read_ue( &s );
        /* top */
        bs_read_ue( &s );
        /* bottom */
        bs_read_ue( &s );
    }
939

940 941 942 943
    /* vui */
    i_tmp = bs_read( &s, 1 );
    if( i_tmp )
    {
944
        /* read the aspect ratio part if any */
945 946 947
        i_tmp = bs_read( &s, 1 );
        if( i_tmp )
        {
948
            static const struct { int w, h; } sar[17] =
949
            {
950 951 952
                { 0,   0 }, { 1,   1 }, { 12, 11 }, { 10, 11 },
                { 16, 11 }, { 40, 33 }, { 24, 11 }, { 20, 11 },
                { 32, 11 }, { 80, 33 }, { 18, 11 }, { 15, 11 },
953 954
                { 64, 33 }, { 160,99 }, {  4,  3 }, {  3,  2 },
                {  2,  1 },
955 956 957 958
            };
            int i_sar = bs_read( &s, 8 );
            int w, h;

959
            if( i_sar < 17 )
960 961 962 963
            {
                w = sar[i_sar].w;
                h = sar[i_sar].h;
            }
964
            else if( i_sar == 255 )
965 966 967
            {
                w = bs_read( &s, 16 );
                h = bs_read( &s, 16 );
968
            }
969 970 971 972 973
            else
            {
                w = 0;
                h = 0;
            }
974

Laurent Aimar's avatar
Laurent Aimar committed
975 976 977 978 979
            if( w != 0 && h != 0 )
            {
                p_dec->fmt_out.video.i_sar_num = w;
                p_dec->fmt_out.video.i_sar_den = h;
            }
980
            else
Laurent Aimar's avatar
Laurent Aimar committed
981 982 983 984
            {
                p_dec->fmt_out.video.i_sar_num = 1;
                p_dec->fmt_out.video.i_sar_den = 1;
            }
985
        }
986
    }
987

988
    free( pb_dec );
989

990
    /* We have a new SPS */
991 992 993 994
    if( !p_sys->b_sps )
        msg_Dbg( p_dec, "found NAL_SPS (sps_id=%d)", i_sps_id );
    p_sys->b_sps = true;

995 996 997
    if( p_sys->pp_sps[i_sps_id] )
        block_Release( p_sys->pp_sps[i_sps_id] );
    p_sys->pp_sps[i_sps_id] = p_frag;
998
}
999

1000 1001 1002 1003
static void PutPPS( decoder_t *p_dec, block_t *p_frag )
{
    decoder_sys_t *p_sys = p_dec->p_sys;
    bs_t s;
1004 1005
    int i_pps_id;
    int i_sps_id;
1006

1007
    bs_init( &s, &p_frag->p_buffer[5], p_frag->i_buffer - 5 );
1008 1009 1010 1011 1012 1013 1014 1015
    i_pps_id = bs_read_ue( &s ); // pps id
    i_sps_id = bs_read_ue( &s ); // sps id
    if( i_pps_id >= PPS_MAX || i_sps_id >= SPS_MAX )
    {
        msg_Warn( p_dec, "invalid PPS (pps_id=%d sps_id=%d)", i_pps_id, i_sps_id );
        block_Release( p_frag );
        return;
    }
1016 1017
    bs_skip( &s, 1 ); // entropy coding mode flag
    p_sys->i_pic_order_present_flag = bs_read( &s, 1 );
1018
    /* TODO */
1019

1020
    /* We have a new PPS */
1021
    if( !p_sys->b_pps )
1022
        msg_Dbg( p_dec, "found NAL_PPS (pps_id=%d sps_id=%d)", i_pps_id, i_sps_id );
1023
    p_sys->b_pps = true;
1024

1025 1026 1027
    if( p_sys->pp_pps[i_pps_id] )
        block_Release( p_sys->pp_pps[i_pps_id] );
    p_sys->pp_pps[i_pps_id] = p_frag;
1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038
}

static void ParseSlice( decoder_t *p_dec, bool *pb_new_picture, slice_t *p_slice,
                        int i_nal_ref_idc, int i_nal_type, const block_t *p_frag )
{
    decoder_sys_t *p_sys = p_dec->p_sys;
    uint8_t *pb_dec;
    int i_dec;
    int i_first_mb, i_slice_type;
    slice_t slice;
    bs_t s;
Laurent Aimar's avatar
Laurent Aimar committed
1039

1040
    /* do not convert the whole frame */
Laurent Aimar's avatar
Laurent Aimar committed
1041
    CreateDecodedNAL( &pb_dec, &i_dec, &p_frag->p_buffer[5],
1042 1043
                     __MIN( p_frag->i_buffer - 5, 60 ) );
    bs_init( &s, pb_dec, i_dec );
1044

1045 1046
    /* first_mb_in_slice */
    i_first_mb = bs_read_ue( &s );
1047

1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068
    /* slice_type */
    switch( (i_slice_type = bs_read_ue( &s )) )
    {
    case 0: case 5:
        slice.i_frame_type = BLOCK_FLAG_TYPE_P;
        break;
    case 1: case 6:
        slice.i_frame_type = BLOCK_FLAG_TYPE_B;
        break;
    case 2: case 7:
        slice.i_frame_type = BLOCK_FLAG_TYPE_I;
        break;
    case 3: case 8: /* SP */
        slice.i_frame_type = BLOCK_FLAG_TYPE_P;
        break;
    case 4: case 9:
        slice.i_frame_type = BLOCK_FLAG_TYPE_I;
        break;
    default:
        slice.i_frame_type = 0;
        break;
1069
    }
1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080

    /* */
    slice.i_nal_type = i_nal_type;
    slice.i_nal_ref_idc = i_nal_ref_idc;

    slice.i_pic_parameter_set_id = bs_read_ue( &s );
    slice.i_frame_num = bs_read( &s, p_sys->i_log2_max_frame_num + 4 );

    slice.i_field_pic_flag = 0;
    slice.i_bottom_field_flag = -1;
    if( !p_sys->b_frame_mbs_only )
1081
    {
1082 1083 1084 1085
        /* field_pic_flag */
        slice.i_field_pic_flag = bs_read( &s, 1 );
        if( slice.i_field_pic_flag )
            slice.i_bottom_field_flag = bs_read( &s, 1 );
1086 1087
    }

1088 1089 1090
    slice.i_idr_pic_id = p_sys->slice.i_idr_pic_id;
    if( slice.i_nal_type == NAL_SLICE_IDR )
        slice.i_idr_pic_id = bs_read_ue( &s );
1091

1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137
    slice.i_pic_order_cnt_lsb = -1;
    slice.i_delta_pic_order_cnt_bottom = -1;
    slice.i_delta_pic_order_cnt0 = 0;
    slice.i_delta_pic_order_cnt1 = 0;
    if( p_sys->i_pic_order_cnt_type == 0 )
    {
        slice.i_pic_order_cnt_lsb = bs_read( &s, p_sys->i_log2_max_pic_order_cnt_lsb + 4 );
        if( p_sys->i_pic_order_present_flag && !slice.i_field_pic_flag )
            slice.i_delta_pic_order_cnt_bottom = bs_read_se( &s );
    }
    else if( (p_sys->i_pic_order_cnt_type == 1) &&
             (!p_sys->i_delta_pic_order_always_zero_flag) )
    {
        slice.i_delta_pic_order_cnt0 = bs_read_se( &s );
        if( p_sys->i_pic_order_present_flag && !slice.i_field_pic_flag )
            slice.i_delta_pic_order_cnt1 = bs_read_se( &s );
    }
    free( pb_dec );

    /* Detection of the first VCL NAL unit of a primary coded picture
     * (cf. 7.4.1.2.4) */
    bool b_pic = false;
    if( slice.i_frame_num != p_sys->slice.i_frame_num ||
        slice.i_pic_parameter_set_id != p_sys->slice.i_pic_parameter_set_id ||
        slice.i_field_pic_flag != p_sys->slice.i_field_pic_flag ||
        slice.i_nal_ref_idc != p_sys->slice.i_nal_ref_idc )
        b_pic = true;
    if( (slice.i_bottom_field_flag != -1) &&
        (p_sys->slice.i_bottom_field_flag != -1) &&
        (slice.i_bottom_field_flag != p_sys->slice.i_bottom_field_flag) )
        b_pic = true;
    if( p_sys->i_pic_order_cnt_type == 0 &&
        ( slice.i_pic_order_cnt_lsb != p_sys->slice.i_pic_order_cnt_lsb ||
          slice.i_delta_pic_order_cnt_bottom != p_sys->slice.i_delta_pic_order_cnt_bottom ) )
        b_pic = true;
    else if( p_sys->i_pic_order_cnt_type == 1 &&
             ( slice.i_delta_pic_order_cnt0 != p_sys->slice.i_delta_pic_order_cnt0 ||
               slice.i_delta_pic_order_cnt1 != p_sys->slice.i_delta_pic_order_cnt1 ) )
        b_pic = true;
    if( ( slice.i_nal_type == NAL_SLICE_IDR || p_sys->slice.i_nal_type == NAL_SLICE_IDR ) &&
        ( slice.i_nal_type != p_sys->slice.i_nal_type || slice.i_idr_pic_id != p_sys->slice.i_idr_pic_id ) )
            b_pic = true;

    /* */
    *pb_new_picture = b_pic;
    *p_slice = slice;
1138
}
1139

1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190
static void ParseSei( decoder_t *p_dec, block_t *p_frag )
{
    decoder_sys_t *p_sys = p_dec->p_sys;
    uint8_t *pb_dec;
    int i_dec;

    /* */
    CreateDecodedNAL( &pb_dec, &i_dec, &p_frag->p_buffer[5], p_frag->i_buffer - 5 );
    if( !pb_dec )
        return;

    /* The +1 is for rbsp trailing bits */
    for( int i_used = 0; i_used+1 < i_dec; )
    {
        /* Read type */
        int i_type = 0;
        while( i_used+1 < i_dec )
        {
            const int i_byte = pb_dec[i_used++];
            i_type += i_byte;
            if( i_byte != 0xff )
                break;
        }
        /* Read size */
        int i_size = 0;
        while( i_used+1 < i_dec )
        {
            const int i_byte = pb_dec[i_used++];
            i_size += i_byte;
            if( i_byte != 0xff )
                break;
        }
        /* Check room */
        if( i_used + i_size + 1 > i_dec )
            break;

        /* Look for user_data_registered_itu_t_t35 */
        if( i_type == 4 )
        {
            static const uint8_t p_dvb1_data_start_code[] = {
                0xb5,
                0x00, 0x31,
                0x47, 0x41, 0x39, 0x34
            };
            const int      i_t35 = i_size;
            const uint8_t *p_t35 = &pb_dec[i_used];

            /* Check for we have DVB1_data() */
            if( i_t35 >= 5 &&
                !memcmp( p_t35, p_dvb1_data_start_code, sizeof(p_dvb1_data_start_code) ) )
            {
1191
                cc_Extract( &p_sys->cc_next, true, &p_t35[3], i_t35 - 3 );
1192 1193
            }
        }
1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214

        /* Look for SEI recovery point */
        if( i_type == 6 )
        {
            bs_t s;
            const int      i_rec = i_size;
            const uint8_t *p_rec = &pb_dec[i_used];
    
            bs_init( &s, p_rec, i_rec );
            int i_recovery_frames = bs_read_ue( &s );
            //bool b_exact_match = bs_read( &s, 1 );
            //bool b_broken_link = bs_read( &s, 1 );
            //int i_changing_slice_group = bs_read( &s, 2 );
            if( !p_sys->b_header )
            {
                msg_Dbg( p_dec, "Seen SEI recovery point, %d recovery frames", i_recovery_frames );
                if ( p_sys->i_recovery_frames == -1 || i_recovery_frames < p_sys->i_recovery_frames )
                    p_sys->i_recovery_frames = i_recovery_frames;
            }
        }

1215 1216 1217 1218 1219
        i_used += i_size;
    }

    free( pb_dec );
}
1220