Commit fb4119ba authored by Francois Cartegnie's avatar Francois Cartegnie

packetizer: h264: use stripAnnexB in ParseSlice

parent 9b24493a
...@@ -800,14 +800,18 @@ static bool ParseSlice( decoder_t *p_dec, bool *pb_new_picture, slice_t *p_slice ...@@ -800,14 +800,18 @@ static bool ParseSlice( decoder_t *p_dec, bool *pb_new_picture, slice_t *p_slice
int i_slice_type; int i_slice_type;
slice_t slice; slice_t slice;
bs_t s; bs_t s;
unsigned i_bitflow = 0;
const uint8_t *p_stripped = p_frag->p_buffer;
size_t i_stripped = p_frag->i_buffer;
if(p_frag->i_buffer < 6) if( !hxxx_strip_AnnexB_startcode( &p_stripped, &i_stripped ) || i_stripped < 2 )
return false; return false;
bs_init( &s, &p_frag->p_buffer[5], p_frag->i_buffer - 5 ); bs_init( &s, p_stripped, i_stripped );
unsigned i_bitflow = 0;
s.p_fwpriv = &i_bitflow; s.p_fwpriv = &i_bitflow;
s.pf_forward = hxxx_bsfw_ep3b_to_rbsp; /* Does the emulated 3bytes conversion to rbsp */ s.pf_forward = hxxx_bsfw_ep3b_to_rbsp; /* Does the emulated 3bytes conversion to rbsp */
bs_skip( &s, 8 ); /* nal unit header */
/* first_mb_in_slice */ /* first_mb_in_slice */
/* int i_first_mb = */ bs_read_ue( &s ); /* int i_first_mb = */ bs_read_ue( &s );
......
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