#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <assert.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_block.h>
-#include "vlc_block_helper.h"
-#include "vlc_bits.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( N_("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;
#define PPS_MAX (256)
struct decoder_sys_t
{
- block_bytestream_t bytestream;
-
- int i_state;
- size_t i_offset;
- uint8_t startcode[4];
+ /* */
+ packetizer_t packetizer;
+ /* */
bool b_slice;
block_t *p_frame;
+ bool b_frame_sps;
+ bool b_frame_pps;
bool b_header;
bool b_sps;
bool b_pps;
block_t *pp_sps[SPS_MAX];
block_t *pp_pps[PPS_MAX];
+ int i_recovery_frames; /* -1 = no recovery */
/* avcC data */
int i_avcC_length_size;
/* Useful values of the Slice Header */
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 * );
+#define BLOCK_FLAG_PRIVATE_AUD (1 << BLOCK_FLAG_PRIVATE_SHIFT)
+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 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 const uint8_t p_h264_startcode[3] = { 0x00, 0x00, 0x01 };
/*****************************************************************************
* Open: probe the packetizer and return score
decoder_sys_t *p_sys;
int i;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'h', '2', '6', '4') &&
- 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( 'a', 'v', 'c', '1') ||
- p_dec->fmt_in.i_extra < 7 ) )
- {
+ 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 )
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 )
{
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();
+
+ packetizer_Init( &p_sys->packetizer,
+ p_h264_startcode, sizeof(p_h264_startcode),
+ p_h264_startcode, 1, 5,
+ PacketizeReset, PacketizeParse, PacketizeValidate, p_dec );
+
p_sys->b_slice = false;
p_sys->p_frame = NULL;
+ p_sys->b_frame_sps = false;
+ p_sys->b_frame_pps = false;
+
p_sys->b_header= false;
p_sys->b_sps = false;
p_sys->b_pps = false;
p_sys->pp_sps[i] = NULL;
for( i = 0; i < PPS_MAX; i++ )
p_sys->pp_pps[i] = NULL;
+ p_sys->i_recovery_frames = -1;
p_sys->slice.i_nal_type = -1;
p_sys->slice.i_nal_ref_idc = -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 = VLC_TS_INVALID;
+ p_sys->i_frame_pts = VLC_TS_INVALID;
+
/* 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' ) )
+ if( p_dec->fmt_in.i_original_fourcc == VLC_FOURCC( 'a', 'v', 'c', '1' ) )
{
/* 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_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 */
block_t *p_sps = CreateAnnexbNAL( p_dec, p, i_length );
if( !p_sps )
return VLC_EGENERIC;
- ParseNALBlock( p_dec, p_sps );
+ ParseNALBlock( p_dec, &b_dummy, p_sps );
p += i_length;
}
/* Read PPS */
block_t *p_pps = CreateAnnexbNAL( p_dec, p, i_length );
if( !p_pps )
return VLC_EGENERIC;
- ParseNALBlock( p_dec, p_pps );
+ ParseNALBlock( p_dec, &b_dummy, p_pps );
p += i_length;
}
msg_Dbg( p_dec, "avcC length size=%d, sps=%d, pps=%d",
/* Set callback */
p_dec->pf_packetize = PacketizeAVC1;
+ /* TODO CC ? */
}
else
{
/* 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;
+ p_sys->i_cc_pts = VLC_TS_INVALID;
+ p_sys->i_cc_dts = VLC_TS_INVALID;
+ p_sys->i_cc_flags = 0;
+ cc_Init( &p_sys->cc );
+ cc_Init( &p_sys->cc_next );
- memcpy( p_init->p_buffer, p_dec->fmt_in.p_extra,
- p_dec->fmt_in.i_extra );
-
- 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_sys_t *p_sys = p_dec->p_sys;
int i;
- if( p_sys->p_frame ) block_ChainRelease( p_sys->p_frame );
+ if( p_sys->p_frame )
+ block_ChainRelease( p_sys->p_frame );
for( i = 0; i < SPS_MAX; i++ )
{
if( p_sys->pp_sps[i] )
if( p_sys->pp_pps[i] )
block_Release( p_sys->pp_pps[i] );
}
- block_BytestreamRelease( &p_sys->bytestream );
+ packetizer_Clean( &p_sys->packetizer );
+
+ if( p_dec->pf_get_cc )
+ {
+ cc_Exit( &p_sys->cc_next );
+ cc_Exit( &p_sys->cc );
+ }
+
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;
- if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
- {
- if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
- {
- p_sys->i_state = STATE_NOSYNC;
- block_BytestreamFlush( &p_sys->bytestream );
-
- 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;
- }
- block_Release( *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=%"PRId64" dts=%"PRId64,
- 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 );
}
/****************************************************************************
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;
block_t *p_part = CreateAnnexbNAL( p_dec, p, i_size );
if( !p_part )
break;
+
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, p_part ) ) )
+ if( ( p_pic = ParseNALBlock( p_dec, &b_dummy, p_part ) ) )
{
block_ChainAppend( &p_ret, p_pic );
}
return p_ret;
}
+/*****************************************************************************
+ * 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->b_frame_sps = false;
+ p_sys->b_frame_pps = false;
+ p_sys->slice.i_frame_type = 0;
+ p_sys->b_slice = false;
+ }
+ p_sys->i_frame_pts = VLC_TS_INVALID;
+ p_sys->i_frame_dts = VLC_TS_INVALID;
+}
+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 > 5 && 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;
* ParseNALBlock: parses annexB type NALs
* 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;
if( p_sys->b_slice && ( !p_sys->b_sps || !p_sys->b_pps ) )
{
/* Reset context */
p_sys->slice.i_frame_type = 0;
p_sys->p_frame = NULL;
+ p_sys->b_frame_sps = false;
+ p_sys->b_frame_pps = false;
p_sys->b_slice = false;
+ cc_Flush( &p_sys->cc_next );
}
if( ( !p_sys->b_sps || !p_sys->b_pps ) &&
else if( i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR )
{
slice_t slice;
- bool b_new_picture;
+ bool b_new_picture;
ParseSlice( p_dec, &b_new_picture, &slice, i_nal_ref_idc, i_nal_type, p_frag );
{
if( p_sys->b_slice )
p_pic = OutputPicture( p_dec );
+ p_sys->b_frame_sps = true;
PutSPS( p_dec, p_frag );
/* Do not append the SPS because we will insert it on keyframes */
- return p_pic;
+ p_frag = NULL;
}
else if( i_nal_type == NAL_PPS )
{
if( p_sys->b_slice )
p_pic = OutputPicture( p_dec );
+ p_sys->b_frame_pps = true;
PutPPS( p_dec, p_frag );
/* Do not append the PPS because we will insert it on keyframes */
- return p_pic;
+ p_frag = NULL;
}
else if( i_nal_type == NAL_AU_DELIMITER ||
i_nal_type == NAL_SEI ||
if( p_sys->b_slice )
p_pic = OutputPicture( p_dec );
- /* TODO parse SEI for CC support */
+ /* Parse SEI for CC support */
+ if( i_nal_type == NAL_SEI )
+ {
+ ParseSei( p_dec, p_frag );
+ }
+ 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;
+ }
+ }
}
/* Append the block */
- block_ChainAppend( &p_sys->p_frame, p_frag );
+ if( p_frag )
+ block_ChainAppend( &p_sys->p_frame, p_frag );
+ *pb_used_ts = false;
+ if( p_sys->i_frame_dts <= VLC_TS_INVALID &&
+ p_sys->i_frame_pts <= VLC_TS_INVALID )
+ {
+ p_sys->i_frame_dts = i_frag_dts;
+ p_sys->i_frame_pts = i_frag_pts;
+ *pb_used_ts = true;
+ }
return p_pic;
}
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)
+ 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)
return NULL;
- if( p_sys->slice.i_frame_type == BLOCK_FLAG_TYPE_I && p_sys->b_sps && p_sys->b_pps )
+ 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 )
{
- block_t *p_list = NULL;
- int i;
+ 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;
+ }
- for( i = 0; i < SPS_MAX; i++ )
+ block_t *p_list = NULL;
+ for( int i = 0; i < SPS_MAX && (b_sps_pps_i || p_sys->b_frame_sps); i++ )
{
if( p_sys->pp_sps[i] )
block_ChainAppend( &p_list, block_Duplicate( p_sys->pp_sps[i] ) );
}
- for( i = 0; i < PPS_MAX; i++ )
+ for( int i = 0; i < PPS_MAX && (b_sps_pps_i || p_sys->b_frame_pps); i++ )
{
if( p_sys->pp_pps[i] )
block_ChainAppend( &p_list, block_Duplicate( p_sys->pp_pps[i] ) );
}
- if( p_list )
- {
- p_list->i_dts = p_sys->p_frame->i_dts;
- p_list->i_pts = p_sys->p_frame->i_pts;
+ if( b_sps_pps_i && p_list )
p_sys->b_header = true;
- }
- block_ChainAppend( &p_list, p_sys->p_frame );
- p_pic = block_ChainGather( p_list );
+
+ 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 );
}
else
{
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_pic->i_flags &= ~BLOCK_FLAG_PRIVATE_AUD;
+ if( !p_sys->b_header )
+ p_pic->i_flags |= BLOCK_FLAG_PREROLL;
p_sys->slice.i_frame_type = 0;
p_sys->p_frame = NULL;
+ p_sys->i_frame_dts = VLC_TS_INVALID;
+ p_sys->i_frame_pts = VLC_TS_INVALID;
+ p_sys->b_frame_sps = false;
+ p_sys->b_frame_pps = false;
p_sys->b_slice = false;
+ /* 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;
+
+ /* 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 );
+
return p_pic;
}
p_frag->i_buffer - 5 );
bs_init( &s, pb_dec, i_dec );
- /* Skip profile(8), constraint_set012, reserver(5), level(8) */
- bs_skip( &s, 8 + 1+1+1 + 5 + 8 );
+ int i_profile_idc = bs_read( &s, 8 );
+ 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 );
/* sps id */
i_sps_id = bs_read_ue( &s );
if( i_sps_id >= SPS_MAX )
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 ); /* separate_colour_plane_flag */
+ /* 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 )
+ {
+ for( int i = 0; i < ((3 != i_chroma_format_idc) ? 8 : 12); i++ )
+ {
+ /* 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_se( &s );
+ i_nextscale = ( i_lastscale + i_tmp + 256 ) % 256;
+ /* useDefaultScalingMatrixFlag = ... */
+ }
+ /* scalinglist[j] */
+ i_lastscale = ( i_nextscale == 0 ) ? i_lastscale : i_nextscale;
+ }
+ }
+ }
+ }
+
/* 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)
{
/* skip i_offset_for_ref_frame */
bs_read_se(&s );
+ i_cycle--;
}
}
/* i_num_ref_frames */
i_tmp = bs_read( &s, 1 );
if( i_tmp )
{
- /* read the aspect ratio part if any FIXME check it */
+ /* read the aspect ratio part if any */
i_tmp = bs_read( &s, 1 );
if( i_tmp )
{
w = 0;
h = 0;
}
- 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;
+
+ if( w != 0 && h != 0 )
+ {
+ p_dec->fmt_out.video.i_sar_num = w;
+ p_dec->fmt_out.video.i_sar_den = h;
+ }
else
- p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR;
+ {
+ p_dec->fmt_out.video.i_sar_num = 1;
+ p_dec->fmt_out.video.i_sar_den = 1;
+ }
}
}
*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;
+
+ /* */
+ 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) ) )
+ {
+ cc_Extract( &p_sys->cc_next, true, &p_t35[3], i_t35 - 3 );
+ }
+ }
+
+ /* 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;
+ }
+ }
+
+ i_used += i_size;
+ }
+
+ free( pb_dec );
+}
projects / vlc / blobdiff