Commit 4c7b5876 authored by Sam Hocevar's avatar Sam Hocevar
Browse files

. pr�paration de la modification de l'API synchro

parent 8d990276
...@@ -49,6 +49,6 @@ boolean_t vpar_SynchroChoose( struct vpar_thread_s * p_vpar, int i_coding_type, ...@@ -49,6 +49,6 @@ boolean_t vpar_SynchroChoose( struct vpar_thread_s * p_vpar, int i_coding_type,
int i_structure ); int i_structure );
void vpar_SynchroTrash( struct vpar_thread_s * p_vpar, int i_coding_type, void vpar_SynchroTrash( struct vpar_thread_s * p_vpar, int i_coding_type,
int i_structure ); int i_structure );
mtime_t vpar_SynchroDecode( struct vpar_thread_s * p_vpar, int i_coding_type, void vpar_SynchroDecode( struct vpar_thread_s * p_vpar, int i_coding_type,
int i_structure ); int i_structure );
void vpar_SynchroEnd( struct vpar_thread_s * p_vpar ); mtime_t vpar_SynchroEnd( struct vpar_thread_s * p_vpar );
...@@ -677,9 +677,10 @@ static void PictureHeader( vpar_thread_t * p_vpar ) ...@@ -677,9 +677,10 @@ static void PictureHeader( vpar_thread_t * p_vpar )
} }
/* Initialize values. */ /* Initialize values. */
P_picture->date = vpar_SynchroDecode( p_vpar, vpar_SynchroDecode( p_vpar, p_vpar->picture.i_coding_type, i_structure );
p_vpar->picture.i_coding_type, /* kludge to be removed once vpar_SynchroEnd is called properly */
i_structure ); P_picture->date = mdate() + 700000;
P_picture->i_aspect_ratio = p_vpar->sequence.i_aspect_ratio; P_picture->i_aspect_ratio = p_vpar->sequence.i_aspect_ratio;
P_picture->i_matrix_coefficients = p_vpar->sequence.i_matrix_coefficients; P_picture->i_matrix_coefficients = p_vpar->sequence.i_matrix_coefficients;
p_vpar->picture.i_l_stride = ( p_vpar->sequence.i_width p_vpar->picture.i_l_stride = ( p_vpar->sequence.i_width
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
/***************************************************************************** /*****************************************************************************
* vpar_SynchroUpdateTab : Update a mean table in the synchro structure * vpar_SynchroUpdateTab : Update a mean table in the synchro structure
*****************************************************************************/ *****************************************************************************/
double vpar_SynchroUpdateTab( video_synchro_tab_t * tab, int count ) float vpar_SynchroUpdateTab( video_synchro_tab_t * tab, int count )
{ {
tab->mean = ( tab->mean + 3 * count ) / 4; tab->mean = ( tab->mean + 3 * count ) / 4;
...@@ -63,9 +63,9 @@ double vpar_SynchroUpdateTab( video_synchro_tab_t * tab, int count ) ...@@ -63,9 +63,9 @@ double vpar_SynchroUpdateTab( video_synchro_tab_t * tab, int count )
void vpar_SynchroUpdateStructures( vpar_thread_t * p_vpar, void vpar_SynchroUpdateStructures( vpar_thread_t * p_vpar,
int i_coding_type ) int i_coding_type )
{ {
double candidate_deviation; float candidate_deviation;
double optimal_deviation; float optimal_deviation;
double predict; float predict;
switch(i_coding_type) switch(i_coding_type)
{ {
...@@ -167,19 +167,19 @@ void vpar_SynchroTrash( vpar_thread_t * p_vpar, int i_coding_type, ...@@ -167,19 +167,19 @@ void vpar_SynchroTrash( vpar_thread_t * p_vpar, int i_coding_type,
/***************************************************************************** /*****************************************************************************
* vpar_SynchroDecode : Update timers when we decide to decode a picture * vpar_SynchroDecode : Update timers when we decide to decode a picture
*****************************************************************************/ *****************************************************************************/
mtime_t vpar_SynchroDecode( vpar_thread_t * p_vpar, int i_coding_type, void vpar_SynchroDecode( vpar_thread_t * p_vpar, int i_coding_type,
int i_structure ) int i_structure )
{ {
vpar_SynchroUpdateStructures (p_vpar, i_coding_type); vpar_SynchroUpdateStructures (p_vpar, i_coding_type);
return mdate() + 700000;
} }
/***************************************************************************** /*****************************************************************************
* vpar_SynchroEnd : Called when the image is totally decoded * vpar_SynchroEnd : Called when the image is totally decoded
*****************************************************************************/ *****************************************************************************/
void vpar_SynchroEnd( vpar_thread_t * p_vpar ) mtime_t vpar_SynchroEnd( vpar_thread_t * p_vpar )
{ {
return mdate() + 700000;
} }
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