> -Original Message-
> From: ffmpeg-devel On Behalf Of Michael
> Niedermayer
> Sent: Sunday, November 28, 2021 9:31 PM
> To: FFmpeg development discussions and patches
> Subject: Re: [FFmpeg-devel] [PATCH v17 14/19] avfilter/overlaytextsubs: Add
> overlaytextsubs and textsubs2video
On Sun, 28 Nov 2021, Pierre-Anthony Lemieux wrote:
On Sun, Nov 28, 2021 at 5:00 PM Marton Balint wrote:
Setting the channel layout was based on SoundfieldGroupLabelSubDescriptor, but
this was wrong, because soundfield groups are not necessarily used and a file
can also contain e.g. a
This commit actually enables subtitle filtering in ffmpeg by
sending and receiving subtitle frames to and from a filtergraph.
The heartbeat functionality from the previous sub2video implementation
is retained and applied to all subtitle frames (bitmap, text, ..).
The other part of sub2video
- overlaygraphicsubs (VS -> V)
Overlay graphic subtitles onto a video stream
- graphicsub2video {S -> V)
Converts graphic subtitles to video frames (with alpha)
Gets auto-inserted for retaining compatibility with
sub2video command lines
Signed-off-by: softworkz
---
doc/filters.texi
Signed-off-by: softworkz
---
libavfilter/avfilter.c | 8 +---
libavfilter/avfilter.h | 11 +++
libavfilter/avfiltergraph.c | 5 +
libavfilter/formats.c | 22 ++
libavfilter/formats.h | 3 +++
libavfilter/internal.h | 18
Analog to avfilter/video.c and avfilter/audio.c
Signed-off-by: softworkz
---
libavfilter/Makefile| 1 +
libavfilter/avfilter.c | 4 +++
libavfilter/internal.h | 1 +
libavfilter/subtitles.c | 63 +
libavfilter/subtitles.h | 44
Signed-off-by: softworkz
---
configure| 2 +-
libavfilter/allfilters.c | 2 ++
libavfilter/buffersink.c | 54 ++
libavfilter/buffersink.h | 7
libavfilter/buffersrc.c | 72
libavfilter/buffersrc.h | 1
On Fri, 26 Nov 2021, Lynne wrote:
25 Nov 2021, 23:49 by c...@passwd.hu:
On Thu, 25 Nov 2021, Lynne wrote:
This adds a time_base field (currently unused), analogue to the
AVPacket.time_base field.
This allows for API clients to exchange AVFrames directly, without
needing to plumb extra
Signed-off-by: softworkz
---
libavcodec/hevcdec.c | 112 +--
libavcodec/hevcdec.h | 2 +
2 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index 46d9edf8eb..53593d6186 100644
---
Signed-off-by: softworkz
---
libavcodec/h264_slice.c | 98 +
libavcodec/h264dec.h| 2 +
2 files changed, 52 insertions(+), 48 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 4467882775..5c1f38de03 100644
---
Missing SEI information has always been a major drawback when using
the QSV decoders. I used to think that there's no chance to get at
the data without explicit implementation from the MSDK side (or doing
something weird like parsing in parallel).
It turned out that there's a hardly known api
Signed-off-by: softworkz
---
libavcodec/mpeg12.h| 25 +
libavcodec/mpeg12dec.c | 36 +---
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index fb2b37e7c8..630afa4072 100644
---
Signed-off-by: softworkz
---
libavcodec/assenc.c| 90 +
libavcodec/avcodec.h | 5 +-
libavcodec/dvbsubenc.c | 96 +--
libavcodec/dvdsubenc.c | 100 +++-
libavcodec/encode.c| 63
Signed-off-by: softworkz
---
libavcodec/Makefile | 56 +++
libavcodec/ass.h | 147 ++
libavcodec/assdec.c | 2 +-
libavcodec/assenc.c | 2 +-
Signed-off-by: softworkz
---
fftools/ffplay.c | 102 +-
fftools/ffprobe.c | 48 ++
2 files changed, 78 insertions(+), 72 deletions(-)
diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index e7b20be76b..0af32888da 100644
---
Signed-off-by: softworkz
---
libavfilter/vf_subtitles.c | 54 +-
1 file changed, 42 insertions(+), 12 deletions(-)
diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
index 377160c72b..a240cbd415 100644
--- a/libavfilter/vf_subtitles.c
+++
On Fri, 26 Nov 2021, asilvestre wrote:
FLV AMF tags have a 24bit field for timestamps plus an 8bit for extended
timestamps.
All FLV AMF tags except when we write metadata handle this correctly
using the put_timestamp function.
Until now when writing metadata we were only using the first
24
On Fri, 26 Nov 2021, Michael Niedermayer wrote:
On Thu, Nov 25, 2021 at 04:59:41PM +, Soft Works wrote:
Another attempt: Created on Linux and zipped...
tested and works
LGTM
Applied.
Thanks,
Marton
___
ffmpeg-devel mailing list
> -Original Message-
> From: ffmpeg-devel On Behalf Of Michael
> Niedermayer
> Sent: Sunday, November 28, 2021 9:26 PM
> To: FFmpeg development discussions and patches
> Subject: Re: [FFmpeg-devel] [PATCH v17 15/19] avfilter/textmod: Add textmod,
> censor and show_speaker filters
>
>
On Mon, 22 Nov 2021, Ryoji Gyoda wrote:
If fifo_thread_recover() succeeds immediately after
fifo_thread_dispatch_message() fails, the dts of the packet is scaled
twice, causing cur_dts to be abnormally large and "Application provided
invalid, non monotonically increasing dts to muxer in
Signed-off-by: softworkz
---
libavcodec/qsvdec.c | 210
1 file changed, 210 insertions(+)
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 8bce9f2cf0..62f3e65455 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -45,6 +45,12
Signed-off-by: softworkz
---
libavcodec/qsvenc.c | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 06f55604b5..2c3b22e5f7 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -1477,7 +1477,16 @@ static int
Signed-off-by: softworkz
---
configure | 1 +
doc/filters.texi | 164 +++
libavfilter/Makefile | 1 +
libavfilter/allfilters.c | 1 +
libavfilter/sf_subscale.c | 883 ++
5 files changed, 1050 insertions(+)
create mode
It's been a regular annoyance.
Introduce a debug-only parameter for this.
Signed-off-by: softworkz
---
libavcodec/dvbsubdec.c | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index d192f3251d..e629b315c7 100644
It's been a regular annoyance.
Introduce a debug-only parameter for this.
Signed-off-by: softworkz
---
libavcodec/dvdsubdec.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 52259f0730..c0f796068e 100644
---
New in V18
- rebased to latest head (to fix merge conflict in allfilters.c)
- textmod: Removed two trailing blanks from sf_textmod.c
- xsubdec: fix xsubdec regression found by Michael; packet size estimation
as flawed
- splitcc: Fix uninitialzed locals
- splitcc: Do not propagate hwcontext on
Root commit for adding subtitle filtering capabilities.
In detail:
- Add type (AVMediaType) field to AVFrame
Replaces previous way of distinction which was based on checking
width and height to determine whether a frame is audio or video
- Add subtitle fields to AVFrame
- Add new struct
Signed-off-by: softworkz
---
libavcodec/avcodec.h | 19 +--
libavutil/subfmt.h | 58
2 files changed, 59 insertions(+), 18 deletions(-)
create mode 100644 libavutil/subfmt.h
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
- Add avcodec_decode_subtitle3 which takes subtitle frames,
serving as compatibility shim to legacy subtitle decoding
- Add additional methods for conversion between old and new API
Signed-off-by: softworkz
---
libavcodec/avcodec.h| 8 +-
libavcodec/codec_desc.c | 11 +++
- overlaytextsubs {VS -> V)
Overlay text subtitles onto a video stream.
- textsubs2video {S -> V)
Converts text subtitles to video frames
Signed-off-by: softworkz
---
configure| 2 +
doc/filters.texi | 113 ++
libavfilter/Makefile |
- splitcc {V -> VS)
Extract closed-caption (A53) data from video
frames as subtitle Frames
ffmpeg -y -loglevel verbose -i
"https://streams.videolan.org/streams/ts/CC/NewsStream-608-ac3.ts;
-filter_complex
"[0:v]splitcc[vid1],textmod=mode=remove_chars:find='@',[vid1]overlay_textsubs"
- stripstyles {S -> S)
Remove all inline styles from subtitle events
Signed-off-by: softworkz
---
doc/filters.texi | 37 +++
libavfilter/Makefile | 1 +
libavfilter/allfilters.c | 1 +
libavfilter/sf_stripstyles.c | 196 +++
4
Signed-off-by: softworkz
---
configure| 1 +
doc/filters.texi | 55 +
libavfilter/Makefile | 2 +
libavfilter/allfilters.c | 1 +
libavfilter/sf_graphicsub2text.c | 354 +++
5 files changed, 413
This fix targets (rare) cases where multiple input pads have a
.filter_frame function. ff_request_frame_to_filter needs
to call ff_request_frame with the correct input pad
instead of the hardcoded first one.
Signed-off-by: softworkz
---
libavfilter/avfilter.c | 18 +-
1 file
- textmod {S -> S)
Modify subtitle text in a number of ways
- censor {S -> S)
Censor subtitles using a word list
- show_speaker {S -> S)
Prepend speaker names from ASS subtitles to the visible text lines
Signed-off-by: softworkz
---
doc/filters.texi | 206
Quoting Marvin Scholz (2021-11-22 00:25:16)
> The documentation states that here 0 should be used for read-only and
> 1 for a writable buffer. AVIO_FLAG_WRITE however is 2, while it works
> due to the way the flag is handled internally, it is still wrong
> according to the documentation.
>
>
Quoting Chen, Wenbin (2021-11-23 02:56:37)
> > From: nyanmisaka
> >
> > The data stored in data[3] in VAAPI AVFrame is VASurfaceID while
> > the data stored in pair->first is the pointer of VASurfaceID, so
> > we need to do cast to make following commandline works:
> >
> > ffmpeg -hwaccel vaapi
Quoting Wenbin Chen (2021-11-16 09:16:23)
> From: nyanmisaka
>
> mfxHDLPair was added to qsv, so modify qsv->opencl map function as well.
> Now the following commandline works:
>
> ffmpeg -v verbose -init_hw_device vaapi=va:/dev/dri/renderD128 \
> -init_hw_device qsv=qs@va -init_hw_device
Andreas Rheinhardt:
> It is already set in new_output_stream().
>
> Signed-off-by: Andreas Rheinhardt
> ---
> fftools/ffmpeg_opt.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
> index 8a0cad3f62..9fdb2d4967 100644
> ---
On Sun, Nov 07, 2021 at 02:31:31PM +0100, Michael Niedermayer wrote:
> Fixes: signed integer overflow: -776522110086937600 * 16 cannot be
> represented in type 'long'
> Fixes:
> 40563/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6644829447127040
>
> Found-by: continuous fuzzing process
On Sun, Oct 03, 2021 at 03:36:05PM +0200, Michael Niedermayer wrote:
> This debug code can be quite slow on constructed streams
>
> Fixes: Timeout
> Fixes:
> 38907/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-6334628852531200
>
> Found-by: continuous fuzzing process
>
Fixes ticket #9537.
Probably a regression since 2b3206891649f317c20993411efef4bee39ae784.
Signed-off-by: Andreas Rheinhardt
---
libavcodec/vaapi_encode.c | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt
> ---
> fftools/ffmpeg.c | 3 ---
> fftools/ffmpeg.h | 7 ---
> fftools/ffmpeg_opt.c | 43 ---
> 3 files changed, 12 insertions(+), 41 deletions(-)
>
> diff --git a/fftools/ffmpeg.c
On Sat, Nov 13, 2021 at 10:04:47PM +0100, Michael Niedermayer wrote:
> Fixes: out of array access
> Fixes: Timeout
> Fixes:
> 40481/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VQA_fuzzer-6502647583080448
>
> Signed-off-by: Michael Niedermayer
> ---
> libavcodec/vqavideo.c | 15
Michael Niedermayer:
> Fixes: out of array access
> Fixes: Timeout
> Fixes:
> 40481/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VQA_fuzzer-6502647583080448
>
> Signed-off-by: Michael Niedermayer
> ---
> libavcodec/vqavideo.c | 15 ++-
> 1 file changed, 10 insertions(+), 5
On Mon, Nov 29, 2021 at 04:00:27PM +0100, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Fixes: out of array access
> > Fixes: Timeout
> > Fixes:
> > 40481/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VQA_fuzzer-6502647583080448
> >
> > Signed-off-by: Michael Niedermayer
> > ---
> >
Ping, will apply in a few days if no objections.
On 27/11/21 13:51, Zane van Iperen wrote:
Adds demuxer for Square Enux SCD files.
Based off [1] and personal investigation.
This has only been tested against Drakengard 3 (PS3) *_SCD.XXX files
(big-endian). As it is highly likely that FFXIV
Signed-off-by: Marton Balint
---
libavformat/file.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/file.c b/libavformat/file.c
index 9c23f680cd..7001750c80 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -266,7 +266,8 @@ static int64_t
Otherwise there is no way to detect any error during avio_close().
Signed-off-by: Marton Balint
---
doc/APIchanges | 3 +++
libavformat/avformat.h | 6 +-
libavformat/internal.h | 6 +-
libavformat/options.c | 4 ++--
libavformat/utils.c| 6 --
libavformat/version.h |
Signed-off-by: Marton Balint
---
libavformat/img2enc.c | 33 +++--
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 62202de9f4..ce23f38efb 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
This allows us to check the return value of avio_closep().
Signed-off-by: Marton Balint
---
fftools/ffmpeg.c | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 25360423b5..ea75fad637 100644
--- a/fftools/ffmpeg.c
+++
Otherwise IO errors at avio_flush() before closing may be lost.
Signed-off-by: Marton Balint
---
libavformat/aviobuf.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 5da4dea7b6..d65c7b535d 100644
---
The vaapi can import external frame, but the planes of the external
frames should be in the same drm object. A new option "contiguous_planes"
is added to device. This flag tells device to allocate places in one
memory. When device is derived from vaapi this flag will be enabled.
A new flag
From: Bas Nieuwenhuizen
This way we can pass explicit modifiers in. Sometimes the
modifier matters for the number of memory planes that
libva accepts, in particular when dealing with
driver-compressed textures. Furthermore the driver might
not actually be able to determine the implicit modifier
When vulkan image exports to drm, the tilling need to be
VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT. Now add code to create vulkan
image using this format.
Now the following command line works:
ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128
-hwaccel_output_format \
vaapi -i
Add support to map vulkan frames to software frames when
using contiguous_planes flag.
Signed-off-by: Wenbin Chen
---
libavutil/hwcontext_vulkan.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index
Vulkan will map nv12 to R8 and GR88, so add this map to vaapi to support
vulkan frame.
Signed-off-by: Wenbin Chen
---
libavutil/hwcontext_vaapi.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index 75acc851d6..994b744e4d 100644
---
> The vaapi can import external frame, but the planes of the external
> frames should be in the same drm object. A new option "contiguous_planes"
> is added to device. This flag tells device to allocate places in one
> memory. When device is derived from vaapi this flag will be enabled.
> A new
> Quoting Wenbin Chen (2021-11-16 09:16:23)
> > From: nyanmisaka
> >
> > mfxHDLPair was added to qsv, so modify qsv->opencl map function as well.
> > Now the following commandline works:
> >
> > ffmpeg -v verbose -init_hw_device vaapi=va:/dev/dri/renderD128 \
> > -init_hw_device qsv=qs@va
59 matches
Mail list logo
