Commit 323d078c authored by Rafaël Carré's avatar Rafaël Carré

packetizers: do not rename variable

Use the same name than PacketizeParse
parent bd190a99
...@@ -165,7 +165,7 @@ static void PacketizeReset( void *p_private, bool b_broken ); ...@@ -165,7 +165,7 @@ static void PacketizeReset( void *p_private, bool b_broken );
static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t * ); static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t * );
static int PacketizeValidate( void *p_private, 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 *ParseNALBlock( decoder_t *, bool *pb_ts_used, block_t * );
static block_t *CreateAnnexbNAL( decoder_t *, const uint8_t *p, int ); static block_t *CreateAnnexbNAL( decoder_t *, const uint8_t *p, int );
static block_t *OutputPicture( decoder_t *p_dec ); static block_t *OutputPicture( decoder_t *p_dec );
...@@ -603,7 +603,7 @@ static inline int bs_read_se( bs_t *s ) ...@@ -603,7 +603,7 @@ static inline int bs_read_se( bs_t *s )
* ParseNALBlock: parses annexB type NALs * 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, bool *pb_used_ts, block_t *p_frag ) static block_t *ParseNALBlock( decoder_t *p_dec, bool *pb_ts_used, block_t *p_frag )
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_pic = NULL; block_t *p_pic = NULL;
...@@ -700,13 +700,13 @@ static block_t *ParseNALBlock( decoder_t *p_dec, bool *pb_used_ts, block_t *p_fr ...@@ -700,13 +700,13 @@ static block_t *ParseNALBlock( decoder_t *p_dec, bool *pb_used_ts, block_t *p_fr
if( p_frag ) if( p_frag )
block_ChainAppend( &p_sys->p_frame, p_frag ); block_ChainAppend( &p_sys->p_frame, p_frag );
*pb_used_ts = false; *pb_ts_used = false;
if( p_sys->i_frame_dts <= VLC_TS_INVALID && if( p_sys->i_frame_dts <= VLC_TS_INVALID &&
p_sys->i_frame_pts <= VLC_TS_INVALID ) p_sys->i_frame_pts <= VLC_TS_INVALID )
{ {
p_sys->i_frame_dts = i_frag_dts; p_sys->i_frame_dts = i_frag_dts;
p_sys->i_frame_pts = i_frag_pts; p_sys->i_frame_pts = i_frag_pts;
*pb_used_ts = true; *pb_ts_used = true;
} }
return p_pic; return p_pic;
} }
......
...@@ -116,7 +116,7 @@ static void PacketizeReset( void *p_private, bool b_broken ); ...@@ -116,7 +116,7 @@ static void PacketizeReset( void *p_private, bool b_broken );
static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t * ); static block_t *PacketizeParse( void *p_private, bool *pb_ts_used, block_t * );
static int PacketizeValidate( void *p_private, block_t * ); static int PacketizeValidate( void *p_private, block_t * );
static block_t *ParseIDU( decoder_t *p_dec, bool *pb_used_ts, block_t *p_frag ); static block_t *ParseIDU( decoder_t *p_dec, bool *pb_ts_used, block_t *p_frag );
static const uint8_t p_vc1_startcode[3] = { 0x00, 0x00, 0x01 }; static const uint8_t p_vc1_startcode[3] = { 0x00, 0x00, 0x01 };
/***************************************************************************** /*****************************************************************************
...@@ -319,13 +319,13 @@ static void BuildExtraData( decoder_t *p_dec ) ...@@ -319,13 +319,13 @@ static void BuildExtraData( decoder_t *p_dec )
p_sys->ep.p_ep->p_buffer, p_sys->ep.p_ep->i_buffer ); p_sys->ep.p_ep->p_buffer, p_sys->ep.p_ep->i_buffer );
} }
/* ParseIDU: parse an Independent Decoding Unit */ /* ParseIDU: parse an Independent Decoding Unit */
static block_t *ParseIDU( decoder_t *p_dec, bool *pb_used_ts, block_t *p_frag ) static block_t *ParseIDU( decoder_t *p_dec, bool *pb_ts_used, block_t *p_frag )
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_pic; block_t *p_pic;
const idu_type_t idu = p_frag->p_buffer[3]; const idu_type_t idu = p_frag->p_buffer[3];
*pb_used_ts = false; *pb_ts_used = false;
if( !p_sys->b_sequence_header && idu != IDU_TYPE_SEQUENCE_HEADER ) if( !p_sys->b_sequence_header && idu != IDU_TYPE_SEQUENCE_HEADER )
{ {
msg_Warn( p_dec, "waiting for sequence header" ); msg_Warn( p_dec, "waiting for sequence header" );
...@@ -406,7 +406,7 @@ static block_t *ParseIDU( decoder_t *p_dec, bool *pb_used_ts, block_t *p_frag ) ...@@ -406,7 +406,7 @@ static block_t *ParseIDU( decoder_t *p_dec, bool *pb_used_ts, block_t *p_frag )
{ {
p_sys->i_frame_dts = p_frag->i_dts; p_sys->i_frame_dts = p_frag->i_dts;
p_sys->i_frame_pts = p_frag->i_pts; p_sys->i_frame_pts = p_frag->i_pts;
*pb_used_ts = true; *pb_ts_used = true;
} }
/* We will add back SH and EP on I frames */ /* We will add back SH and EP on I frames */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment