Moved vout_synchro to decoder_synchro.

[vlc] / modules / codec / xvmc / xxmc.c

diff --git a/modules/codec/xvmc/xxmc.c b/modules/codec/xvmc/xxmc.c
index da60436e1414a3ab7008d79100a7bf3a75bb4f4a..cd4b1bbff68913a7e0a8eeb89824ef0d020f6284 100644 (file)
--- a/modules/codec/xvmc/xxmc.c
+++ b/modules/codec/xvmc/xxmc.c
@@ -28,7 +28,7 @@
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
 #include <vlc_codec.h>
-#include <vlc_vout_synchro.h>
+#include <vlc_codec_synchro.h>
 
 #include <unistd.h>
 #include <mcheck.h>
@@ -74,7 +74,7 @@ struct decoder_sys_t
     /*
      * Output properties
      */
-    vout_synchro_t *p_synchro;
+    decoder_synchro_t *p_synchro;
     int            i_aspect;
     mtime_t        i_last_frame_pts;
 
@@ -251,7 +251,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                     p_sys->p_info->sequence &&
                     p_sys->p_info->sequence->width != (unsigned int)-1 )
                 {
-                    vout_SynchroReset( p_sys->p_synchro );
+                    decoder_SynchroReset( p_sys->p_synchro );
                     if( p_sys->p_info->current_fbuf != NULL
                         && p_sys->p_info->current_fbuf->id != NULL )
                     {
@@ -270,11 +270,11 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
                     if ( p_sys->b_slice_i )
                     {
-                        vout_SynchroNewPicture( p_sys->p_synchro,
+                        decoder_SynchroNewPicture( p_sys->p_synchro,
                             I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate,
                             p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY );
-                        vout_SynchroDecode( p_sys->p_synchro );
-                        vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 );
+                        decoder_SynchroDecode( p_sys->p_synchro );
+                        decoder_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 );
                     }
                 }
 
@@ -377,9 +377,9 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
                 if( p_sys->p_synchro )
                 {
-                    vout_SynchroRelease( p_sys->p_synchro );
+                    decoder_SynchroRelease( p_sys->p_synchro );
                 }
-                p_sys->p_synchro = vout_SynchroInit( p_dec,
+                p_sys->p_synchro = decoder_SynchroInit( p_dec,
                     (uint32_t)((uint64_t)1001000000 * 27 /
                     p_sys->p_info->sequence->frame_period) );
                 p_sys->b_after_sequence_header = 1;
@@ -387,7 +387,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
             break;
 
             case STATE_PICTURE_2ND:
-                vout_SynchroNewPicture( p_sys->p_synchro,
+                decoder_SynchroNewPicture( p_sys->p_synchro,
                         p_sys->p_info->current_picture->flags & PIC_MASK_CODING_TYPE,
                         p_sys->p_info->current_picture->nb_fields,
                         0, 0, p_sys->i_current_rate,
@@ -395,11 +395,11 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
                 if( p_sys->b_skip )
                 {
-                    vout_SynchroTrash( p_sys->p_synchro );
+                    decoder_SynchroTrash( p_sys->p_synchro );
                 }
                 else
                 {
-                    vout_SynchroDecode( p_sys->p_synchro );
+                    decoder_SynchroDecode( p_sys->p_synchro );
                 }
                 break;
 
@@ -415,11 +415,11 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                 {
                     /* Intra-slice refresh. Simulate a blank I picture. */
                     msg_Dbg( p_dec, "intra-slice refresh stream" );
-                    vout_SynchroNewPicture( p_sys->p_synchro,
+                    decoder_SynchroNewPicture( p_sys->p_synchro,
                         I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate,
                         p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY );
-                    vout_SynchroDecode( p_sys->p_synchro );
-                    vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 );
+                    decoder_SynchroDecode( p_sys->p_synchro );
+                    decoder_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 );
                     p_sys->b_slice_i = 1;
                 }
                 p_sys->b_after_sequence_header = 0;
@@ -448,7 +448,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                 p_block->i_pts = p_block->i_dts = 0;
                 /* End hack */
 
-                vout_SynchroNewPicture( p_sys->p_synchro,
+                decoder_SynchroNewPicture( p_sys->p_synchro,
                     p_sys->p_info->current_picture->flags & PIC_MASK_CODING_TYPE,
                     p_sys->p_info->current_picture->nb_fields, i_pts,
                     0, p_sys->i_current_rate,
@@ -457,7 +457,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                 if ( !(p_sys->b_slice_i
                     && ((p_sys->p_info->current_picture->flags
                             & PIC_MASK_CODING_TYPE) == P_CODING_TYPE))
-                    && !vout_SynchroChoose( p_sys->p_synchro,
+                    && !decoder_SynchroChoose( p_sys->p_synchro,
                                 p_sys->p_info->current_picture->flags
                                     & PIC_MASK_CODING_TYPE,
                                 /*FindVout(p_dec)->render_time*/ 0 /*FIXME*/,
@@ -465,14 +465,14 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                 {
                     mpeg2_skip( p_sys->p_mpeg2dec, 1 );
                     p_sys->b_skip = 1;
-                    vout_SynchroTrash( p_sys->p_synchro );
+                    decoder_SynchroTrash( p_sys->p_synchro );
                     mpeg2_set_buf( p_sys->p_mpeg2dec, buf, NULL );
                 }
                 else
                 {
                     mpeg2_skip( p_sys->p_mpeg2dec, 0 );
                     p_sys->b_skip = 0;
-                    vout_SynchroDecode( p_sys->p_synchro );
+                    decoder_SynchroDecode( p_sys->p_synchro );
 
                     if( (p_pic = GetNewPicture( p_dec, buf )) == NULL )
                     {
@@ -506,7 +506,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                 {
                     p_pic = (picture_t *)p_sys->p_info->display_fbuf->id;
 
-                    vout_SynchroEnd( p_sys->p_synchro,
+                    decoder_SynchroEnd( p_sys->p_synchro,
                                 p_sys->p_info->display_picture->flags
                                 & PIC_MASK_CODING_TYPE,
                                 p_sys->b_garbage_pic );
@@ -514,7 +514,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
                     if ( p_sys->p_picture_to_destroy != p_pic )
                     {
-                        p_pic->date = vout_SynchroDate( p_sys->p_synchro );
+                        p_pic->date = decoder_SynchroDate( p_sys->p_synchro );
                     }
                     else
                     {
@@ -553,7 +553,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
                 ( ( p_sys->p_info->current_picture->flags &
                     PIC_MASK_CODING_TYPE) != B_CODING_TYPE ) )
                 {
-                    if( p_sys->p_synchro ) vout_SynchroReset( p_sys->p_synchro );
+                    if( p_sys->p_synchro ) decoder_SynchroReset( p_sys->p_synchro );
                 }
                 mpeg2_skip( p_sys->p_mpeg2dec, 1 );
                 p_sys->b_skip = 1;
@@ -588,11 +588,11 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
                 if( p_sys->b_slice_i )
                 {
-                    vout_SynchroNewPicture( p_sys->p_synchro,
+                    decoder_SynchroNewPicture( p_sys->p_synchro,
                         I_CODING_TYPE, 2, 0, 0, p_sys->i_current_rate,
                         p_sys->p_info->sequence->flags & SEQ_FLAG_LOW_DELAY );
-                    vout_SynchroDecode( p_sys->p_synchro );
-                    vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 );
+                    decoder_SynchroDecode( p_sys->p_synchro );
+                    decoder_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 );
                 }
                 break;
             }
@@ -613,7 +613,7 @@ static void CloseDecoder( vlc_object_t *p_this )
     decoder_sys_t *p_sys = p_dec->p_sys;
     FILE *f_wd_dec;
 
-    if( p_sys->p_synchro ) vout_SynchroRelease( p_sys->p_synchro );
+    if( p_sys->p_synchro ) decoder_SynchroRelease( p_sys->p_synchro );
     if( p_sys->p_mpeg2dec ) mpeg2_close( p_sys->p_mpeg2dec );
 
     f_wd_dec = fopen("/vlc/dec_pid", "w");