01420316d2
avfilter/vf_drawtext: add support for commands
2023-06-19 22:35:53 +02:00
692d37d2e9
avfilter/vf_drawtext: add y_align option
...
The new y_align option specifies if the user provided y value
is referred to the top of the text, to the font baseline or to the
top of the font
2023-06-19 22:35:53 +02:00
5f2d907de2
avfilter/vf_drawtext: implement text alignment
...
Text can now be aligned vertically (top, middle, bottom) and horizontally (left, center, right)
relative to the background box.
2023-06-19 22:35:53 +02:00
01d843f6d0
avfilter/vf_drawtext: add expression variables to control font ascent/descent
...
The following new variables can be used in the x and y expressions: font_a, font_d, top_a, bottom_d.
2023-06-19 22:35:53 +02:00
fac7bb06d8
avfilter/vf_drawtext: add options for size of the background box
2023-06-19 22:35:53 +02:00
79e39978d8
avfilter/vf_drawtext: extend boxborderw option
...
Adds support for different border size in each direction.
2023-06-19 22:35:53 +02:00
1eeb59a209
avfilter/vf_drawtext: improve glyph shaping and positioning
...
- text is now shaped using libharfbuz
- glyphs position is now accurate to 1/4 pixel in both directions
- the default line height is now the one defined in the font
Adds libharfbuzz dependency.
2023-06-19 22:35:52 +02:00
ba00ed33e5
avfilter/vf_drawtext: cosmetics
2023-06-19 22:35:52 +02:00
17499f43b1
avformat/evc: remove unused variable
...
And check the correct one. Should fix use of uninitialized value warnings.
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 17:34:15 -03:00
e81eafcb97
avformat/evc: skip nalu header size bytes before parsing sps
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 17:21:19 -03:00
048b8bdd5e
avformat/evc: use get_bits_long() where needed
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 17:21:19 -03:00
377da83b99
avcodec/evc_ps: check valid range for a few more elements
...
Should prevent overreads on non spec comformant input.
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 17:21:14 -03:00
199fc04d09
avcodec/evc_ps: use get_bits_long() where needed
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 16:25:13 -03:00
89f98acbf8
avcodec/evc_ps: Check log2_sub_gop_length
...
Fixes: 1.70141e+38 is outside the range of representable values of type 'int'
Fixes: 59883/clusterfuzz-testcase-minimized-ffmpeg_BSF_EVC_FRAME_MERGE_fuzzer-5557887217565696
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 16:00:55 -03:00
921596e677
avcodec/evc_ps: make ff_evc_parse_{sps,pps} return an error code
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 16:00:55 -03:00
5cb9ef9300
avcodec/evc_parse: remove ff_evc_parse_nal_unit()
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 12:57:31 -03:00
56e52e870d
avcodec/evc_frame_merge_bsf: make ff_evc_parse_nal_unit() local to the filter
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 12:57:31 -03:00
fdd8daf899
avcodec/evc_parser: remove write only variable
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 12:57:31 -03:00
a5663f2d9a
avcodec/evc_parser: make ff_evc_parse_nal_unit() local to the parser
...
This is in preparation for the following commits.
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 12:57:31 -03:00
ff7a4cdf04
avcodec/evc_parse: split off deriving PoC
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 12:57:31 -03:00
f7e0af5edc
avcodec/evc_parser: stop exporting delay and gop_size
...
The former is a property a decoder may export, and the latter is only
used in encoding scenarios.
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 12:57:31 -03:00
1e189fed7a
avcodec/evc_parse: split off Parameter Set parsing into its own file
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 12:57:31 -03:00
4afee83d35
fate/lavf-container: add a test to remux raw evc into mp4
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 12:57:31 -03:00
8ab706677c
avcodec/evc_frame_merge_bsf: use av_new_packet()
...
This ensures the buffer is padded as required by the AVPacket API.
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 12:57:31 -03:00
96fc192733
avcodec/evc_frame_merge: use av_fast_realloc()
...
Signed-off-by: James Almer <jamrial@gmail.com>
2023-06-19 12:57:31 -03:00
1617d1a752
fftools/ffmpeg: pass subtitle decoder dimensions to sub2video
...
Restores behavior from before 20cacfe493
2023-06-19 09:48:56 +02:00
88f80977eb
fftools/ffmpeg: use AVFrame to pass subtitles from decoders to filters
...
Allows to use the same buffering code for all media types. Will also be
important for the following commit.
2023-06-19 09:48:56 +02:00
fa717baaa5
fftools/ffmpeg_enc: constify the subtitle passed to enc_subtitle()
2023-06-19 09:48:56 +02:00
e89a6d1089
fftools/ffmpeg_dec: move InputStream.prev_sub to Decoder
...
It does not need to be visible outside of decoding code.
2023-06-19 09:48:56 +02:00
a45b9d35b9
fftools/ffmpeg: move fix_sub_duration_heartbeat() to ffmpeg_dec
...
This way ffmpeg.c does not need to access InputStream.prev_sub and it
can be made private.
2023-06-19 09:48:55 +02:00
01897c1788
fftools/ffmpeg_dec: move decoding to a separate thread
...
This is only a preparatory step to a fully threaded architecture and
does not yet make decoding truly parallel - the main thread will
currently submit a packet and wait until it has been fully processed by
the decoding thread before moving on. Decoder behavior as observed by
the rest of the program should remain unchanged. That will change in
future commits after encoders and filters are moved to threads and a
thread-aware scheduler is added.
2023-06-19 09:48:55 +02:00
5293adb1a7
fftools/ffmpeg: attach bits_per_raw_sample information to frames
...
This way avoids encoders reaching into filters or decoders for this
information.
2023-06-19 09:48:55 +02:00
7d4e00ccf0
fftools/ffmpeg_dec: stop using Decoder.pkt
...
It is only used for flushing the subtitle decoder, so allocate a
dedicated packet for that.
Keep Decoder.pkt unused for now, it will be repurposed in future
commits.
2023-06-19 09:48:55 +02:00
1bdd53e2f9
fftools/ffmpeg_filter: make configure_filtergraph() static
...
It is no longer used outside of ffmpeg_filter.
2023-06-19 09:48:55 +02:00
b1a213ab5d
fftools/ffmpeg_filter: reject filtergraphs with zero outputs
...
Nothing useful can be done with them currently.
2023-06-19 09:48:55 +02:00
a7aa05c599
fftools/ffmpeg_filter: add an AVClass to FilterGraph
...
Use it for logging.
2023-06-19 09:48:55 +02:00
a934392db0
fftools/ffmpeg_enc: move dup_warning global variable to Encoder
2023-06-19 09:48:55 +02:00
1adad44fc7
fftools/ffmpeg_dec: move InputStream.hwaccel_pix_fmt to Decoder
...
It is purely decoder-internal state.
2023-06-19 09:48:55 +02:00
174cb3accf
fftools/ffmpeg_dec: remove pointless InputStream.hwaccel_retrieve_data
...
It is always set to hwaccel_retrieve_data() from ffmpeg_hw.c, so that
function can just be called directly instead.
2023-06-19 09:48:55 +02:00
25d96ab6c0
fftools/ffmpeg_hw: inline hwaccel_decode_init() into its caller
...
The function is now trivial and cannot fail, so all error handling in
its caller can be removed.
2023-06-19 09:48:55 +02:00
6c9cbf7507
fftools/ffmpeg_demux: reindent after previous commit
2023-06-19 09:48:55 +02:00
98766dbbd7
fftools/ffmpeg_demux: move the loop out of add_input_streams()
...
Make the function process just one input stream at a time and save an
indentation level. Also rename it to ist_add() to be consistent with an
analogous function in ffmpeg_mux_init.
2023-06-19 09:48:55 +02:00
47a14b542e
tests/fate: add a test for -streamloop with transcoding video+audio
2023-06-19 09:48:55 +02:00
90a26e75a4
tests/fate: rename ffmpeg-streamloop to ffmpeg-streamloop-copy
...
Makes it clear that this tests -streamloop with streamcopy, to
distinguish it from further -streamloop tests added in future commits.
2023-06-19 09:48:55 +02:00
df81fb46ee
fftools/ffmpeg_dec: simplify process_subtitle()
...
Its got_output argument always points to 1.
2023-06-19 09:48:55 +02:00
e9eb44ed88
fftools/ffmpeg_dec: drop always-0 InputStream.prev_sub.ret
2023-06-19 09:48:55 +02:00
52d7ea6635
doc/ffmpeg: improve -stats_*_fmt documentation
2023-06-19 09:48:10 +02:00
a33191ff7a
fate/cbs: Fix the ffprobe dependency for Windows targets
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2023-06-19 09:25:32 +03:00
f66e1862e3
avcodec/videotoolboxenc: inherit profile from AVCodecContext
...
This can happen when user set the avctx->profile field directly
instead of specify profile via option.
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
2023-06-19 12:19:37 +08:00
3fafc842f1
avcodec/videotoolboxenc: remove AUTO_PROFILE define
...
Use FF_PROFILE_UNKNOWN as auto mode.
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
2023-06-19 12:19:37 +08:00
yethie
James Almer
Michael Niedermayer
Anton Khirnov
Martin Storsjö
Zhao Zhili