Commit dc7fd052 authored by Laurent Aimar's avatar Laurent Aimar

Output a gathered picture before parsing the next SPS/PPS.

parent 053b0208
...@@ -732,6 +732,9 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) ...@@ -732,6 +732,9 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag )
bs_t s; bs_t s;
int i_tmp; int i_tmp;
if( p_sys->b_slice )
p_pic = OutputPicture( p_dec );
if( !p_sys->b_sps ) msg_Dbg( p_dec, "found NAL_SPS" ); if( !p_sys->b_sps ) msg_Dbg( p_dec, "found NAL_SPS" );
p_sys->b_sps = true; p_sys->b_sps = true;
...@@ -846,9 +849,6 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) ...@@ -846,9 +849,6 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag )
free( dec ); free( dec );
if( p_sys->b_slice )
p_pic = OutputPicture( p_dec );
/* We have a new SPS */ /* We have a new SPS */
if( p_sys->p_sps ) block_Release( p_sys->p_sps ); if( p_sys->p_sps ) block_Release( p_sys->p_sps );
p_sys->p_sps = p_frag; p_sys->p_sps = p_frag;
...@@ -860,6 +860,9 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) ...@@ -860,6 +860,9 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag )
{ {
bs_t s; bs_t s;
if( p_sys->b_slice )
p_pic = OutputPicture( p_dec );
bs_init( &s, &p_frag->p_buffer[5], p_frag->i_buffer - 5 ); bs_init( &s, &p_frag->p_buffer[5], p_frag->i_buffer - 5 );
bs_read_ue( &s ); // pps id bs_read_ue( &s ); // pps id
bs_read_ue( &s ); // sps id bs_read_ue( &s ); // sps id
...@@ -871,9 +874,6 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag ) ...@@ -871,9 +874,6 @@ static block_t *ParseNALBlock( decoder_t *p_dec, block_t *p_frag )
/* TODO */ /* TODO */
if( p_sys->b_slice )
p_pic = OutputPicture( p_dec );
/* We have a new PPS */ /* We have a new PPS */
if( p_sys->p_pps ) block_Release( p_sys->p_pps ); if( p_sys->p_pps ) block_Release( p_sys->p_pps );
p_sys->p_pps = p_frag; p_sys->p_pps = p_frag;
......
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