diff options
author | wm4 <wm4@nowhere> | 2013-12-07 19:35:55 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-07 19:35:55 +0100 |
commit | d658b115a0fcb9b313b2eb77ed860649f83257b0 (patch) | |
tree | 8efd883fb2d83d8b8fc3be95067d32e336e11944 /video/filter/vf.h | |
parent | 37fbef2ccb3c828dd41f6e15ccf635e697e4011f (diff) | |
download | mpv-d658b115a0fcb9b313b2eb77ed860649f83257b0.tar.bz2 mpv-d658b115a0fcb9b313b2eb77ed860649f83257b0.tar.xz |
vf: redo conversion filter insertion/format negotiation
Remove the inconsistent, duplicated, and insufficient scale filter
insertion code, and do it in one place instead. This also compensates
for the earlier removal of vf_match_csp() (which was in fact duplicated
code).
The algorithm to determine where to insert a filter etc. is probably the
same, though it also comes with some changes that should make debugging
easier when trying to figure out why a chain is failing to configure.
Add an "in" pseudo filter, which makes insertion of conversion filters
easier. Also change the vf->reconfig signature. At a later point, I'll
probably change format negotiation such that the generic filter code
will choose the output format, so having separate in and out params will
be useful.
Diffstat (limited to 'video/filter/vf.h')
-rw-r--r-- | video/filter/vf.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/video/filter/vf.h b/video/filter/vf.h index ebe7637c0e..a852a245f3 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -44,9 +44,14 @@ typedef struct vf_info { typedef struct vf_instance { const vf_info_t *info; - // Note: the callee is allowed to write *params. - int (*reconfig)(struct vf_instance *vf, struct mp_image_params *params, - int flags); + // Initialize the filter. The filter must set *out to the same image + // params as the images the filter functions will return for the given + // *in format. + // Note that by default, only formats reported as supported by query_format + // will be allowed for *in. + // Returns >= 0 on success, < 0 on error. + int (*reconfig)(struct vf_instance *vf, struct mp_image_params *in, + struct mp_image_params *out); // Legacy variant, use reconfig instead. int (*config)(struct vf_instance *vf, @@ -80,8 +85,9 @@ typedef struct vf_instance { struct mp_image **out_queued; int num_out_queued; - // Temporary - struct vf_chain *chain; + // Caches valid output formats. + uint8_t last_outfmts[IMGFMT_END - IMGFMT_START]; + struct vf_instance *next; } vf_instance_t; @@ -138,8 +144,6 @@ int vf_next_config(struct vf_instance *vf, unsigned int flags, unsigned int outfmt); int vf_next_query_format(struct vf_instance *vf, unsigned int fmt); -int vf_next_reconfig(struct vf_instance *vf, struct mp_image_params *params, - int flags); // Helpers |