Commit 28fc7c18 authored by Sam Hocevar's avatar Sam Hocevar
Browse files

. encore un peu plus de synchro. si �a saccade c'est normal, �a sera

  r�gl� dans l'heure, mais j'ai commit� pour qu'on puisse enfin voir
  des B avec le nouveau d�codeur (qui torchaize)
parent 1e6848bd
......@@ -46,18 +46,23 @@ typedef struct video_synchro_s
/* tells whether we accumulated delay */
mtime_t i_delay;
/* dates */
mtime_t i_last_pts;
mtime_t i_last_display_pts;
mtime_t i_last_decode_pts;
mtime_t i_last_i_pts;
unsigned int i_images_since_pts;
/* last pts of non-dropped I image */
mtime_t i_last_nondropped_i_pts;
/* il manquait un compteur */
unsigned int modulo;
/* P images since the last I */
unsigned int current_p_count;
unsigned int nondropped_p_count;
double p_count_predict;
/* B images since the last I */
unsigned int current_b_count;
unsigned int nondropped_b_count;
double b_count_predict;
/* 1 for linear count, 2 for binary count, 3 for ternary count */
......
......@@ -245,9 +245,14 @@ static int InitThread( vpar_thread_t *p_vpar )
/*
* Initialize the synchro properties
*/
p_vpar->synchro.i_last_decode_pts = 0;
p_vpar->synchro.i_last_display_pts = 0;
p_vpar->synchro.i_images_since_pts = 0;
/* for i frames */
p_vpar->synchro.i_last_i_pts = 0;
p_vpar->synchro.theorical_fps = 30;
p_vpar->synchro.actual_fps = 25;
p_vpar->synchro.theorical_fps = 25;
p_vpar->synchro.i_last_nondropped_i_pts = 0;
p_vpar->synchro.actual_fps = 20;
/* the fifo */
p_vpar->synchro.i_fifo_start = 0;
p_vpar->synchro.i_fifo_stop = 0;
......@@ -259,8 +264,10 @@ static int InitThread( vpar_thread_t *p_vpar )
p_vpar->synchro.i_delay = 0;
/* assume there were about 3 P and 6 B images between I's */
p_vpar->synchro.current_p_count = 1;
p_vpar->synchro.nondropped_p_count = 1;
p_vpar->synchro.p_count_predict = 3;
p_vpar->synchro.current_b_count = 1;
p_vpar->synchro.nondropped_b_count = 1;
p_vpar->synchro.b_count_predict = 6;
for( i_dummy = 0; i_dummy < 6; i_dummy++)
{
......
......@@ -60,51 +60,86 @@ float vpar_SynchroUpdateTab( video_synchro_tab_t * tab, int count )
* vpar_SynchroUpdateStructures : Update the synchro structures
*****************************************************************************/
void vpar_SynchroUpdateStructures( vpar_thread_t * p_vpar,
int i_coding_type )
int i_coding_type, int dropped )
{
float candidate_deviation;
float optimal_deviation;
float predict;
mtime_t i_current_pts;
decoder_fifo_t * decoder_fifo;
mtime_t i_displaydate;
decoder_fifo_t * decoder_fifo = p_vpar->bit_stream.p_decoder_fifo;
/* interpolate the current PTS */
decoder_fifo = p_vpar->bit_stream.p_decoder_fifo;
/* see if the current image has a pts - if not, interpolate */
if( i_current_pts = decoder_fifo->buffer[decoder_fifo->i_start]->i_pts )
/* interpolate the current _decode_ PTS */
i_current_pts = decoder_fifo->buffer[decoder_fifo->i_start]->i_pts;
if( !i_current_pts )
{
p_vpar->synchro.i_images_since_pts = 1;
i_current_pts = p_vpar->synchro.i_last_decode_pts
+ 1000000.0 / (1 + p_vpar->synchro.actual_fps);
}
else
p_vpar->synchro.i_last_decode_pts = i_current_pts;
/* see if the current image has a pts - if not, set to 0 */
p_vpar->synchro.fifo[p_vpar->synchro.i_fifo_stop].i_pts
= i_current_pts;
/* update display time */
i_displaydate = decoder_fifo->buffer[decoder_fifo->i_start]->i_pts;
if( !i_displaydate || i_coding_type != I_CODING_TYPE )
{
i_current_pts = p_vpar->synchro.i_last_pts
+ (1000000 / p_vpar->synchro.theorical_fps);
p_vpar->synchro.i_images_since_pts++;
if (!p_vpar->synchro.i_images_since_pts )
p_vpar->synchro.i_images_since_pts = 10;
i_displaydate = p_vpar->synchro.i_last_display_pts
+ 1000000.0 / (p_vpar->synchro.theorical_fps);
//fprintf (stderr, " ");
}
p_vpar->synchro.fifo[p_vpar->synchro.i_fifo_stop].i_pts = i_current_pts;
p_vpar->synchro.i_last_pts = i_current_pts;
//else fprintf (stderr, "R ");
//if (dropped) fprintf (stderr, " "); else fprintf (stderr, "* ");
//fprintf (stderr, "%i ", i_coding_type);
//fprintf (stderr, "pts %lli delta %lli\n", i_displaydate, i_displaydate - p_vpar->synchro.i_last_display_pts);
p_vpar->synchro.i_images_since_pts--;
p_vpar->synchro.i_last_display_pts = i_displaydate;
/* update structures */
switch(i_coding_type)
{
case P_CODING_TYPE:
p_vpar->synchro.current_p_count++;
if( !dropped ) p_vpar->synchro.nondropped_p_count++;
break;
case B_CODING_TYPE:
p_vpar->synchro.current_b_count++;
if( !dropped ) p_vpar->synchro.nondropped_b_count++;
break;
case I_CODING_TYPE:
/* update information about images we can decode */
if ( p_vpar->synchro.i_last_i_pts )
if (i_current_pts != p_vpar->synchro.i_last_i_pts)
{
p_vpar->synchro.theorical_fps = 1000000 * (1 + p_vpar->synchro.current_b_count + p_vpar->synchro.current_p_count) / (i_current_pts - p_vpar->synchro.i_last_i_pts);
}
p_vpar->synchro.i_last_i_pts = i_current_pts;
if ( p_vpar->synchro.i_last_i_pts && i_current_pts != p_vpar->synchro.i_last_i_pts)
{
p_vpar->synchro.theorical_fps = (p_vpar->synchro.theorical_fps + 1000000.0 * (1 + p_vpar->synchro.current_b_count + p_vpar->synchro.current_p_count) / (i_current_pts - p_vpar->synchro.i_last_i_pts)) / 2;
}
p_vpar->synchro.i_last_i_pts = i_current_pts;
}
if( !dropped )
{
if ( p_vpar->synchro.i_last_nondropped_i_pts && i_current_pts != p_vpar->synchro.i_last_nondropped_i_pts)
{
p_vpar->synchro.actual_fps = (p_vpar->synchro.actual_fps + 1000000.0 * (1 + p_vpar->synchro.nondropped_b_count + p_vpar->synchro.nondropped_p_count) / (i_current_pts - p_vpar->synchro.i_last_nondropped_i_pts)) / 2;
}
p_vpar->synchro.i_last_nondropped_i_pts = i_current_pts;
p_vpar->synchro.nondropped_p_count = 0;
p_vpar->synchro.nondropped_b_count = 0;
}
/* update all the structures for P images */
......@@ -183,31 +218,41 @@ void vpar_SynchroUpdateStructures( vpar_thread_t * p_vpar,
boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
int i_structure )
{
mtime_t i_delay =
p_vpar->synchro.fifo[p_vpar->synchro.i_fifo_start].i_pts - mdate();
mtime_t i_delay;
int keep;
i_delay = p_vpar->synchro.i_last_decode_pts - mdate();
//fprintf( stderr, "delay is %lli - ", i_delay);
if ( i_coding_type == B_CODING_TYPE )
return (0);
#if 1
/*if ( i_coding_type == B_CODING_TYPE )
return (0);*/
if( i_delay > 300000 )
//return( i_coding_type == I_CODING_TYPE || i_coding_type == P_CODING_TYPE );
if( i_delay > 120000 )
{
return (1);
keep = 1;
}
else if( i_delay > 150000 )
else if( i_delay > 100000 )
{
return ( i_coding_type == I_CODING_TYPE
keep = ( i_coding_type == I_CODING_TYPE
|| i_coding_type == P_CODING_TYPE );
}
else if( i_delay > 100000 )
else if( i_delay > 50000 )
{
return ( i_coding_type == I_CODING_TYPE );
keep = ( i_coding_type == I_CODING_TYPE );
}
else
{
//fprintf( stderr, "chooser : we are la bourre - trashing a %i\n", i_coding_type);
//return ( i_coding_type == I_CODING_TYPE );
return (0);
keep = 0;
}
#endif
//if (!keep) fprintf( stderr, "trashing a type %i with delay %lli\n", i_coding_type, i_delay);
// else fprintf( stderr, "chooser : ok - displaying a %i \n", i_coding_type);
return (keep);
}
......@@ -217,7 +262,7 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
void vpar_SynchroTrash( vpar_thread_t * p_vpar, int i_coding_type,
int i_structure )
{
vpar_SynchroUpdateStructures (p_vpar, i_coding_type);
vpar_SynchroUpdateStructures (p_vpar, i_coding_type, 1);
}
......@@ -227,11 +272,12 @@ void vpar_SynchroTrash( vpar_thread_t * p_vpar, int i_coding_type,
void vpar_SynchroDecode( vpar_thread_t * p_vpar, int i_coding_type,
int i_structure )
{
vpar_SynchroUpdateStructures (p_vpar, i_coding_type);
vpar_SynchroUpdateStructures (p_vpar, i_coding_type, 0);
p_vpar->synchro.fifo[p_vpar->synchro.i_fifo_stop].i_decode_date = mdate();
p_vpar->synchro.fifo[p_vpar->synchro.i_fifo_stop].i_image_type
= i_coding_type;
p_vpar->synchro.i_fifo_stop = (p_vpar->synchro.i_fifo_stop + 1) & 0xf;
}
......@@ -248,9 +294,12 @@ void vpar_SynchroEnd( vpar_thread_t * p_vpar )
/ (p_vpar->synchro.i_fifo_stop - p_vpar->synchro.i_fifo_start & 0x0f);
p_vpar->synchro.i_mean_decode_time =
( 3 * p_vpar->synchro.i_mean_decode_time + i_decode_time ) / 4;
( 7 * p_vpar->synchro.i_mean_decode_time + i_decode_time ) / 8;
//fprintf (stderr, "decoding time is %lli\n", p_vpar->synchro.i_mean_decode_time);
p_vpar->synchro.i_fifo_start = (p_vpar->synchro.i_fifo_start + 1) & 0xf;
}
/*****************************************************************************
......@@ -258,15 +307,13 @@ void vpar_SynchroEnd( vpar_thread_t * p_vpar )
*****************************************************************************/
mtime_t vpar_SynchroDate( vpar_thread_t * p_vpar )
{
mtime_t i_displaydate;
mtime_t i_displaydate = p_vpar->synchro.i_last_display_pts;
static mtime_t i_delta = 0;
i_displaydate =
p_vpar->synchro.fifo[p_vpar->synchro.i_fifo_start].i_pts;
//fprintf(stderr, "displaying type %i with delay %lli and delta %lli\n", p_vpar->synchro.fifo[p_vpar->synchro.i_fifo_start].i_image_type, i_displaydate - mdate(), i_displaydate - i_delta);
i_delta = i_displaydate;
//fprintf (stderr, "theorical fps: %f - actual fps: %f \n", p_vpar->synchro.theorical_fps, p_vpar->synchro.actual_fps);
i_delta = i_displaydate;
return i_displaydate;
}
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