Re: [FFmpeg-devel] IMF demuxer ping

2021-12-05 Thread Lynne
5 Dec 2021, 02:33 by p...@sandflow.com: > Hi all, > > Quick ping re: libavformat/imf demuxer patch set. > > All outstanding feedback (thanks!) has been addressed as far as I know. > > What are the next steps? > > It would be good to make progress while it is fresh in peoples' minds. > > Latest pa

Re: [FFmpeg-devel] [PATCH 4/6] ffmpeg: deprecate passing numbers to -vsync

2021-12-05 Thread Paul B Mahol
LGTM ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH v2] fftools/cmdutils: Avoid crash when opts is empty

2021-12-05 Thread Andreas Rheinhardt
Yu Yang: > Opts is assigned by setup_find_stream_info_opts(). Could not get opts when > nb_streams == 0. > It should not return NULL but print AV_LOG_ERROR. when no alloc memory for > stream options, > it also need return an error to avoid crash when free. In total, > setup_find_stream_info_opts

Re: [FFmpeg-devel] [PATCH 3/3] lavf/sdp: add more thorough error handling

2021-12-05 Thread lance . lmwang
On Sat, Dec 04, 2021 at 06:33:00PM +0100, Anton Khirnov wrote: > Return error codes when constructing a stream config fails, rather than > just disregarding the failure and continuing. > Propagate the error codes from av_sdp_create(). > --- > libavformat/internal.h | 7 +- > libavformat/sdp.c

Re: [FFmpeg-devel] [PATCH] libavcodec/hevc_mp4toannexb_bsf: update the extradata in codec par if change detected

2021-12-05 Thread Andreas Rheinhardt
Linjie Fu: > From: Linjie Fu > > Container may support multiple sample descriptions in a single > bitstream, like multiple stsd in mov, which introduces different > sequence header(e.g.profile/bit_depth) in the middle of the bitstream. > > Update the extradata field in context parameter once pac

Re: [FFmpeg-devel] [PATCH 1/4] fftools/cmdutils: Atomically add elements to list of pointers, fix crash

2021-12-05 Thread Andreas Rheinhardt
Andreas Rheinhardt: > Currently, adding a (separately allocated) element to a list of pointers > works by first reallocating the array of pointers and (on success) > incrementing its size and only then allocating the new element. > If the latter allocation fails, the size is inconsistent, i.e. > ar

Re: [FFmpeg-devel] [PATCH] avformat/smoothstreamingenc: Move buffers to the end of structs

2021-12-05 Thread Andreas Rheinhardt
Andreas Rheinhardt: > This reduces codesize because the offsets of commonly used elements > are now smaller and thus need less bytes to encode in ptr+offset > addressing modes (with GCC 11.2 on x64: 0x1b8b -> 0x1a7b). > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/smoothstreamingenc.c

Re: [FFmpeg-devel] [PATCH] avformat/takdec: Simplify data->hex conversion

2021-12-05 Thread Andreas Rheinhardt
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > libavformat/takdec.c | 9 - > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/libavformat/takdec.c b/libavformat/takdec.c > index 839e3cc781..6bb26683b4 100644 > --- a/libavformat/takdec.c > +++ b/libavforma

Re: [FFmpeg-devel] [PATCH v2] fftools/cmdutils: Avoid crash when opts is empty

2021-12-05 Thread Yy
> 2021年12月5日 下午6:56,Andreas Rheinhardt 写道: > > Yu Yang: >> Opts is assigned by setup_find_stream_info_opts(). Could not get opts when >> nb_streams == 0. >> It should not return NULL but print AV_LOG_ERROR. when no alloc memory for >> stream options, >> it also need return an error to avoid c

[FFmpeg-devel] [PATCH 1/6] avformat/rtsp: remove redundant assignment

2021-12-05 Thread lance . lmwang
From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index deaed34..47120fd 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1178,8 +1178,8 @@ int ff_rtsp_rea

[FFmpeg-devel] [PATCH 2/6] avformat/rtsp: free the alloc memory if failed

2021-12-05 Thread lance . lmwang
From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 47120fd..5cffe0b 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1245,8 +1245,10 @@ start:

[FFmpeg-devel] [PATCH 3/6] avformat/rtsp: prefer to return EOF for incomplete read

2021-12-05 Thread lance . lmwang
From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 5cffe0b..2ee2463 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1247,7 +1247,7 @@ start:

[FFmpeg-devel] [PATCH 4/6] avformat/rtsp: check content_ptr before memory allocate

2021-12-05 Thread lance . lmwang
From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 2ee2463..233ed16 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1240,7 +1240,7 @@ start:

[FFmpeg-devel] [PATCH 5/6] avformat/rtsp: use MAX_URL_SIZE for one line parse

2021-12-05 Thread lance . lmwang
From: Limin Wang The buf is used for one line of sdp parsing, so it's ok to use MAX_URL_SIZE Signed-off-by: Limin Wang --- libavformat/rtsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 233ed16..a8d079e 100644 --- a/libavfor

[FFmpeg-devel] [PATCH 6/6] avformat/rtsp: add error code handling for ff_rtsp_skip_packet()

2021-12-05 Thread lance . lmwang
From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c| 15 ++- libavformat/rtsp.h| 4 +++- libavformat/rtspenc.c | 7 +-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index a8d079e..6442e5b 100644 -

Re: [FFmpeg-devel] [PATCH v8 4/5] avformat/movenc: Refactor mov_write_dvcc_dvvc_tag to use ff_isom_put_dvcc_dvvc

2021-12-05 Thread Andreas Rheinhardt
quietvoid: > On Fri, Dec 3, 2021 at 8:40 PM wrote: > >> On Fri, Dec 03, 2021 at 08:27:06PM -0500, quietvoid wrote: >>> On Fri, Dec 3, 2021 at 8:19 PM wrote: >>> On Sat, Dec 04, 2021 at 02:09:04AM +0100, quietvoid wrote: > From: quietvoid > > Improves code legibility by not usin

Re: [FFmpeg-devel] [PATCH v19 01/20] avcodec, avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values

2021-12-05 Thread Michael Niedermayer
On Fri, Dec 03, 2021 at 07:31:06PM +, Soft Works wrote: > Signed-off-by: softworkz > --- > doc/APIchanges | 6 > libavcodec/avcodec.h | 19 + > libavutil/Makefile | 1 + > libavutil/subfmt.h | 66 > libavutil/version.h

[FFmpeg-devel] [PATCH 1/2] fftools/ffmpeg_opt: Improve checks for truncation/alloc error

2021-12-05 Thread Andreas Rheinhardt
Do this by switching from the dynamic buffer API to the AVBPrint API; the former has no defined way to check for errors. This also avoids allocating an AVIOContext. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 22 ++ 1 file changed, 10 insertions(+), 12 deleti

[FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg_opt: Improve alloc/truncation checks when reading lines

2021-12-05 Thread Andreas Rheinhardt
Do this by switching from the dynamic buffer API to the AVBPrint API; the former has no defined way to check for errors. This also avoids allocating an AVIOContext. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 28 1 file changed, 12 insertions(+), 16

[FFmpeg-devel] [PATCH v20 00/20] Subtitle Filtering

2021-12-05 Thread Soft Works
New in V20 - Rebased. V19 didn't apply cleanly anymore New in V19 - Document API changes in all relevant commits - Move enum AVSubtitleType: Improved commit message - Put deprecated enum values under removal guards - Document AV_SUBTITLE_FMT_NB - Fixed all trailing whitespace - splitcc: Add scat

[FFmpeg-devel] [PATCH v20 01/20] avcodec, avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values

2021-12-05 Thread Soft Works
Signed-off-by: softworkz --- doc/APIchanges | 6 libavcodec/avcodec.h | 19 + libavutil/Makefile | 1 + libavutil/subfmt.h | 66 libavutil/version.h | 1 + 5 files changed, 75 insertions(+), 18 deletions(-) create mode 1

[FFmpeg-devel] [PATCH v20 03/20] avcodec/subtitles: Introduce new frame-based subtitle decoding API

2021-12-05 Thread Soft Works
- 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 --- doc/APIchanges | 7 ++ libavcodec/avcodec.h| 8 +- libavcodec/code

[FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Soft Works
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 AVSubt

[FFmpeg-devel] [PATCH v20 04/20] avfilter/subtitles: Update vf_subtitles to use new decoding api

2021-12-05 Thread Soft Works
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 +++ b/l

[FFmpeg-devel] [PATCH v20 05/20] avcodec, avutil: Move ass helper functions to avutil as avpriv_ and extend ass dialog parsing

2021-12-05 Thread Soft Works
Signed-off-by: softworkz --- libavcodec/Makefile | 56 +++ libavcodec/ass.h | 147 ++ libavcodec/assdec.c | 2 +- libavcodec/assenc.c | 2 +- libavcodec/ccaption_dec

[FFmpeg-devel] [PATCH v20 06/20] avcodec/subtitles: Migrate subtitle encoders to frame-based API and provide a compatibility shim for the legacy api

2021-12-05 Thread Soft Works
Signed-off-by: softworkz --- doc/APIchanges | 3 + libavcodec/assenc.c| 90 + libavcodec/avcodec.h | 5 +- libavcodec/dvbsubenc.c | 96 +-- libavcodec/dvdsubenc.c | 100 +++-

[FFmpeg-devel] [PATCH v20 07/20] avcodec/subtitles: Replace deprecated enum values

2021-12-05 Thread Soft Works
Signed-off-by: softworkz --- libavcodec/ass.h | 2 +- libavcodec/assdec.c| 2 +- libavcodec/dvbsubdec.c | 2 +- libavcodec/dvdsubdec.c | 2 +- libavcodec/dvdsubenc.c | 2 +- libavcodec/pgssubdec.c | 2 +- libavcodec/xsubdec.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) d

[FFmpeg-devel] [PATCH v20 08/20] fftools/play, probe: Adjust for subtitle changes

2021-12-05 Thread Soft Works
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 --- a/fftoo

[FFmpeg-devel] [PATCH v20 09/20] avfilter/subtitles: Add subtitles.c for subtitle frame allocation

2021-12-05 Thread Soft Works
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

[FFmpeg-devel] [PATCH v20 10/20] avfilter/avfilter: Handle subtitle frames

2021-12-05 Thread Soft Works
Signed-off-by: softworkz --- doc/APIchanges | 3 +++ libavfilter/avfilter.c | 8 +--- libavfilter/avfilter.h | 11 +++ libavfilter/avfiltergraph.c | 5 + libavfilter/formats.c | 22 ++ libavfilter/formats.h | 3 +++ libavf

[FFmpeg-devel] [PATCH v20 11/20] avfilter/sbuffer: Add sbuffersrc and sbuffersink filters

2021-12-05 Thread Soft Works
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

[FFmpeg-devel] [PATCH v20 12/20] avfilter/overlaygraphicsubs: Add overlaygraphicsubs and graphicsub2video filters

2021-12-05 Thread Soft Works
- 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

[FFmpeg-devel] [PATCH v20 13/20] fftools/ffmpeg: Replace sub2video with subtitle frame filtering and use new frame-based subtitle encoding API

2021-12-05 Thread Soft Works
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 funct

[FFmpeg-devel] [PATCH v20 14/20] avfilter/avfilter: Fix hardcoded input index

2021-12-05 Thread Soft Works
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 chan

[FFmpeg-devel] [PATCH v20 15/20] avfilter/overlaytextsubs: Add overlaytextsubs and textsubs2video filters

2021-12-05 Thread Soft Works
- 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 |

[FFmpeg-devel] [PATCH v20 16/20] avfilter/textmod: Add textmod, censor and show_speaker filters

2021-12-05 Thread Soft Works
- 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 libavfilte

[FFmpeg-devel] [PATCH v20 17/20] avfilter/stripstyles: Add stripstyles filter

2021-12-05 Thread Soft Works
- 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 fi

[FFmpeg-devel] [PATCH v20 18/20] avfilter/splitcc: Add splitcc filter for closed caption handling

2021-12-05 Thread Soft Works
- 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" outpu

[FFmpeg-devel] [PATCH v20 19/20] avfilter/graphicsub2text: Add new graphicsub2text filter (OCR)

2021-12-05 Thread Soft Works
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 ins

[FFmpeg-devel] [PATCH v20 20/20] avfilter/subscale: Add filter for scaling and/or re-arranging graphical subtitles

2021-12-05 Thread Soft Works
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 1

Re: [FFmpeg-devel] [PATCH v19 01/20] avcodec, avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values

2021-12-05 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of Michael > Niedermayer > Sent: Sunday, December 5, 2021 4:53 PM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH v19 01/20] avcodec, avutil: Move enum > AVSubtitleType to avutil, add new and depr

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Lynne
5 Dec 2021, 17:23 by softwo...@hotmail.com: > @@ -491,6 +499,39 @@ typedef struct AVFrame { > */ > uint64_t channel_layout; > > +/** > + * Display start time, relative to packet pts, in ms. > + */ > +uint32_t subtitle_start_time; > + > +/** > + * Display end time, rela

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Hendrik Leppkes
On Sun, Dec 5, 2021 at 5:40 PM Lynne wrote: > > +/** > > + * Usually the same as packet pts, in AV_TIME_BASE. > > + * > > + * @deprecated This is kept for compatibility reasons and corresponds > > to > > + * AVSubtitle->pts. Might be removed in the future. > > + */ > > +

[FFmpeg-devel] [PATCH v9 0/5] Add support for Matroska BlockAdditionMapping elements

2021-12-05 Thread quietvoid
This patch set adds support for reading/writing the Matroska BlockAdditionMapping elements, as well as for reading/writing dvcC/dvvC blocks in Matroska. Created utility functions to read/write Dolby Vision boxes for ISOM. This was done to avoid duplicating the code, as the Matroska blocks and MOV

[FFmpeg-devel] [PATCH v9 1/5] avformat/dovi_isom: Implement Dolby Vision configuration parsing/writing

2021-12-05 Thread quietvoid
Both parse/write implementations are based on mov/movenc. This only adds support for the "Dolby Vision configuration box". Other configuration boxes, such as "Dolby Vision enhancement layer configuration box" are not supported. The new functions will be used to implement parsing/writing the DOVI

[FFmpeg-devel] [PATCH v9 2/5] avformat/matroska{dec, enc}: Parse BlockAdditionMapping elements

2021-12-05 Thread quietvoid
Adds handling of dvcC/dvvC block addition mappings. The parsing creates AVDOVIDecoderConfigurationRecord side data. The configuration block is written when muxing into Matroska, if DOVI side data is present for the track. Most of the Matroska element parsing is based on Plex's FFmpeg source code.

[FFmpeg-devel] [PATCH v9 3/5] avformat/mov: Refactor mov_read_dvcc_dvvc to use ff_isom_parse_dvcc_dvvc

2021-12-05 Thread quietvoid
To avoid duplicating code. The implementation in dovi_isom is identical. Signed-off-by: quietvoid --- libavformat/mov.c | 50 +-- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 5c74d099da..b5f

[FFmpeg-devel] [PATCH v9 4/5] avformat/movenc: Refactor mov_write_dvcc_dvvc_tag to use ff_isom_put_dvcc_dvvc

2021-12-05 Thread quietvoid
Improves code legibility by not using bit shifts. Also avoids duplicating the dvcC/dvvC ISOM box writing code. Signed-off-by: quietvoid --- libavformat/movenc.c | 24 +++- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc

[FFmpeg-devel] [PATCH v9 5/5] fate/matroska: Add tests for reading/writing BlockAdditionMapping elements

2021-12-05 Thread quietvoid
Tests the parsing and writing of AVDOVIDecoderConfigurationRecord, when it is present as a Dolby Vision configuration block addition mapping. Signed-off-by: quietvoid --- The required regression test file is available here: https://0x0.st/-hWK.mkv Should be moved to fate-suite/mkv/dovi-p5.mkv It

Re: [FFmpeg-devel] [PATCH v20 10/20] avfilter/avfilter: Handle subtitle frames

2021-12-05 Thread Andreas Rheinhardt
Soft Works: > Signed-off-by: softworkz > --- > doc/APIchanges | 3 +++ > libavfilter/avfilter.c | 8 +--- > libavfilter/avfilter.h | 11 +++ > libavfilter/avfiltergraph.c | 5 + > libavfilter/formats.c | 22 ++ > libavfilter/form

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of Lynne > Sent: Sunday, December 5, 2021 5:40 PM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame > for subtitle handling > > 5 Dec 2021, 17:23 by softwo.

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of Hendrik > Leppkes > Sent: Sunday, December 5, 2021 5:45 PM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame > for subtitle handling > > On Sun, Dec 5, 2

Re: [FFmpeg-devel] [PATCH 3/6] avformat/rtsp: prefer to return EOF for incomplete read

2021-12-05 Thread Marton Balint
On Sun, 5 Dec 2021, lance.lmw...@gmail.com wrote: From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 5cffe0b..2ee2463 100644 --- a/libavformat/rtsp.c +++ b/libavf

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of Lynne > Sent: Sunday, December 5, 2021 5:40 PM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame > for subtitle handling > > 5 Dec 2021, 17:23 by softwo.

[FFmpeg-devel] [PATCH v21 00/20] Subtitle Filtering

2021-12-05 Thread Soft Works
New in V21 - Rebased. Patchset was broken again. - Don't declare AVFrame.subtitle_pts as deprecated and clarify doc text - Remove AVFilter.subs_list and AVFilter.sub_fmt from APIchanges - Change include in formats.c New in V20 - Rebased. V19 didn't apply cleanly anymore New in V19 - Document A

[FFmpeg-devel] [PATCH v21 01/20] avcodec, avutil: Move enum AVSubtitleType to avutil, add new and deprecate old values

2021-12-05 Thread Soft Works
Signed-off-by: softworkz --- doc/APIchanges | 6 libavcodec/avcodec.h | 19 + libavutil/Makefile | 1 + libavutil/subfmt.h | 66 libavutil/version.h | 1 + 5 files changed, 75 insertions(+), 18 deletions(-) create mode 1

[FFmpeg-devel] [PATCH v21 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Soft Works
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 AVSubt

[FFmpeg-devel] [PATCH v21 05/20] avcodec, avutil: Move ass helper functions to avutil as avpriv_ and extend ass dialog parsing

2021-12-05 Thread Soft Works
Signed-off-by: softworkz --- libavcodec/Makefile | 56 +++ libavcodec/ass.h | 147 ++ libavcodec/assdec.c | 2 +- libavcodec/assenc.c | 2 +- libavcodec/ccaption_dec

[FFmpeg-devel] [PATCH v21 06/20] avcodec/subtitles: Migrate subtitle encoders to frame-based API and provide a compatibility shim for the legacy api

2021-12-05 Thread Soft Works
Signed-off-by: softworkz --- doc/APIchanges | 3 + libavcodec/assenc.c| 90 + libavcodec/avcodec.h | 5 +- libavcodec/dvbsubenc.c | 96 +-- libavcodec/dvdsubenc.c | 100 +++-

[FFmpeg-devel] [PATCH v21 07/20] avcodec/subtitles: Replace deprecated enum values

2021-12-05 Thread Soft Works
Signed-off-by: softworkz --- libavcodec/ass.h | 2 +- libavcodec/assdec.c| 2 +- libavcodec/dvbsubdec.c | 2 +- libavcodec/dvdsubdec.c | 2 +- libavcodec/dvdsubenc.c | 2 +- libavcodec/pgssubdec.c | 2 +- libavcodec/xsubdec.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) d

[FFmpeg-devel] [PATCH v21 08/20] fftools/play, probe: Adjust for subtitle changes

2021-12-05 Thread Soft Works
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 --- a/fftoo

[FFmpeg-devel] [PATCH v21 03/20] avcodec/subtitles: Introduce new frame-based subtitle decoding API

2021-12-05 Thread Soft Works
- 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 --- doc/APIchanges | 7 ++ libavcodec/avcodec.h| 8 +- libavcodec/code

[FFmpeg-devel] [PATCH v21 09/20] avfilter/subtitles: Add subtitles.c for subtitle frame allocation

2021-12-05 Thread Soft Works
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

[FFmpeg-devel] [PATCH v21 10/20] avfilter/avfilter: Handle subtitle frames

2021-12-05 Thread Soft Works
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 +++

[FFmpeg-devel] [PATCH v21 04/20] avfilter/subtitles: Update vf_subtitles to use new decoding api

2021-12-05 Thread Soft Works
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 +++ b/l

[FFmpeg-devel] [PATCH v21 11/20] avfilter/sbuffer: Add sbuffersrc and sbuffersink filters

2021-12-05 Thread Soft Works
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

[FFmpeg-devel] [PATCH v21 12/20] avfilter/overlaygraphicsubs: Add overlaygraphicsubs and graphicsub2video filters

2021-12-05 Thread Soft Works
- 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

[FFmpeg-devel] [PATCH v21 13/20] fftools/ffmpeg: Replace sub2video with subtitle frame filtering and use new frame-based subtitle encoding API

2021-12-05 Thread Soft Works
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 funct

[FFmpeg-devel] [PATCH v21 14/20] avfilter/avfilter: Fix hardcoded input index

2021-12-05 Thread Soft Works
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 chan

[FFmpeg-devel] [PATCH v21 15/20] avfilter/overlaytextsubs: Add overlaytextsubs and textsubs2video filters

2021-12-05 Thread Soft Works
- 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 |

[FFmpeg-devel] [PATCH v21 16/20] avfilter/textmod: Add textmod, censor and show_speaker filters

2021-12-05 Thread Soft Works
- 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 libavfilte

[FFmpeg-devel] [PATCH v21 17/20] avfilter/stripstyles: Add stripstyles filter

2021-12-05 Thread Soft Works
- 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 fi

[FFmpeg-devel] [PATCH v21 18/20] avfilter/splitcc: Add splitcc filter for closed caption handling

2021-12-05 Thread Soft Works
- 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" outpu

[FFmpeg-devel] [PATCH v21 19/20] avfilter/graphicsub2text: Add new graphicsub2text filter (OCR)

2021-12-05 Thread Soft Works
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 ins

[FFmpeg-devel] [PATCH v21 20/20] avfilter/subscale: Add filter for scaling and/or re-arranging graphical subtitles

2021-12-05 Thread Soft Works
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 1

[FFmpeg-devel] [PATCH 1/7] avformat/vivo: Do not use the general expression evaluator for parsing a floating point value

2021-12-05 Thread Michael Niedermayer
Fixes: Timeout Fixes: 41564/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVO_fuzzer-6309014024093696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/vivo.c | 7 --- 1 file changed, 4 insert

[FFmpeg-devel] [PATCH 4/7] avformat/4xm: Consider max_streams on reallocating tracks array

2021-12-05 Thread Michael Niedermayer
Fixes: OOM Fixes: 41595/clusterfuzz-testcase-minimized-ffmpeg_dem_FOURXM_fuzzer-6355979363549184 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/4xm.c | 3 ++- 1 file changed, 2 insertions(+)

[FFmpeg-devel] [PATCH 5/7] avformat/mxfdec: Check for duplicate mxf_read_index_entry_array()

2021-12-05 Thread Michael Niedermayer
Fixes: memleak Fixes: 41596/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-6439060204290048 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 3 +++ 1 file changed, 3 insertion

[FFmpeg-devel] [PATCH 3/7] tools/target_dem_fuzzer: Force interrupt for HLS

2021-12-05 Thread Michael Niedermayer
Fixes: Timeout Fixes: 41580/clusterfuzz-testcase-minimized-ffmpeg_dem_HLS_fuzzer-5059099224571904 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dem_fuzzer.c | 4 1 file changed, 4 ins

[FFmpeg-devel] [PATCH 2/7] tools/target_dem_fuzzer: Test interrupt callback

2021-12-05 Thread Michael Niedermayer
Signed-off-by: Michael Niedermayer --- tools/target_dem_fuzzer.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/tools/target_dem_fuzzer.c b/tools/target_dem_fuzzer.c index 3c03c8d17c0..6ee793a28ba 100644 --- a/tools/target_dem_fuzzer.c +++ b/tools/target_dem_fuzzer.c @@ -34,6 +34

[FFmpeg-devel] [PATCH 6/7] tools/target_dec_fuzzer: adjust threshold for gem

2021-12-05 Thread Michael Niedermayer
Fixes: Timeout Fixes: 42035/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GEM_fuzzer-5033604191748096 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed,

[FFmpeg-devel] [PATCH 7/7] avcodec/gemdec: Move all support checks before before image allocation

2021-12-05 Thread Michael Niedermayer
Signed-off-by: Michael Niedermayer --- libavcodec/gemdec.c | 32 +--- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/libavcodec/gemdec.c b/libavcodec/gemdec.c index eee21a50d4b..fd14b22390c 100644 --- a/libavcodec/gemdec.c +++ b/libavcodec/gemdec.c @@

Re: [FFmpeg-devel] [PATCH v21 16/20] avfilter/textmod: Add textmod, censor and show_speaker filters

2021-12-05 Thread Michael Niedermayer
On Sun, Dec 05, 2021 at 07:41:56PM +, Soft Works wrote: > - 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

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Lynne
5 Dec 2021, 20:21 by softwo...@hotmail.com: > > >> -Original Message- >> From: ffmpeg-devel On Behalf Of Lynne >> Sent: Sunday, December 5, 2021 5:40 PM >> To: FFmpeg development discussions and patches >> Subject: Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame >> for

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Hendrik Leppkes
On Sun, Dec 5, 2021 at 6:58 PM Soft Works wrote: > > > > > -Original Message- > > From: ffmpeg-devel On Behalf Of Lynne > > Sent: Sunday, December 5, 2021 5:40 PM > > To: FFmpeg development discussions and patches > > Subject: Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AV

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Hendrik Leppkes
On Sun, Dec 5, 2021 at 11:38 PM Hendrik Leppkes wrote: > > On Sun, Dec 5, 2021 at 6:58 PM Soft Works wrote: > > > > > > > > > -Original Message- > > > From: ffmpeg-devel On Behalf Of Lynne > > > Sent: Sunday, December 5, 2021 5:40 PM > > > To: FFmpeg development discussions and patches

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of Soft Works > Sent: Sunday, December 5, 2021 6:58 PM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame > for subtitle handling > > > > > -Original Me

[FFmpeg-devel] [PATCH v6 1/2] avformat/imf: Demuxer

2021-12-05 Thread pal
From: Pierre-Anthony Lemieux Signed-off-by: Pierre-Anthony Lemieux --- Notes: The IMF demuxer accepts as input an IMF CPL. The assets referenced by the CPL can be contained in multiple deliveries, each defined by an ASSETMAP file: ffmpeg -assetmaps ,,... -i If -asset

[FFmpeg-devel] [PATCH v6 2/2] avformat/imf: Tests

2021-12-05 Thread pal
From: Pierre-Anthony Lemieux Signed-off-by: Pierre-Anthony Lemieux --- Notes: Tests for the IMF demuxer. libavformat/Makefile| 1 + libavformat/tests/imf.c | 508 2 files changed, 509 insertions(+) create mode 100644 libavformat/tests/imf.c

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Hendrik Leppkes
On Mon, Dec 6, 2021 at 12:23 AM Soft Works wrote: > > It can only work like that. > You literally designed subtitle filtering. You defined how it works. All your explanations come down to some fancy form of "because I made it required". All I'm hearing is that some internal mechanisms in avfilte

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of Hendrik > Leppkes > Sent: Monday, December 6, 2021 12:37 AM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame > for subtitle handling > > On Mon, Dec 6,

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of Hendrik > Leppkes > Sent: Monday, December 6, 2021 12:37 AM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame > for subtitle handling > > On Mon, Dec 6,

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Hendrik Leppkes
On Mon, Dec 6, 2021 at 1:24 AM Soft Works wrote: > > > > > -Original Message- > > From: ffmpeg-devel On Behalf Of Hendrik > > Leppkes > > Sent: Monday, December 6, 2021 12:37 AM > > To: FFmpeg development discussions and patches > > Subject: Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/fr

Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame for subtitle handling

2021-12-05 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of Hendrik > Leppkes > Sent: Monday, December 6, 2021 1:37 AM > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH v20 02/20] avutil/frame: Prepare AVFrame > for subtitle handling > > On Mon, Dec 6, 2

[FFmpeg-devel] [PATCH 01/10] avformat/utils: Make ff_data_to_hex() zero-terminate the string

2021-12-05 Thread Andreas Rheinhardt
Most callers want it that way anyway. Signed-off-by: Andreas Rheinhardt --- libavformat/hls.c | 2 -- libavformat/hlsenc.c| 1 - libavformat/httpauth.c | 5 - libavformat/internal.h | 11 +++ libavformat/movenc.c| 1 - libavformat/omadec.c| 1 - libavformat/r

[FFmpeg-devel] [PATCH 02/10] avformat/aadec: Don't use the same loop counter in inner and outer loop

2021-12-05 Thread Andreas Rheinhardt
Due to this bush.aa (from the FATE suite) exported garbage metadata with key "_040930". Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 72f4b6f7cc..a3a7664469 100644

[FFmpeg-devel] [PATCH 03/10] avformat/aadec: Avoid copying data around

2021-12-05 Thread Andreas Rheinhardt
Up until now, the packets have been read in blocks of at most eight bytes at a time; these blocks have then been decrypted and then copied into a buffer on the stack (that was double the size needed...). From there they have been copied to a packet. This commit changes this: The data is read in on

[FFmpeg-devel] [PATCH 04/10] avformat/aadec: Don't unnecessarily reinitialize AVTEA context

2021-12-05 Thread Andreas Rheinhardt
We use ECB, not CBC mode here, so one does not need to reinitialize the context; for the same reason, one can also just let av_tea_crypt() loop over the blocks, avoiding a loop here. Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 15 --- 1 file changed, 4 insertions(+),

[FFmpeg-devel] [PATCH 05/10] avformat/aadec: Simplify deriving file key

2021-12-05 Thread Andreas Rheinhardt
Don't use different src and dst in av_tea_crypt(); use in-place modifications instead. Also let av_tea_crypt() encrypt all three blocks in one call. Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 22 +++--- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git

[FFmpeg-devel] [PATCH 06/10] avformat/aadec: Simplify data->hex conversion

2021-12-05 Thread Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 5f49a543e4..840a9968c6 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -83,6 +83,7 @@ static in

  1   2   >