diff options
Diffstat (limited to 'player')
| -rw-r--r-- | player/audio.c | 2 | ||||
| -rw-r--r-- | player/core.h | 18 | ||||
| -rw-r--r-- | player/video.c | 6 |
3 files changed, 4 insertions, 22 deletions
diff --git a/player/audio.c b/player/audio.c index 0c9d878496..06ea1262a6 100644 --- a/player/audio.c +++ b/player/audio.c @@ -64,7 +64,7 @@ static void update_speed_filters(struct MPContext *mpctx) speed = 1.0; } - if (mpctx->display_sync_active && mpctx->opts->video_sync == VS_DISP_ADROP) { + if (mpctx->display_sync_active && mpctx->video_out->opts->video_sync == VS_DISP_ADROP) { drop *= speed * resample; resample = speed = 1.0; } diff --git a/player/core.h b/player/core.h index b59713721e..71595ef4f6 100644 --- a/player/core.h +++ b/player/core.h @@ -92,24 +92,6 @@ struct seek_params { unsigned flags; // MPSEEK_FLAG_* }; -enum video_sync { - VS_DEFAULT = 0, - VS_DISP_RESAMPLE, - VS_DISP_RESAMPLE_VDROP, - VS_DISP_RESAMPLE_NONE, - VS_DISP_ADROP, - VS_DISP_VDROP, - VS_DISP_NONE, - VS_NONE, -}; - -#define VS_IS_DISP(x) ((x) == VS_DISP_RESAMPLE || \ - (x) == VS_DISP_RESAMPLE_VDROP || \ - (x) == VS_DISP_RESAMPLE_NONE || \ - (x) == VS_DISP_ADROP || \ - (x) == VS_DISP_VDROP || \ - (x) == VS_DISP_NONE) - // Information about past video frames that have been sent to the VO. struct frame_info { double pts; diff --git a/player/video.c b/player/video.c index cae23df1c8..6400979438 100644 --- a/player/video.c +++ b/player/video.c @@ -583,7 +583,7 @@ static void update_avsync_before_frame(struct MPContext *mpctx) if (mpctx->video_status < STATUS_READY) { mpctx->time_frame = 0; - } else if (mpctx->display_sync_active || opts->video_sync == VS_NONE) { + } else if (mpctx->display_sync_active || vo->opts->video_sync == VS_NONE) { // don't touch the timing } else if (mpctx->audio_status == STATUS_PLAYING && mpctx->video_status == STATUS_PLAYING && @@ -737,7 +737,7 @@ static double compute_audio_drift(struct MPContext *mpctx, double vsync) static void adjust_audio_resample_speed(struct MPContext *mpctx, double vsync) { struct MPOpts *opts = mpctx->opts; - int mode = opts->video_sync; + int mode = mpctx->video_out->opts->video_sync; if (mode != VS_DISP_RESAMPLE || mpctx->audio_status != STATUS_PLAYING) { mpctx->speed_factor_a = mpctx->speed_factor_v; @@ -797,7 +797,7 @@ static void handle_display_sync_frame(struct MPContext *mpctx, { struct MPOpts *opts = mpctx->opts; struct vo *vo = mpctx->video_out; - int mode = opts->video_sync; + int mode = vo->opts->video_sync; if (!mpctx->display_sync_active) { mpctx->display_sync_error = 0.0; |