1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

25 Commits

Author SHA1 Message Date
exwm
32d6fe23b6 avfilter/zoompan: add in_time variable
Currently, the zoompan filter exposes a 'time' variable (missing from docs) for use in
the 'zoom', 'x', and 'y' expressions. This variable is perhaps better named
'out_time' as it represents the timestamp in seconds of each output frame
produced by zoompan. This patch adds aliases 'out_time' and 'ot' for 'time'.

This patch also adds an 'in_time' (alias 'it') variable that provides access
to the timestamp in seconds of each input frame to the zoompan filter.
This helps to design zoompan filters that depend on the input video timestamps.
For example, it makes it easy to zoom in instantly for only some portion of a video.
Both the 'out_time' and 'in_time' variables have been added in the documentation
for zoompan.

Example usage of 'in_time' in the zoompan filter to zoom in 2x for the
first second of the input video and 1x for the rest:
    zoompan=z='if(between(in_time,0,1),2,1):d=1'

V2: Fix zoompan filter documentation stating that the time variable
would be NAN if the input timestamp is unknown.

V3: Add 'it' alias for 'in_time. Add 'out_time' and 'ot' aliases for 'time'.
Minor corrections to zoompan docs.

Signed-off-by: exwm <thighsman@protonmail.com>
2020-06-25 10:27:07 +02:00
Paul B Mahol
ced3b8c61e avfilter/vf_zoompan: fix leaks 2019-09-25 21:48:59 +02:00
Paul B Mahol
20242bc762 avfilter/vf_zoompan: forward status back from output to input 2019-09-25 21:37:26 +02:00
Paul B Mahol
9832885386 avfilter/vf_zoompan: do not increase VAR_IN twice, also count from 0
Fixes #7242.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2018-06-03 14:57:25 +02:00
Paul B Mahol
e1524de454 avfilter/vf_zoompan: fix specific corner case when no frame was ever requested from input
Reported-by: Nicolas George
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-09-07 16:49:46 +02:00
Michael Niedermayer
aa26258faa avfilter/vf_zoompan: remove AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC
Suggested-by: <durandal_1707>
Fixes: assertion failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-27 20:41:56 +02:00
Paul B Mahol
bf39f7eadc avfilter/vf_zoompan: parse zoom,x and y expression during initialization
Fixes #6127.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-08-27 17:13:52 +02:00
Paul B Mahol
2ce43274e3 avfilter/vf_zoompan: switch to activate
Fixes #5182.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-08-27 17:13:21 +02:00
Michael Niedermayer
5036e214b0 avfilter/vf_zoompan: Free out frame on error
Fixes: CID1398578

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31 12:28:58 +02:00
Nicolas George
183ce55b0d lavfi: split frame_count between input and output.
AVFilterLink.frame_count is supposed to count the number of frames
that were passed on the link, but with min_samples, that number is
not always the same for the source and destination filters.
With the addition of a FIFO on the link, the difference will become
more significant.

Split the variable in two: frame_count_in counts the number of
frames that entered the link, frame_count_out counts the number
of frames that were sent to the destination filter.
2016-11-13 10:41:16 +01:00
Paul B Mahol
ac18114b96 avfilter/vf_zoompan: fix pzoom usage 2016-08-15 09:55:36 +02:00
Michael Niedermayer
f2c8b666be avfilter: Fix max value of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-09 10:35:13 +02:00
Michael Niedermayer
f9f684c0fb avfilter/vf_zoompan: Initialize ret
Silences: CID1351394

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-12 15:59:35 +01:00
Michael Niedermayer
03b26a2514 avfilter/vf_zoompan: Fix use of uninitialized variables
Fixes: CID1351392
Fixes: CID1351393
Fixes: CID1351395

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-12 15:59:35 +01:00
Michael Niedermayer
9313fb6a3e avfilter/vf_zoompan: Remove dead store
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-12 00:07:29 +01:00
Derek Buitenhuis
21f9468402 avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT
Libav, for some reason, merged this as a public API function. This will
aid in future merges.

A define is left for backwards compat, just in case some person
used it, since it is in a public header.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-01-27 16:36:46 +00:00
Paul B Mahol
f42eae96b2 avfilter/vf_zoompan: fix pts handling
Now output pts have some sense.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-01-24 20:29:19 +01:00
Paul B Mahol
8a34344379 avfilter/vf_zoompan: unbreak filtering with video input
Inserting fifo appears to be working solution to not get
filter_frame request we do not want.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-01-24 19:17:39 +01:00
Paul B Mahol
3b9f41a9c6 avfilter/vf_zoompan: rewrite so it doesn't cache all output frames
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-01-24 17:49:23 +01:00
Paul B Mahol
8bcd1997ea avfilter/vf_zoompan: do not free frame we pushed to lavfi
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-01-02 18:51:11 +01:00
Paul B Mahol
cfe8a89b00 avfilter/vf_zoompan: support planar rgb pixel formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-06-12 17:15:20 +00:00
Michael Niedermayer
00f5c8f98d avfilter/vf_zoompan: free out AVFrame on failure
Fixes: CID1197065

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-13 01:58:45 +02:00
Paul B Mahol
a0854c084e avfilter: handle error in query_formats() in bunch of filters
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-04-08 13:05:06 +00:00
Michael Niedermayer
2ffe55a64f avfilter/vf_zoompan: fix mixing of declarations and statements
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 17:27:34 +02:00
Paul B Mahol
4b6cb1cc69 Zoom & Pan filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-06-09 12:41:33 +00:00