diff options
author | wm4 <wm4@nowhere> | 2015-07-20 21:12:46 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-07-20 21:12:46 +0200 |
commit | 4a1657da01da373332f484d26441835975bb4e4b (patch) | |
tree | 10ae7106b128286a6f37572670f23b1561ece759 /video/out/vo.h | |
parent | 6f7d04be21de7bdfce3c7c38a4d5fae17451b409 (diff) |
vo: minor simplification for queue size handling
Instead of calling it "future frames" and adding or subtracting 1 from
it, always call it "requested frames". This simplifies it a bit.
MPContext.next_frames had 2 added to it; this was mainly to ensure a
minimum size of 2. Drop it and assume VO_MAX_REQ_FRAMES is at least 2;
together with the other changes, this can be the exact size of the
array.
Diffstat (limited to 'video/out/vo.h')
-rw-r--r-- | video/out/vo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/vo.h b/video/out/vo.h index f264694c08..06a923bf41 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -140,7 +140,7 @@ struct voctrl_get_equalizer_args { // VO does framedrop itself (vo_vdpau). Untimed/encoding VOs never drop. #define VO_CAP_FRAMEDROP 2 -#define VO_MAX_FUTURE_FRAMES 10 +#define VO_MAX_REQ_FRAMES 10 struct vo; struct osd_state; @@ -185,7 +185,7 @@ struct vo_frame { // Note that some future frames may never be sent as current frame to the // VO if frames are dropped. int num_frames; - struct mp_image *frames[VO_MAX_FUTURE_FRAMES + 1]; + struct mp_image *frames[VO_MAX_REQ_FRAMES]; }; struct vo_driver { @@ -338,8 +338,8 @@ void vo_event(struct vo *vo, int event); int vo_query_and_reset_events(struct vo *vo, int events); struct mp_image *vo_get_current_frame(struct vo *vo); void vo_set_queue_params(struct vo *vo, int64_t offset_us, bool vsync_timed, - int num_future_frames); -int vo_get_num_future_frames(struct vo *vo); + int num_req_frames); +int vo_get_num_req_frames(struct vo *vo); int64_t vo_get_vsync_interval(struct vo *vo); double vo_get_display_fps(struct vo *vo); |