diff options
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/metronom.c | 14 | ||||
| -rw-r--r-- | src/xine-engine/metronom.h | 3 | ||||
| -rw-r--r-- | src/xine-engine/video_out.h | 22 | ||||
| -rw-r--r-- | src/xine-engine/xine_internal.h | 6 |
4 files changed, 7 insertions, 38 deletions
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c index af5b28a70..446387459 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: metronom.c,v 1.91 2002/09/04 23:31:13 guenter Exp $ + * $Id: metronom.c,v 1.92 2002/09/05 22:19:04 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -329,7 +329,6 @@ static void metronom_handle_video_discontinuity (metronom_t *this, int type, #endif this->vpts_offset = this->video_vpts; this->in_discontinuity = 0; - this->force_audio_jump = 0; break; case DISC_ABSOLUTE: #ifdef LOG @@ -337,7 +336,6 @@ static void metronom_handle_video_discontinuity (metronom_t *this, int type, #endif this->next_vpts_offset = this->video_vpts - disc_off; this->in_discontinuity = 30; - this->force_audio_jump = 0; break; case DISC_RELATIVE: #ifdef LOG @@ -345,16 +343,13 @@ static void metronom_handle_video_discontinuity (metronom_t *this, int type, #endif this->next_vpts_offset = this->vpts_offset - disc_off; this->in_discontinuity = 30; - this->force_audio_jump = 0; break; case DISC_STREAMSEEK: #ifdef LOG printf ("metronom: DISC_STREAMSEEK\n"); #endif this->vpts_offset = this->video_vpts - disc_off; - this->next_vpts_offset = this->video_vpts - disc_off; - this->in_discontinuity = 30; - this->force_audio_jump = 1; + this->in_discontinuity = 0; this->allow_full_ao_fill_gap = 1; break; } @@ -502,17 +497,16 @@ static int64_t metronom_got_audio_samples (metronom_t *this, int64_t pts, pthread_mutex_lock (&this->lock); - if (this->in_discontinuity && !this->force_audio_jump) + if (this->in_discontinuity) pts = 0; /* ignore pts during discontinuities */ if (pts) { vpts = pts + this->vpts_offset; diff = this->audio_vpts - vpts; /* compare predicted and given vpts */ - if( (abs(diff) > AUDIO_DRIFT_TOLERANCE) || this->force_audio_jump ) { + if((abs(diff) > AUDIO_DRIFT_TOLERANCE) || this->allow_full_ao_fill_gap) { this->audio_vpts = vpts; this->audio_drift_step = 0; - this->force_audio_jump = 0; printf("metronom: audio jump\n"); } else { diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h index 6b8f26f0a..64708bd84 100644 --- a/src/xine-engine/metronom.h +++ b/src/xine-engine/metronom.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: metronom.h,v 1.34 2002/06/29 14:32:36 tmattern Exp $ + * $Id: metronom.h,v 1.35 2002/09/05 22:19:04 mroi Exp $ * * metronom: general pts => virtual calculation/assoc * @@ -244,7 +244,6 @@ struct metronom_s { pthread_cond_t cancel; int allow_full_ao_fill_gap; - int force_audio_jump; }; metronom_t *metronom_init (int have_audio, void *xine); diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 056ff72dc..e8747d469 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out.h,v 1.59 2002/09/04 23:31:13 guenter Exp $ + * $Id: video_out.h,v 1.60 2002/09/05 22:19:04 mroi Exp $ * * * xine version of video_out.h @@ -372,26 +372,6 @@ video_overlay_instance_t *video_overlay_new_instance (); vo_instance_t *vo_new_instance (xine_vo_driver_t *driver, xine_t *xine) ; -/* - * to build a dynamic video output plugin - * you have to implement these functions: - * - * - * xine_vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual); - * - * init and set up driver so it is fully operational - * - * parameters: config - config object pointer - * visual - driver specific info (e.g. Display*) - * - * return value: video_driver_t* in case of success, - * NULL on failure (e.g. wrong interface version, - * wrong visual type...) - * - * - * - */ - #ifdef __cplusplus } #endif diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 8b78dfffc..45aa9f787 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_internal.h,v 1.94 2002/09/05 16:50:56 guenter Exp $ + * $Id: xine_internal.h,v 1.95 2002/09/05 22:19:04 mroi Exp $ * */ @@ -99,8 +99,6 @@ struct video_decoder_s { void (*dispose) (video_decoder_t *this); - int priority; - }; /* @@ -127,8 +125,6 @@ struct audio_decoder_s { void (*dispose) (audio_decoder_t *this); - int priority; - }; /* |