/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/sout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_codec.h>
+#include <vlc_block.h>
#include "vlc_block_helper.h"
#include "vlc_bits.h"
+#include "../codec/cc.h"
+#include "packetizer_helper.h"
/*****************************************************************************
* Module descriptor
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-vlc_module_begin();
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_PACKETIZER );
- set_description( _("H.264 video packetizer") );
- set_capability( "packetizer", 50 );
- set_callbacks( Open, Close );
-vlc_module_end();
+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 ()
/****************************************************************************
* Local prototypes
****************************************************************************/
-static block_t *Packetize( decoder_t *, block_t ** );
-static block_t *PacketizeAVC1( decoder_t *, block_t ** );
+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;
+
+#define SPS_MAX (32)
+#define PPS_MAX (256)
struct decoder_sys_t
{
- block_bytestream_t bytestream;
+ /* */
+ packetizer_t packetizer;
- int i_state;
- int i_offset;
- uint8_t startcode[4];
+ /* */
+ bool b_slice;
+ block_t *p_frame;
- vlc_bool_t b_slice;
- block_t *p_frame;
-
- vlc_bool_t b_sps;
- vlc_bool_t b_pps;
- vlc_bool_t b_header;
+ bool b_header;
+ bool b_sps;
+ bool b_pps;
+ block_t *pp_sps[SPS_MAX];
+ block_t *pp_pps[PPS_MAX];
/* avcC data */
int i_avcC_length_size;
- block_t *p_sps;
- block_t *p_pps;
/* Useful values of the Sequence Parameter Set */
int i_log2_max_frame_num;
int b_frame_mbs_only;
+ 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;
/* Useful values of the Slice Header */
- int i_nal_type;
- int i_nal_ref_idc;
- int i_idr_pic_id;
- int i_frame_num;
- int i_frame_type;
-};
+ slice_t slice;
-enum
-{
- STATE_NOSYNC,
- STATE_NEXT_SYNC,
+ /* */
+ mtime_t i_frame_pts;
+ mtime_t i_frame_dts;
+
+ /* */
+ uint32_t i_cc_flags;
+ mtime_t i_cc_pts;
+ mtime_t i_cc_dts;
+ cc_data_t cc;
+
+ cc_data_t cc_next;
};
enum nal_unit_type_e
NAL_PRIORITY_HIGHEST = 3,
};
-static block_t *ParseNALBlock( decoder_t *, block_t * );
+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] );
+
+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 * );
+static block_t *CreateAnnexbNAL( decoder_t *, const uint8_t *p, int );
+
+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 );
+static void ParseSei( decoder_t *, block_t * );
-static block_t *nal_get_annexeb( decoder_t *, uint8_t *p, int );
+
+static const uint8_t p_h264_startcode[3] = { 0x00, 0x00, 0x01 };
/*****************************************************************************
* Open: probe the packetizer and return score
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
+ int i;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'h', '2', '6', '4') &&
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_H264 &&
p_dec->fmt_in.i_codec != VLC_FOURCC( 'H', '2', '6', '4') &&
p_dec->fmt_in.i_codec != VLC_FOURCC( 'V', 'S', 'S', 'H') &&
p_dec->fmt_in.i_codec != VLC_FOURCC( 'v', 's', 's', 'h') &&
p_dec->fmt_in.i_codec != VLC_FOURCC( 'D', 'A', 'V', 'C') &&
+ p_dec->fmt_in.i_codec != VLC_FOURCC( 'x', '2', '6', '4') &&
+ p_dec->fmt_in.i_codec != VLC_FOURCC( 'X', '2', '6', '4') &&
( p_dec->fmt_in.i_codec != VLC_FOURCC( 'a', 'v', 'c', '1') ||
p_dec->fmt_in.i_extra < 7 ) )
{
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys = malloc( sizeof(decoder_sys_t) ) ) == NULL )
{
- msg_Err( p_dec, "out of memory" );
- return VLC_EGENERIC;
+ return VLC_ENOMEM;
}
- p_sys->i_state = STATE_NOSYNC;
- p_sys->i_offset = 0;
- p_sys->startcode[0] = 0;
- p_sys->startcode[1] = 0;
- p_sys->startcode[2] = 0;
- p_sys->startcode[3] = 1;
- p_sys->bytestream = block_BytestreamInit( p_dec );
- p_sys->b_slice = VLC_FALSE;
+
+ packetizer_Init( &p_sys->packetizer,
+ p_h264_startcode, sizeof(p_h264_startcode),
+ p_h264_startcode, 1,
+ PacketizeReset, PacketizeParse, PacketizeValidate, p_dec );
+
+ p_sys->b_slice = false;
p_sys->p_frame = NULL;
- p_sys->b_sps = VLC_FALSE;
- p_sys->b_pps = VLC_FALSE;
- p_sys->p_sps = 0;
- p_sys->p_pps = 0;
- p_sys->b_header= VLC_FALSE;
-
- p_sys->i_nal_type = -1;
- p_sys->i_nal_ref_idc = -1;
- p_sys->i_idr_pic_id = -1;
- p_sys->i_frame_num = -1;
- p_sys->i_frame_type = 0;
+ p_sys->b_header= false;
+ p_sys->b_sps = false;
+ p_sys->b_pps = false;
+ 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;
+
+ 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;
+
+ p_sys->i_frame_dts = -1;
+ p_sys->i_frame_pts = -1;
/* Setup properties */
es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
- p_dec->fmt_out.i_codec = VLC_FOURCC( 'h', '2', '6', '4' );
+ p_dec->fmt_out.i_codec = VLC_CODEC_H264;
if( p_dec->fmt_in.i_codec == VLC_FOURCC( 'a', 'v', 'c', '1' ) )
{
* The fmt_out.p_extra should contain all the SPS and PPS with 4 byte startcodes */
uint8_t *p = &((uint8_t*)p_dec->fmt_in.p_extra)[4];
int i_sps, i_pps;
+ bool b_dummy;
int i;
/* Parse avcC */
i_sps = (*p++)&0x1f;
for( i = 0; i < i_sps; i++ )
{
- int i_length = GetWBE( p );
- block_t *p_sps = nal_get_annexeb( p_dec, p + 2, i_length );
-
- p_sys->p_sps = block_Duplicate( p_sps );
- p_sps->i_pts = p_sps->i_dts = mdate();
- ParseNALBlock( p_dec, p_sps );
- p += 2 + i_length;
+ 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;
+ }
+ block_t *p_sps = CreateAnnexbNAL( p_dec, p, i_length );
+ if( !p_sps )
+ return VLC_EGENERIC;
+ ParseNALBlock( p_dec, &b_dummy, p_sps );
+ p += i_length;
}
/* Read PPS */
i_pps = *p++;
for( i = 0; i < i_pps; i++ )
{
- int i_length = GetWBE( p );
- block_t *p_pps = nal_get_annexeb( p_dec, p + 2, i_length );
-
- p_sys->p_pps = block_Duplicate( p_pps );
- p_pps->i_pts = p_pps->i_dts = mdate();
- ParseNALBlock( p_dec, p_pps );
- p += 2 + i_length;
+ 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;
+ }
+ block_t *p_pps = CreateAnnexbNAL( p_dec, p, i_length );
+ if( !p_pps )
+ return VLC_EGENERIC;
+ ParseNALBlock( p_dec, &b_dummy, p_pps );
+ p += i_length;
}
msg_Dbg( p_dec, "avcC length size=%d, sps=%d, pps=%d",
p_sys->i_avcC_length_size, i_sps, i_pps );
+ if( !p_sys->b_sps || !p_sys->b_pps )
+ return VLC_EGENERIC;
+
/* FIXME: FFMPEG isn't happy at all if you leave this */
- if( p_dec->fmt_out.i_extra ) free( p_dec->fmt_out.p_extra );
- p_dec->fmt_out.i_extra = 0; p_dec->fmt_out.p_extra = NULL;
-
+ if( p_dec->fmt_out.i_extra > 0 )
+ free( p_dec->fmt_out.p_extra );
+ p_dec->fmt_out.i_extra = 0;
+ p_dec->fmt_out.p_extra = NULL;
+
/* Set the new extradata */
- p_dec->fmt_out.i_extra = p_sys->p_pps->i_buffer + p_sys->p_sps->i_buffer;
- p_dec->fmt_out.p_extra = (uint8_t*)malloc( p_dec->fmt_out.i_extra );
- memcpy( p_dec->fmt_out.p_extra, p_sys->p_sps->p_buffer, p_sys->p_sps->i_buffer);
- memcpy( p_dec->fmt_out.p_extra+p_sys->p_sps->i_buffer, p_sys->p_pps->p_buffer, p_sys->p_pps->i_buffer);
- p_sys->b_header = VLC_TRUE;
+ 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;
+ }
+ p_dec->fmt_out.p_extra = malloc( p_dec->fmt_out.i_extra );
+ if( p_dec->fmt_out.p_extra )
+ {
+ 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;
+ }
+ }
+ p_sys->b_header = true;
+ }
+ else
+ {
+ p_dec->fmt_out.i_extra = 0;
+ }
/* Set callback */
p_dec->pf_packetize = PacketizeAVC1;
+ /* TODO CC ? */
}
else
{
- /* This type of stream contains data with 3 of 4 byte startcodes
+ /* This type of stream contains data with 3 of 4 byte startcodes
* The fmt_in.p_extra MAY contain SPS/PPS with 4 byte startcodes
* The fmt_out.p_extra should be the same */
-
+
/* Set callback */
p_dec->pf_packetize = Packetize;
+ p_dec->pf_get_cc = GetCc;
/* */
- if( p_dec->fmt_in.i_extra > 0 )
- {
- block_t *p_init = block_New( p_dec, p_dec->fmt_in.i_extra );
- block_t *p_pic;
-
- memcpy( p_init->p_buffer, p_dec->fmt_in.p_extra,
- p_dec->fmt_in.i_extra );
+ p_sys->i_cc_pts = 0;
+ p_sys->i_cc_dts = 0;
+ p_sys->i_cc_flags = 0;
+ cc_Init( &p_sys->cc );
+ cc_Init( &p_sys->cc_next );
- while( ( p_pic = Packetize( p_dec, &p_init ) ) )
- {
- /* Should not occur because we should only receive SPS/PPS */
- block_Release( p_pic );
- }
- }
+ /* */
+ if( p_dec->fmt_in.i_extra > 0 )
+ packetizer_Header( &p_sys->packetizer,
+ p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra );
}
return VLC_SUCCESS;
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
+ int i;
+
+ if( p_sys->p_frame )
+ block_ChainRelease( p_sys->p_frame );
+ 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] );
+ }
+ packetizer_Clean( &p_sys->packetizer );
+
+ if( p_dec->pf_get_cc )
+ {
+ cc_Exit( &p_sys->cc_next );
+ cc_Exit( &p_sys->cc );
+ }
- if( p_sys->p_frame ) block_ChainRelease( p_sys->p_frame );
- if( p_sys->p_sps ) block_Release( p_sys->p_sps );
- if( p_sys->p_pps ) block_Release( p_sys->p_pps );
- block_BytestreamRelease( &p_sys->bytestream );
free( p_sys );
}
static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- block_t *p_pic;
-
- if( !pp_block || !*pp_block ) return NULL;
-
- block_BytestreamPush( &p_sys->bytestream, *pp_block );
-
- for( ;; )
- {
- switch( p_sys->i_state )
- {
- case STATE_NOSYNC:
- /* Skip until 3 byte startcode 0 0 1 */
- if( block_FindStartcodeFromOffset( &p_sys->bytestream,
- &p_sys->i_offset, p_sys->startcode+1, 3 ) == VLC_SUCCESS)
- {
- p_sys->i_state = STATE_NEXT_SYNC;
- }
-
- if( p_sys->i_offset )
- {
- /* skip the data */
- block_SkipBytes( &p_sys->bytestream, p_sys->i_offset );
- p_sys->i_offset = 0;
- block_BytestreamFlush( &p_sys->bytestream );
- }
-
- if( p_sys->i_state != STATE_NEXT_SYNC )
- {
- /* Need more data */
- return NULL;
- }
-
- p_sys->i_offset = 1; /* To find next startcode */
- case STATE_NEXT_SYNC:
- /* Find the next 3 byte startcode 0 0 1*/
- if( block_FindStartcodeFromOffset( &p_sys->bytestream,
- &p_sys->i_offset, p_sys->startcode+1, 3 ) != VLC_SUCCESS)
- {
- /* Need more data */
- return NULL;
- }
-
- /* Get the new fragment and set the pts/dts */
- p_pic = block_New( p_dec, p_sys->i_offset +1 );
- p_pic->i_pts = p_sys->bytestream.p_block->i_pts;
- p_pic->i_dts = p_sys->bytestream.p_block->i_dts;
- /* Force 4 byte startcode 0 0 0 1 */
- p_pic->p_buffer[0] = 0;
-
- block_GetBytes( &p_sys->bytestream, &p_pic->p_buffer[1],
- p_pic->i_buffer-1 );
-
- /* Remove trailing 0 bytes */
- while( p_pic->i_buffer && (!p_pic->p_buffer[p_pic->i_buffer-1] ) ) p_pic->i_buffer--;
- p_sys->i_offset = 0;
-
- /* Parse the NAL */
- if( !( p_pic = ParseNALBlock( p_dec, p_pic ) ) )
- {
- p_sys->i_state = STATE_NOSYNC;
- break;
- }
-#if 0
- msg_Dbg( p_dec, "pts="I64Fd" dts="I64Fd,
- p_pic->i_pts, p_pic->i_dts );
-#endif
-
- /* So p_block doesn't get re-added several times */
- *pp_block = block_BytestreamPop( &p_sys->bytestream );
-
- p_sys->i_state = STATE_NOSYNC;
-
- return p_pic;
- }
- }
+ return packetizer_Packetize( &p_sys->packetizer, pp_block );
}
/****************************************************************************
block_t *p_ret = NULL;
uint8_t *p;
- if( !pp_block || !*pp_block ) return NULL;
+ if( !pp_block || !*pp_block )
+ return NULL;
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ {
+ block_Release( *pp_block );
+ return NULL;
+ }
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;
+ bool b_dummy;
int i_size = 0;
int i;
i_size = (i_size << 8) | (*p++);
}
- if( i_size > 0 )
+ if( i_size <= 0 ||
+ i_size > ( p_block->p_buffer + p_block->i_buffer - p ) )
{
- block_t *p_part = nal_get_annexeb( p_dec, p, i_size );
+ msg_Err( p_dec, "Broken frame : size %d is too big", i_size );
+ break;
+ }
- p_part->i_dts = p_block->i_dts;
- p_part->i_pts = p_block->i_pts;
+ block_t *p_part = CreateAnnexbNAL( p_dec, p, i_size );
+ if( !p_part )
+ break;
- /* Parse the NAL */
- if( ( p_pic = ParseNALBlock( p_dec, p_part ) ) )
- {
- block_ChainAppend( &p_ret, p_pic );
- }
+ p_part->i_dts = p_block->i_dts;
+ p_part->i_pts = p_block->i_pts;
+
+ /* Parse the NAL */
+ if( ( p_pic = ParseNALBlock( p_dec, &b_dummy, p_part ) ) )
+ {
+ block_ChainAppend( &p_ret, p_pic );
}
p += i_size;
}
return p_ret;
}
-static block_t *nal_get_annexeb( decoder_t *p_dec, uint8_t *p, int i_size )
+/*****************************************************************************
+ * 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;
+}
+
+/****************************************************************************
+ * Helpers
+ ****************************************************************************/
+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;
+ p_sys->slice.i_frame_type = 0;
+ p_sys->b_slice = false;
+ }
+ p_sys->i_frame_pts = -1;
+ p_sys->i_frame_dts = -1;
+}
+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 */
+ while( p_block->i_buffer && p_block->p_buffer[p_block->i_buffer-1] == 0x00 )
+ 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;
+}
+
+static block_t *CreateAnnexbNAL( decoder_t *p_dec, const uint8_t *p, int i_size )
{
block_t *p_nal;
p_nal = block_New( p_dec, 4 + i_size );
+ if( !p_nal ) return NULL;
/* Add start code */
p_nal->p_buffer[0] = 0x00;
/* Copy nalu */
memcpy( &p_nal->p_buffer[4], p, i_size );
+ VLC_UNUSED(p_dec);
return p_nal;
}
-static void nal_get_decoded( uint8_t **pp_ret, int *pi_ret,
- uint8_t *src, int i_src )
+static void CreateDecodedNAL( uint8_t **pp_ret, int *pi_ret,
+ const uint8_t *src, int i_src )
{
- uint8_t *end = &src[i_src];
+ const uint8_t *end = &src[i_src];
uint8_t *dst = malloc( i_src );
*pp_ret = dst;
- while( src < end )
+ if( dst )
{
- if( src < end - 3 && src[0] == 0x00 && src[1] == 0x00 &&
- src[2] == 0x03 )
+ while( src < end )
{
- *dst++ = 0x00;
- *dst++ = 0x00;
+ if( src < end - 3 && src[0] == 0x00 && src[1] == 0x00 &&
+ src[2] == 0x03 )
+ {
+ *dst++ = 0x00;
+ *dst++ = 0x00;
- src += 3;
- continue;
+ src += 3;
+ continue;
+ }
+ *dst++ = *src++;
}
- *dst++ = *src++;
}
-
*pi_ret = dst - *pp_ret;
}
return val&0x01 ? (val+1)/2 : -(val/2);
}
-
/*****************************************************************************
* ParseNALBlock: parses annexB type NALs
- * All p_frag blocks are required to start with 0 0 0 1 4-byte startcode
+ * All p_frag blocks are required to start with 0 0 0 1 4-byte startcode
*****************************************************************************/
-static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag )
+static block_t *ParseNALBlock( decoder_t *p_dec, bool *pb_used_ts, block_t *p_frag )
{
decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_pic = NULL;
const int i_nal_ref_idc = (p_frag->p_buffer[4] >> 5)&0x03;
const int i_nal_type = p_frag->p_buffer[4]&0x1f;
+ const mtime_t i_frag_dts = p_frag->i_dts;
+ const mtime_t i_frag_pts = p_frag->i_pts;
-#define OUTPUT \
- do { \
- if( !p_sys->b_header && p_sys->i_frame_type != BLOCK_FLAG_TYPE_I) \
- break; \
- \
- p_pic = block_ChainGather( p_sys->p_frame ); \
- p_pic->i_length = 0; /* FIXME */ \
- p_pic->i_flags |= p_sys->i_frame_type; \
- \
- p_sys->i_frame_type = 0; \
- p_sys->p_frame = NULL; \
- p_sys->b_slice = VLC_FALSE; \
- \
- if( ( p_pic->i_flags & BLOCK_FLAG_TYPE_I ) && \
- p_sys->p_sps && p_sys->p_pps ) \
- { \
- block_t *p_sps = block_Duplicate( p_sys->p_sps ); \
- block_t *p_pps = block_Duplicate( p_sys->p_pps ); \
- p_sps->i_dts = p_pps->i_dts = p_pic->i_dts; \
- p_sps->i_pts = p_pps->i_pts = p_pic->i_pts; \
- block_ChainAppend( &p_sps, p_pps ); \
- block_ChainAppend( &p_sps, p_pic ); \
- p_pic = block_ChainGather( p_sps ); \
- p_sys->b_header = VLC_TRUE; \
- } \
- } while(0)
-
-
- if( p_sys->b_slice && !p_sys->b_sps )
+ if( p_sys->b_slice && ( !p_sys->b_sps || !p_sys->b_pps ) )
{
block_ChainRelease( p_sys->p_frame );
- msg_Warn( p_dec, "waiting for SPS" );
+ msg_Warn( p_dec, "waiting for SPS/PPS" );
/* Reset context */
+ p_sys->slice.i_frame_type = 0;
p_sys->p_frame = NULL;
- p_sys->b_slice = VLC_FALSE;
+ p_sys->b_slice = false;
+ cc_Flush( &p_sys->cc_next );
}
- if( !p_sys->b_sps &&
+ if( ( !p_sys->b_sps || !p_sys->b_pps ) &&
i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR )
{
- p_sys->b_slice = VLC_TRUE;
+ p_sys->b_slice = true;
/* Fragment will be discarded later on */
}
else if( i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR )
{
- uint8_t *dec;
- int i_dec, i_first_mb, i_slice_type, i_frame_num;
- vlc_bool_t b_pic = VLC_FALSE;
- bs_t s;
+ slice_t slice;
+ bool b_new_picture;
- /* do not convert the whole frame */
- nal_get_decoded( &dec, &i_dec, &p_frag->p_buffer[5],
- __MIN( p_frag->i_buffer - 5, 60 ) );
- bs_init( &s, dec, i_dec );
+ ParseSlice( p_dec, &b_new_picture, &slice, i_nal_ref_idc, i_nal_type, p_frag );
- /* first_mb_in_slice */
- i_first_mb = bs_read_ue( &s );
+ /* */
+ if( b_new_picture && p_sys->b_slice )
+ p_pic = OutputPicture( p_dec );
- /* slice_type */
- switch( (i_slice_type = bs_read_ue( &s )) )
- {
- case 0: case 5:
- p_sys->i_frame_type = BLOCK_FLAG_TYPE_P;
- break;
- case 1: case 6:
- p_sys->i_frame_type = BLOCK_FLAG_TYPE_B;
- break;
- case 2: case 7:
- p_sys->i_frame_type = BLOCK_FLAG_TYPE_I;
- break;
- case 3: case 8: /* SP */
- p_sys->i_frame_type = BLOCK_FLAG_TYPE_P;
- break;
- case 4: case 9:
- p_sys->i_frame_type = BLOCK_FLAG_TYPE_I;
- break;
- }
+ /* */
+ p_sys->slice = slice;
+ p_sys->b_slice = true;
+ }
+ else if( i_nal_type == NAL_SPS )
+ {
+ if( p_sys->b_slice )
+ p_pic = OutputPicture( p_dec );
- /* pic_parameter_set_id */
- bs_read_ue( &s );
- /* frame_num */
- i_frame_num = bs_read( &s, p_sys->i_log2_max_frame_num + 4 );
-
- /* Detection of the first VCL NAL unit of a primary coded picture
- * (cf. 7.4.1.2.4) */
- if( i_frame_num != p_sys->i_frame_num ||
- ( (i_nal_ref_idc != p_sys->i_nal_ref_idc) &&
- (!i_nal_ref_idc || !p_sys->i_nal_ref_idc) ) )
- {
- b_pic = VLC_TRUE;
- }
- p_sys->i_frame_num = i_frame_num;
- p_sys->i_nal_ref_idc = i_nal_ref_idc;
+ PutSPS( p_dec, p_frag );
- if( !p_sys->b_frame_mbs_only )
+ /* Do not append the SPS because we will insert it on keyframes */
+ p_frag = NULL;
+ }
+ else if( i_nal_type == NAL_PPS )
+ {
+ if( p_sys->b_slice )
+ p_pic = OutputPicture( p_dec );
+
+ PutPPS( p_dec, p_frag );
+
+ /* Do not append the PPS because we will insert it on keyframes */
+ p_frag = NULL;
+ }
+ else if( i_nal_type == NAL_AU_DELIMITER ||
+ i_nal_type == NAL_SEI ||
+ ( i_nal_type >= 13 && i_nal_type <= 18 ) )
+ {
+ if( p_sys->b_slice )
+ p_pic = OutputPicture( p_dec );
+
+ /* Parse SEI for CC support */
+ if( i_nal_type == NAL_SEI )
+ ParseSei( p_dec, p_frag );
+ }
+
+ /* Append the block */
+ if( p_frag )
+ block_ChainAppend( &p_sys->p_frame, p_frag );
+
+ *pb_used_ts = false;
+ if( p_sys->i_frame_dts < 0 && p_sys->i_frame_pts < 0 )
+ {
+ p_sys->i_frame_dts = i_frag_dts;
+ p_sys->i_frame_pts = i_frag_pts;
+ *pb_used_ts = true;
+ }
+ return p_pic;
+}
+
+static block_t *OutputPicture( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_pic;
+
+ if( !p_sys->b_header && p_sys->slice.i_frame_type != BLOCK_FLAG_TYPE_I)
+ return NULL;
+
+ if( p_sys->slice.i_frame_type == BLOCK_FLAG_TYPE_I && p_sys->b_sps && p_sys->b_pps )
+ {
+ block_t *p_list = NULL;
+ int i;
+
+ for( i = 0; i < SPS_MAX; i++ )
{
- /* field_pic_flag */
- if( bs_read( &s, 1 ) )
- {
- /* bottom_field_flag */
- bs_read( &s, 1 );
- }
+ if( p_sys->pp_sps[i] )
+ block_ChainAppend( &p_list, block_Duplicate( p_sys->pp_sps[i] ) );
}
-
- if( i_nal_type == NAL_SLICE_IDR )
+ for( i = 0; i < PPS_MAX; i++ )
{
- /* id_pic_id */
- int i_idr_pic_id = bs_read_ue( &s );
- if( p_sys->i_nal_type != i_nal_type ) b_pic = VLC_TRUE;
- if( p_sys->i_idr_pic_id != i_idr_pic_id ) b_pic = VLC_TRUE;
- p_sys->i_idr_pic_id = i_idr_pic_id;
+ if( p_sys->pp_pps[i] )
+ block_ChainAppend( &p_list, block_Duplicate( p_sys->pp_pps[i] ) );
}
- p_sys->i_nal_type = i_nal_type;
-
- if( b_pic && p_sys->b_slice ) OUTPUT;
+ if( p_list )
+ p_sys->b_header = true;
- p_sys->b_slice = VLC_TRUE;
-
- free( dec );
+ block_ChainAppend( &p_list, p_sys->p_frame );
+ p_pic = block_ChainGather( p_list );
}
- else if( i_nal_type == NAL_SPS )
+ else
{
- uint8_t *dec;
- int i_dec;
- bs_t s;
- int i_tmp;
+ p_pic = block_ChainGather( p_sys->p_frame );
+ }
+ p_pic->i_dts = p_sys->i_frame_dts;
+ p_pic->i_pts = p_sys->i_frame_pts;
+ p_pic->i_length = 0; /* FIXME */
+ p_pic->i_flags |= p_sys->slice.i_frame_type;
+
+ p_sys->slice.i_frame_type = 0;
+ p_sys->p_frame = NULL;
+ p_sys->i_frame_dts = -1;
+ p_sys->i_frame_pts = -1;
+ p_sys->b_slice = false;
- if( !p_sys->b_sps ) msg_Dbg( p_dec, "found NAL_SPS" );
+ /* 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;
- p_sys->b_sps = VLC_TRUE;
+ /* Swap cc buffer */
+ cc_data_t cc_tmp = p_sys->cc;
+ p_sys->cc = p_sys->cc_next;
+ p_sys->cc_next = cc_tmp;
- nal_get_decoded( &dec, &i_dec, &p_frag->p_buffer[5],
- p_frag->i_buffer - 5 );
+ cc_Flush( &p_sys->cc_next );
- bs_init( &s, dec, i_dec );
- /* Skip profile(8), constraint_set012, reserver(5), level(8) */
- bs_skip( &s, 8 + 1+1+1 + 5 + 8 );
- /* sps id */
+ return p_pic;
+}
+
+static void PutSPS( decoder_t *p_dec, block_t *p_frag )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ uint8_t *pb_dec = NULL;
+ int i_dec = 0;
+ bs_t s;
+ int i_tmp;
+ int i_sps_id;
+
+ CreateDecodedNAL( &pb_dec, &i_dec, &p_frag->p_buffer[5],
+ p_frag->i_buffer - 5 );
+
+ bs_init( &s, pb_dec, i_dec );
+ int i_profile_idc = bs_read( &s, 8 );
+ /* Skip constraint_set0123, reserved(4), level(8) */
+ bs_skip( &s, 1+1+1+1 + 4 + 8 );
+ /* sps id */
+ 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;
+ }
+
+ 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 )
+ {
+ /* chroma_format_idc */
+ const int i_chroma_format_idc = bs_read_ue( &s );
+ if( i_chroma_format_idc == 3 )
+ bs_skip( &s, 1 ); /* seperate_colour_plane_flag */
+ /* bit_depth_luma_minus8 */
bs_read_ue( &s );
- /* Skip i_log2_max_frame_num */
- p_sys->i_log2_max_frame_num = bs_read_ue( &s );
- /* Read poc_type */
- i_tmp = bs_read_ue( &s );
- if( i_tmp == 0 )
- {
- /* skip i_log2_max_poc_lsb */
- bs_read_ue( &s );
- }
- else if( i_tmp == 1 )
+ /* 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 )
{
- int i_cycle;
- /* skip b_delta_pic_order_always_zero */
- bs_skip( &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 )
+ for( int i = 0; i < ((3 != i_chroma_format_idc) ? 8 : 12); i++ )
{
- /* skip i_offset_for_ref_frame */
- bs_read_se(&s );
+ /* seq_scaling_list_present_flag[i] */
+ i_tmp = bs_read( &s, 1 );
+ if( !i_tmp )
+ continue;
+ const int i_size_of_scaling_list = (i < 6 ) ? 16 : 64;
+ /* scaling_list (...) */
+ int i_lastscale = 8;
+ int i_nextscale = 8;
+ for( int j = 0; j < i_size_of_scaling_list; j++ )
+ {
+ if( i_nextscale != 0 )
+ {
+ /* delta_scale */
+ i_tmp = bs_read( &s, 1 );
+ i_nextscale = ( i_lastscale + i_tmp + 256 ) % 256;
+ /* useDefaultScalingMatrixFlag = ... */
+ }
+ /* scalinglist[j] */
+ i_lastscale = ( i_nextscale == 0 ) ? i_lastscale : i_nextscale;
+ }
}
}
- /* 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 )
+ /* 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 )
{
- bs_skip( &s, 1 );
+ /* skip i_offset_for_ref_frame */
+ bs_read_se(&s );
+ i_cycle--;
}
- /* b_direct8x8_inference */
+ }
+ /* 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 )
+ {
bs_skip( &s, 1 );
+ }
+ /* b_direct8x8_inference */
+ bs_skip( &s, 1 );
- /* 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 );
- }
+ /* 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 );
+ }
- /* vui */
+ /* vui */
+ i_tmp = bs_read( &s, 1 );
+ if( i_tmp )
+ {
+ /* read the aspect ratio part if any */
i_tmp = bs_read( &s, 1 );
if( i_tmp )
{
- /* read the aspect ratio part if any FIXME check it */
- i_tmp = bs_read( &s, 1 );
- if( i_tmp )
+ static const struct { int w, h; } sar[17] =
{
- static const struct { int w, h; } sar[14] =
- {
- { 0, 0 }, { 1, 1 }, { 12, 11 }, { 10, 11 },
- { 16, 11 }, { 40, 33 }, { 24, 11 }, { 20, 11 },
- { 32, 11 }, { 80, 33 }, { 18, 11 }, { 15, 11 },
- { 64, 33 }, { 160,99 },
- };
- int i_sar = bs_read( &s, 8 );
- int w, h;
-
- if( i_sar < 14 )
- {
- w = sar[i_sar].w;
- h = sar[i_sar].h;
- }
- else
- {
- w = bs_read( &s, 16 );
- h = bs_read( &s, 16 );
- }
- if( h != 0 )
- p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * w /
- h * p_dec->fmt_out.video.i_width /
- p_dec->fmt_out.video.i_height;
- else
- p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR;
+ { 0, 0 }, { 1, 1 }, { 12, 11 }, { 10, 11 },
+ { 16, 11 }, { 40, 33 }, { 24, 11 }, { 20, 11 },
+ { 32, 11 }, { 80, 33 }, { 18, 11 }, { 15, 11 },
+ { 64, 33 }, { 160,99 }, { 4, 3 }, { 3, 2 },
+ { 2, 1 },
+ };
+ int i_sar = bs_read( &s, 8 );
+ int w, h;
+
+ if( i_sar < 17 )
+ {
+ w = sar[i_sar].w;
+ h = sar[i_sar].h;
}
+ else if( i_sar == 255 )
+ {
+ w = bs_read( &s, 16 );
+ h = bs_read( &s, 16 );
+ }
+ else
+ {
+ w = 0;
+ h = 0;
+ }
+
+ if( h != 0 )
+ p_dec->fmt_out.video.i_aspect = (int64_t)VOUT_ASPECT_FACTOR *
+ ( w * p_dec->fmt_out.video.i_width ) /
+ ( h * p_dec->fmt_out.video.i_height);
+ else
+ p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR;
}
+ }
- free( dec );
+ free( pb_dec );
- if( p_sys->b_slice ) OUTPUT;
+ /* We have a new SPS */
+ if( !p_sys->b_sps )
+ msg_Dbg( p_dec, "found NAL_SPS (sps_id=%d)", i_sps_id );
+ p_sys->b_sps = true;
- /* We have a new SPS */
- if( p_sys->p_sps ) block_Release( p_sys->p_sps );
- p_sys->p_sps = p_frag;
+ 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;
+}
- /* Do not append the SPS because we will insert it on keyframes */
- return p_pic;
+static void PutPPS( decoder_t *p_dec, block_t *p_frag )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ bs_t s;
+ int i_pps_id;
+ int i_sps_id;
+
+ bs_init( &s, &p_frag->p_buffer[5], p_frag->i_buffer - 5 );
+ 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;
}
- else if( i_nal_type == NAL_PPS )
+ bs_skip( &s, 1 ); // entropy coding mode flag
+ p_sys->i_pic_order_present_flag = bs_read( &s, 1 );
+ /* TODO */
+
+ /* We have a new PPS */
+ if( !p_sys->b_pps )
+ msg_Dbg( p_dec, "found NAL_PPS (pps_id=%d sps_id=%d)", i_pps_id, i_sps_id );
+ p_sys->b_pps = true;
+
+ 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;
+}
+
+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;
+
+ /* do not convert the whole frame */
+ CreateDecodedNAL( &pb_dec, &i_dec, &p_frag->p_buffer[5],
+ __MIN( p_frag->i_buffer - 5, 60 ) );
+ bs_init( &s, pb_dec, i_dec );
+
+ /* first_mb_in_slice */
+ i_first_mb = bs_read_ue( &s );
+
+ /* slice_type */
+ switch( (i_slice_type = bs_read_ue( &s )) )
{
- bs_t s;
- bs_init( &s, &p_frag->p_buffer[5], p_frag->i_buffer - 5 );
+ 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;
+ }
- if( !p_sys->b_pps ) msg_Dbg( p_dec, "found NAL_PPS" );
- p_sys->b_pps = VLC_TRUE;
+ /* */
+ slice.i_nal_type = i_nal_type;
+ slice.i_nal_ref_idc = i_nal_ref_idc;
- /* TODO */
+ 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 );
- if( p_sys->b_slice ) OUTPUT;
+ slice.i_field_pic_flag = 0;
+ slice.i_bottom_field_flag = -1;
+ if( !p_sys->b_frame_mbs_only )
+ {
+ /* 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 );
+ }
- /* We have a new PPS */
- if( p_sys->p_pps ) block_Release( p_sys->p_pps );
- p_sys->p_pps = p_frag;
+ 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 );
- /* Do not append the PPS because we will insert it on keyframes */
- return p_pic;
+ 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( i_nal_type == NAL_AU_DELIMITER ||
- i_nal_type == NAL_SEI ||
- ( i_nal_type >= 13 && i_nal_type <= 18 ) )
+ else if( (p_sys->i_pic_order_cnt_type == 1) &&
+ (!p_sys->i_delta_pic_order_always_zero_flag) )
{
- if( p_sys->b_slice ) OUTPUT;
+ 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;
+}
+
+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;
-#undef OUTPUT
+ /* */
+ CreateDecodedNAL( &pb_dec, &i_dec, &p_frag->p_buffer[5], p_frag->i_buffer - 5 );
+ if( !pb_dec )
+ return;
- /* Append the block */
- block_ChainAppend( &p_sys->p_frame, p_frag );
+ /* 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;
- return p_pic;
+ /* 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) ) )
+ {
+ cc_Extract( &p_sys->cc_next, &p_t35[3], i_t35 - 3 );
+ }
+ }
+ i_used += i_size;
+ }
+
+ free( pb_dec );
}
+
projects / vlc / blobdiff