[FFmpeg-devel] [PATCH] lavf/movenc: Fail when codec tag is invalid for format

2018-08-24 Thread John Stebbins
Fixes ticket #6897 --- libavformat/movenc.c | 20 +--- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8ad7026741..fb001f9195 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1596,23 +1596,21 @@ static

Re: [FFmpeg-devel] [PATCH] lavf/movenc: Fail when codec tag is invalid for format

2018-08-24 Thread John Stebbins
On 08/24/2018 11:15 AM, John Stebbins wrote: > Fixes ticket #6897 > --- > libavformat/movenc.c | 20 +--- > 1 file changed, 9 insertions(+), 11 deletions(-) > > diff --git a/libavformat/movenc.c b/libavformat/movenc.c > index 8ad7026741..fb001f9195 10064

[FFmpeg-devel] [PATCH] lavf/movenc: Fail when codec tag is invalid for format

2018-08-24 Thread John Stebbins
Fixes ticket #6897 --- libavformat/movenc.c | 20 +--- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8ad7026741..4507666863 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1596,23 +1596,21 @@ static

[FFmpeg-devel] [PATCH] lavf/movenc: Fail when codec tag is invalid for format

2018-08-25 Thread John Stebbins
Fixes ticket #6897 --- libavformat/movenc.c | 40 +--- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 72a6e12d52..93bb50ce86 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1589,

Re: [FFmpeg-devel] [PATCH] lavf/movenc: Fail when codec tag is invalid for format

2018-08-27 Thread John Stebbins
On 08/27/2018 10:59 AM, Michael Niedermayer wrote: > On Sat, Aug 25, 2018 at 09:04:44AM -0700, John Stebbins wrote: >> Fixes ticket #6897 >> --- >> libavformat/movenc.c | 40 +--- >> 1 file changed, 29 insertions(+), 11 deletions(-)

[FFmpeg-devel] [PATCH 2/4] lavf/movenc: Add GoPro metadata to permitted mp4 "codecs"

2018-08-27 Thread John Stebbins
--- libavformat/movenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 72a6e12d52..8a3b651514 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6778,6 +6778,7 @@ const AVCodecTag codec_mp4_tags[] = { { AV_CODEC_ID_EVRC

[FFmpeg-devel] [PATCH 1/4] lavf/mov: add AVCodecTag entry for GoPro metadata

2018-08-27 Thread John Stebbins
This allows for validation of the track type --- libavformat/isom.c | 5 + libavformat/isom.h | 1 + libavformat/mov.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/libavformat/isom.c b/libavformat/isom.c index ce66d1bcd4..ca9d22e4f7 100644 --- a/libavformat/isom.c +++ b/libavformat

[FFmpeg-devel] [PATCH 3/4] lavf/movenc: Fail when codec tag is invalid for format

2018-08-27 Thread John Stebbins
Fixes ticket #6897 --- libavformat/movenc.c | 40 +--- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8a3b651514..dd6281d210 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1589,

[FFmpeg-devel] [PATCH] lavf/mov: Fix PCM audio w/ bit depth > 16

2018-08-27 Thread John Stebbins
This type of audio is defined by the QT spec, but can be found in non-QT branded files in the wild. Fixes ticket #7376 --- libavformat/mov.c | 14 ++ 1 file changed, 14 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8915e3b9e0..3d4f6bcb21 100644 --- a/libavfor

Re: [FFmpeg-devel] [PATCH 3/4] lavf/movenc: Fail when codec tag is invalid for format

2018-08-27 Thread John Stebbins
On 08/27/2018 01:29 PM, James Almer wrote: > On 8/27/2018 4:57 PM, John Stebbins wrote: >> Fixes ticket #6897 >> --- >> libavformat/movenc.c | 40 +--- >> 1 file changed, 29 insertions(+), 11 deletions(-) >> >> diff --g

[FFmpeg-devel] [PATCH 3/3] lavf/movenc: Fail when codec tag is invalid for format

2018-08-27 Thread John Stebbins
Fixes ticket #6897 --- libavformat/movenc.c | 46 +--- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8a3b651514..bce7ad0939 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1

Re: [FFmpeg-devel] [PATCH 3/4] lavf/movenc: Fail when codec tag is invalid for format

2018-08-27 Thread John Stebbins
On 08/27/2018 02:03 PM, James Almer wrote: > On 8/27/2018 5:48 PM, John Stebbins wrote: >> On 08/27/2018 01:29 PM, James Almer wrote: >>> On 8/27/2018 4:57 PM, John Stebbins wrote: >>>> Fixes ticket #6897 >>>> --- >>>> libavformat/movenc.c

[FFmpeg-devel] [PATCH 3/3] lavf/movenc: Fail when codec tag is invalid for format

2018-08-27 Thread John Stebbins
Fixes ticket #6897 --- libavformat/movenc.c | 46 +--- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8a3b651514..3ebc7abd8b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1

Re: [FFmpeg-devel] [PATCH 1/4] lavf/mov: add AVCodecTag entry for GoPro metadata

2018-08-31 Thread John Stebbins
On 08/30/2018 03:59 PM, Michael Niedermayer wrote: > On Mon, Aug 27, 2018 at 12:57:07PM -0700, John Stebbins wrote: >> This allows for validation of the track type >> --- >> libavformat/isom.c | 5 + >> libavformat/isom.h | 1 + >> libavformat/mov.c | 3 +++

Re: [FFmpeg-devel] [PATCH] lavf/mov: Fix PCM audio w/ bit depth > 16

2018-08-31 Thread John Stebbins
On 08/30/2018 04:43 PM, Michael Niedermayer wrote: > On Mon, Aug 27, 2018 at 12:59:28PM -0700, John Stebbins wrote: >> This type of audio is defined by the QT spec, but can be found in >> non-QT branded files in the wild. >> >> Fixes ticket #7376 >&g

[FFmpeg-devel] [PATCH] lavf/mov: factor out setting codec_id

2018-08-31 Thread John Stebbins
Since it is performed in all cases now. --- libavformat/mov.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3d4f6bcb21..4ee67cf500 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2508,22 +2508,19 @@ int ff_mov_read_st

Re: [FFmpeg-devel] [PATCH 1/2] Use QT format for audio sample descriptors depending on stsd version.

2018-09-06 Thread John Stebbins
On 09/06/2018 09:18 AM, Derek Buitenhuis wrote: > On 06/09/2018 17:13, Carl Eugen Hoyos wrote: >> Please mention ticket #7376 (and the Handbrake issue) in the commit >> message. > Wasn't aware there were tickets already, woops. > > Added locally. > > Looks like this also supersedes my earlier patc

Re: [FFmpeg-devel] [PATCH 3/4] lavf/movenc: Fail when codec tag is invalid for format

2018-09-07 Thread John Stebbins
On 09/06/2018 03:40 PM, James Almer wrote: > On 8/27/2018 6:07 PM, John Stebbins wrote: >> On 08/27/2018 02:03 PM, James Almer wrote: >>> On 8/27/2018 5:48 PM, John Stebbins wrote: >>>> On 08/27/2018 01:29 PM, James Almer wrote: >>>>> On 8/27/2018 4:57

Re: [FFmpeg-devel] [PATCH 3/4] lavf/movenc: Fail when codec tag is invalid for format

2018-09-07 Thread John Stebbins
On 09/07/2018 08:16 AM, James Almer wrote: > On 9/7/2018 12:09 PM, John Stebbins wrote: >> On 09/06/2018 03:40 PM, James Almer wrote: >>> On 8/27/2018 6:07 PM, John Stebbins wrote: >>>> On 08/27/2018 02:03 PM, James Almer wrote: >>>>> On 8/27/2018 5:48

[FFmpeg-devel] [PATCH] mov: fix seek to next root atom in fragmented mp4

2020-03-29 Thread John Stebbins
If some but not all moof's are referenced in an sidx, whole fragments were being skipped. Fixes tickets 7377, 7389, and 8502 May also fix 8070 but the sample links expired, so I can't test. --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov

Re: [FFmpeg-devel] [PATCH] mov: fix seek to next root atom in fragmented mp4

2020-03-29 Thread John Stebbins
On Sun, 2020-03-29 at 22:38 +0200, Andreas Rheinhardt wrote: > John Stebbins: > > If some but not all moof's are referenced in an sidx, whole > > fragments > > were being skipped. > > > > Fixes tickets 7377, 7389, and 8502 > > May also fix 8070 b

[FFmpeg-devel] [PATCH] libavformat/mov: fix multiple trun per traf

2020-03-29 Thread John Stebbins
dts would start over at the beginning of each trun when they should be computed contiguously for each trun in a traf Fixes ticket 8070 --- libavformat/isom.h | 1 + libavformat/mov.c | 12 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libavformat/isom.h b/libavform

[FFmpeg-devel] [PATCH] libavformat/mov: restore use of mfra time as dts

2020-04-06 Thread John Stebbins
This was inadvertantly removed in 4a9d32baca --- libavformat/mov.c | 5 + 1 file changed, 5 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 16a40debc7..eee98fb69c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4813,6 +4813,11 @@ static int mov_read_trun(MOVC

[FFmpeg-devel] [PATCH 01/23] lavc/movtextdec: fix ass header colors

2020-04-06 Thread John Stebbins
A conversion from rgb to bgr is necessary --- libavcodec/movtextdec.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index c38c5edce6..05becaf64d 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@

[FFmpeg-devel] movtext decode/encode improvements

2020-04-06 Thread John Stebbins
Patch series adds more complete decoding and encoding of color, alpha, font size, font name, and style tags for movtext. It also fixes a number of bugs. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-dev

[FFmpeg-devel] [PATCH 03/23] lavc/movtextdec: fix bold, italic, underline flags

2020-04-06 Thread John Stebbins
They should be 0 or 1 so that 0 or -1 is written to the ass header --- libavcodec/movtextdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 47a8401119..d6896562c2 100644 --- a/libavcodec/movtextdec.c +++ b/libavco

[FFmpeg-devel] [PATCH 02/23] lavc/movtextdec: simplify style record walk

2020-04-06 Thread John Stebbins
It's not necessary to walk the style record list twice per subtitle character. style records are in order and do not overlap. --- libavcodec/movtextdec.c | 38 -- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcod

[FFmpeg-devel] [PATCH 04/23] lavc/movtextdec: handle changes to default style flags

2020-04-06 Thread John Stebbins
Style flags were only being turned on. If the default was on and style record turned off, style flag remained on. --- libavcodec/movtextdec.c | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index d6896

[FFmpeg-devel] [PATCH 07/23] lavc/movtextdec: add alpha default to ass header colors

2020-04-06 Thread John Stebbins
--- libavcodec/movtextdec.c| 14 ++ tests/ref/fate/sub-movtext | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 2481c71af6..eb9c7f5755 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c

[FFmpeg-devel] [PATCH 06/23] lavc/movtextdec: make sure default font name is set

2020-04-06 Thread John Stebbins
--- libavcodec/movtextdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 6c7d93702e..2481c71af6 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -52,7 +52,7 @@ typedef struct { uint16_t f

[FFmpeg-devel] [PATCH 05/23] lavc/movtextdec: only write fontsize, fontID tags if not default

2020-04-06 Thread John Stebbins
--- libavcodec/movtextdec.c | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index a3e37d013d..6c7d93702e 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -51,8 +51,9 @@ #define RGB_TO_

[FFmpeg-devel] [PATCH 08/23] lavc/movtextdec: add color and alpha style tags

2020-04-06 Thread John Stebbins
--- libavcodec/movtextdec.c | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index eb9c7f5755..4d5dcdf5e7 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -76,6 +76,8 @@ typedef struct {

[FFmpeg-devel] [PATCH 09/23] lavc/movtextdec: restore active style color after hilite

2020-04-06 Thread John Stebbins
--- libavcodec/movtextdec.c | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 4d5dcdf5e7..f3a504b47b 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -376,6 +376,7 @@ static int text_to_as

[FFmpeg-devel] [PATCH 10/23] lavc/movtextdec: allow setting subtitle frame dimensions

2020-04-06 Thread John Stebbins
Font sizes are relative to the subtitle frame dimensions. If the expected frame dimensions are not known, the font sizes will most likely be incorrect. --- libavcodec/ass.c| 30 +++--- libavcodec/ass.h| 28 libavcodec/movtextdec.

[FFmpeg-devel] [PATCH 11/23] lavc/ass_split: fix parsing utf8 scripts

2020-04-06 Thread John Stebbins
The [Script Info] section was skipped if starts with UTF8 BOM --- libavcodec/ass_split.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 67da7c6d84..94c32667af 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -354,6 +3

[FFmpeg-devel] [PATCH 13/23] lavc/movtextenc: keep values in native byte order till written

2020-04-06 Thread John Stebbins
--- libavcodec/movtextenc.c | 38 ++ 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 8638e303fe..5e5b786f44 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -68,7 +68,6

[FFmpeg-devel] [PATCH 12/23] lavc/movtextenc: use correct color component order

2020-04-06 Thread John Stebbins
--- libavcodec/movtextenc.c | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index c19ef384bc..8638e303fe 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -39,6 +39,7 @@ #define HLIT_BOX (1<<1)

[FFmpeg-devel] [PATCH 14/23] lavc/movtextenc: simplify style record updates

2020-04-06 Thread John Stebbins
Makes style update code easier to extend for style types not yet handled --- libavcodec/movtextenc.c | 131 +++- 1 file changed, 62 insertions(+), 69 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 5e5b786f44..05532cd544 100644

[FFmpeg-devel] [PATCH 15/23] lavc/movtextenc: fix unclosed style records

2020-04-06 Thread John Stebbins
The last record at the end of each dialog was never closed --- libavcodec/movtextenc.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 05532cd544..d389111419 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -30

[FFmpeg-devel] [PATCH 16/23] lavc/movtextenc: init style record from ASS dialog style

2020-04-06 Thread John Stebbins
--- libavcodec/movtextenc.c | 60 ++--- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index d389111419..4e7d55efcb 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -39,6 +39

[FFmpeg-devel] [PATCH 17/23] lavc/movtextenc: add color tag handling

2020-04-06 Thread John Stebbins
--- libavcodec/movtextenc.c | 28 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 4e7d55efcb..090536b887 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -121,7 +121,7 @@ static

[FFmpeg-devel] [PATCH 18/23] lavc/movtextenc: add alpha tag handling

2020-04-06 Thread John Stebbins
--- libavcodec/movtextenc.c | 25 - 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 090536b887..e82393dde7 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -351,6 +351,26 @@ static vo

[FFmpeg-devel] [PATCH 19/23] lavc/movtextenc: add font size tag handling

2020-04-06 Thread John Stebbins
--- libavcodec/movtextenc.c | 39 ++- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index e82393dde7..9e657c9635 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -128,7 +128,

[FFmpeg-devel] [PATCH 21/23] lavc/movtextenc: simplify initialization of new style record

2020-04-06 Thread John Stebbins
--- libavcodec/movtextenc.c | 13 - 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 2e65489c4d..167dffee6a 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -96,8 +96,7 @@ static void mov_text_cle

[FFmpeg-devel] [PATCH 20/23] lavc/movtextenc: handle cancel overrides callback

2020-04-06 Thread John Stebbins
--- libavcodec/movtextenc.c | 36 +++- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 9e657c9635..2e65489c4d 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -396,9 +396,8 @

[FFmpeg-devel] [PATCH 22/23] lavc/movtextenc: add font name handling

2020-04-06 Thread John Stebbins
Initializes the mov text sample description from the ASS header and creates an mov font table from the fonts available in the ASS Styles. --- libavcodec/ass_split.c | 5 + libavcodec/ass_split.h | 8 ++ libavcodec/movtextenc.c | 253 3 files changed,

[FFmpeg-devel] [PATCH 23/23] lavc/movtextenc: add option to scale fontsize with height

2020-04-06 Thread John Stebbins
If the video dimensions are different than the ASS play_res then the font sizes need to be adjusted to get the same apparent render size. --- libavcodec/movtextenc.c | 30 +- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/libavcodec/movtextenc.c b/libavco

Re: [FFmpeg-devel] [PATCH 11/23] lavc/ass_split: fix parsing utf8 scripts

2020-04-06 Thread John Stebbins
On Mon, 2020-04-06 at 20:08 +0200, Nicolas George wrote: > John Stebbins (12020-04-06): > > The [Script Info] section was skipped if starts with UTF8 BOM > > --- > > libavcodec/ass_split.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --gi

[FFmpeg-devel] [PATCH 11/23] lavc/ass_split: fix parsing utf8 scripts

2020-04-06 Thread John Stebbins
The [Script Info] section was skipped if starts with UTF8 BOM --- libavcodec/ass_split.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 67da7c6d84..c2c388d9f0 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -376,6 +37

Re: [FFmpeg-devel] movtext decode/encode improvements

2020-04-06 Thread John Stebbins
On Mon, 2020-04-06 at 13:16 -0700, Philip Langdale wrote: > On Mon, 6 Apr 2020 11:51:55 -0600 > John Stebbins wrote: > > > Patch series adds more complete decoding and encoding of color, > > alpha, > > font size, font name, and style tags for movtext. It also

Re: [FFmpeg-devel] [PATCH 02/23] lavc/movtextdec: simplify style record walk

2020-04-06 Thread John Stebbins
On Mon, 2020-04-06 at 14:46 -0700, Philip Langdale wrote: > On Mon, 6 Apr 2020 11:51:57 -0600 > John Stebbins wrote: > > > It's not necessary to walk the style record list twice per subtitle > > character. style records are in order and do not overlap. > > --- &

Re: [FFmpeg-devel] movtext decode/encode improvements

2020-04-07 Thread John Stebbins
On Mon, 2020-04-06 at 15:03 -0700, John Stebbins wrote: > On Mon, 2020-04-06 at 13:16 -0700, Philip Langdale wrote: > > On Mon, 6 Apr 2020 11:51:55 -0600 > > John Stebbins wrote: > > > > > Patch series adds more complete decoding and encoding of color, > >

[FFmpeg-devel] [PATCH 20/23] lavc/movtextenc: handle cancel overrides callback

2020-04-07 Thread John Stebbins
--- libavcodec/movtextenc.c | 43 - 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 9e657c9635..2d3c416407 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -69,6 +69,

Re: [FFmpeg-devel] [PATCH 10/23] lavc/movtextdec: allow setting subtitle frame dimensions

2020-04-08 Thread John Stebbins
On Wed, 2020-04-08 at 10:31 -0700, Philip Langdale wrote: > On Mon, 6 Apr 2020 11:52:05 -0600 > John Stebbins wrote: > > > Font sizes are relative to the subtitle frame dimensions. If the > > expected frame dimensions are not known, the font sizes will most &g

Re: [FFmpeg-devel] [PATCH 01/23] lavc/movtextdec: fix ass header colors

2020-04-09 Thread John Stebbins
On Mon, 2020-04-06 at 20:03 +0200, Nicolas George wrote: > John Stebbins (12020-04-06): > > A conversion from rgb to bgr is necessary > > --- > > libavcodec/movtextdec.c | 11 +++ > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > >

Re: [FFmpeg-devel] [PATCH 22/23] lavc/movtextenc: add font name handling

2020-04-09 Thread John Stebbins
On Wed, 2020-04-08 at 12:23 -0700, Philip Langdale wrote: > On Mon, 6 Apr 2020 11:52:17 -0600 > John Stebbins wrote: > > > Initializes the mov text sample description from the ASS header and > > creates an mov font table from the fonts available in the ASS > > Styl

Re: [FFmpeg-devel] [PATCH 18/23] lavc/movtextenc: add alpha tag handling

2020-04-09 Thread John Stebbins
On Wed, 2020-04-08 at 11:37 -0700, Philip Langdale wrote: > On Mon, 6 Apr 2020 11:52:13 -0600 > John Stebbins wrote: > > > --- > > libavcodec/movtextenc.c | 25 - > > 1 file changed, 24 insertions(+), 1 deletion(-) > > > >

Re: [FFmpeg-devel] movtext decode/encode improvements

2020-04-09 Thread John Stebbins
On Wed, 2020-04-08 at 12:24 -0700, Philip Langdale wrote: > On Tue, 7 Apr 2020 14:38:52 + > John Stebbins wrote: > > > After checking carefully, patches 10 and 23 are as I want them. > > Sizes > > are relative to 288 when using override APIs, but are relative to &

Re: [FFmpeg-devel] [PATCH 18/23] lavc/movtextenc: add alpha tag handling

2020-04-09 Thread John Stebbins
On Thu, 2020-04-09 at 08:23 -0700, John Stebbins wrote: > On Wed, 2020-04-08 at 11:37 -0700, Philip Langdale wrote: > > On Mon, 6 Apr 2020 11:52:13 -0600 > > John Stebbins wrote: > > > > > --- > > > libavcodec/movtextenc.c | 25 +++

Re: [FFmpeg-devel] [PATCH 01/23] lavc/movtextdec: fix ass header colors

2020-04-09 Thread John Stebbins
On Thu, 2020-04-09 at 09:43 -0700, Philip Langdale wrote: > On Thu, 9 Apr 2020 15:09:45 + > John Stebbins wrote: > > > > > > > > I missed this review earlier. What about the indentation is > > off? Do > > you mean the indent of the functi

Re: [FFmpeg-devel] movtext decode/encode improvements

2020-04-09 Thread John Stebbins
On Thu, 2020-04-09 at 11:17 -0700, Philip Langdale wrote: > On Thu, 9 Apr 2020 15:51:23 + > John Stebbins wrote: > > > On Wed, 2020-04-08 at 12:24 -0700, Philip Langdale wrote: > > > On Tue, 7 Apr 2020 14:38:52 + > > > John Stebbins wrote: > >

Re: [FFmpeg-devel] movtext decode/encode improvements

2020-04-09 Thread John Stebbins
On Thu, 2020-04-09 at 14:00 -0700, Philip Langdale wrote: > On Thu, 9 Apr 2020 19:30:53 + > John Stebbins wrote: > > Pushed to https://github.com/jstebbins/FFmpeg/commits/movtext > > > > There's one additional patch on the top implementing what we > >

Re: [FFmpeg-devel] [PATCH] libavformat/mov: restore use of mfra time as dts

2020-04-10 Thread John Stebbins
On Thu, 2020-04-09 at 10:56 +0530, Gyan Doshi wrote: > > On 06-04-2020 11:12 pm, John Stebbins wrote: > > This was inadvertantly removed in 4a9d32baca > > --- > > libavformat/mov.c | 5 + > > 1 file changed, 5 insertions(+) > > > > diff --g

[FFmpeg-devel] Subtitle encoder return codes

2020-04-10 Thread John Stebbins
Patch set makes return codes from subtitle encoders more meaningful and consistent. Also fixes output buffer size checking where needed. After this, a user of a subtitle encoder can attempt to encode again with a larger buffer if the encoder returns AVERROR_BUFFER_TOO_SMALL __

[FFmpeg-devel] [PATCH 1/7] lavc/dvbsub: fix potential encode buffer overflow

2020-04-10 Thread John Stebbins
encode buffer size was ignored --- libavcodec/dvbsub.c | 97 +++-- 1 file changed, 75 insertions(+), 22 deletions(-) diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c index a8d43d81d6..a0be0b1056 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub

[FFmpeg-devel] [PATCH 3/7] lavc/assenc: return more meaningful error code

2020-04-10 Thread John Stebbins
When the buffer is too small, return AVERROR_BUFFER_TOO_SMALL --- libavcodec/assenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index e54c1d8ec3..a6e1d5d8b9 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -93,7 +93,7

[FFmpeg-devel] [PATCH 2/7] lavc/dvbsub: return meaningful error codes

2020-04-10 Thread John Stebbins
--- libavcodec/dvbsub.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c index a0be0b1056..5c081f2b71 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -282,7 +282,7 @@ static int encode_dvb_subtitles(AVCodecContext *

[FFmpeg-devel] [PATCH 5/7] lavc/srtenc: return more meaninful error codes

2020-04-10 Thread John Stebbins
--- libavcodec/srtenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index 34f0f0d5e6..655b65679e 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -241,7 +241,7 @@ static int encode_frame(AVCodecContext *avctx,

[FFmpeg-devel] [PATCH 4/7] lavc/movtextenc: return more meaningful error codes

2020-04-10 Thread John Stebbins
--- libavcodec/movtextenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index d8dbc546aa..b2368b641b 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -693,7 +693,7 @@ static int mov_text_encode_frame

[FFmpeg-devel] [PATCH 6/7] lavc/webvttenc: return more meaningful error codes

2020-04-10 Thread John Stebbins
--- libavcodec/webvttenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index c84bbf4b4e..febf6ee370 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -168,7 +168,7 @@ static int webvtt_encode_frame(AVCode

[FFmpeg-devel] [PATCH 7/7] lavc/xsubenc: return meaningfull error codes

2020-04-10 Thread John Stebbins
--- libavcodec/xsubenc.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/xsubenc.c b/libavcodec/xsubenc.c index b3da909679..4d58e0f3b5 100644 --- a/libavcodec/xsubenc.c +++ b/libavcodec/xsubenc.c @@ -63,7 +63,7 @@ static int xsub_encode_rle(PutBitContext

Re: [FFmpeg-devel] movtext decode/encode improvements

2020-04-10 Thread John Stebbins
On Fri, 2020-04-10 at 09:50 -0700, Philip Langdale wrote: > On Thu, 9 Apr 2020 23:28:49 + > John Stebbins wrote: > > > > Essentially yes. We've had our own mov text encoder and decoder in > > HandBrake for years. I added support for using ffmpeg for decodin

Re: [FFmpeg-devel] Subtitle encoder return codes

2020-04-10 Thread John Stebbins
On Fri, 2020-04-10 at 14:12 -0700, Philip Langdale wrote: > On Fri, 10 Apr 2020 13:02:16 -0600 > John Stebbins wrote: > > > Patch set makes return codes from subtitle encoders more meaningful > > and consistent. Also fixes output buffer size checking where > > needed.

Re: [FFmpeg-devel] [FFmpeg-devel, v2] dvbsub.c, change segment order to be in line with spec

2020-04-14 Thread John Stebbins
On Tue, 2020-04-14 at 10:29 +0200, Paul B Mahol wrote: > On 4/14/20, Alen Vrečko wrote: > > Hello, everyone. > > > > Looks like this patch got forgotten. I'd very much like to see it > > applied. > > > > In our testing. This patch doesn't break any existing players. But > > it does > > allow for

Re: [FFmpeg-devel] [PATCH 4/4] avformat/mpegtsenc: use the correct stream_types and write HDMV descriptors for m2ts

2020-04-15 Thread John Stebbins
On Fri, 2020-04-10 at 21:44 +0200, Marton Balint wrote: > Fixes ticket #2622. > > Signed-off-by: Marton Balint > --- > libavformat/mpegtsenc.c | 58 > - > 1 file changed, 57 insertions(+), 1 deletion(-) > > diff --git a/libavformat/mpegtsenc.c b/l

Re: [FFmpeg-devel] [PATCH 4/4] avformat/mpegtsenc: use the correct stream_types and write HDMV descriptors for m2ts

2020-04-15 Thread John Stebbins
On Wed, 2020-04-15 at 23:44 +0200, Andreas Rheinhardt wrote: > John Stebbins: > > On Fri, 2020-04-10 at 21:44 +0200, Marton Balint wrote: > > > Fixes ticket #2622. > > > > > > Signed-off-by: Marton Balint > >

[FFmpeg-devel] [PATCH 3/3] lavc/pgs_frame_split_bsf: add bsf to split PGS segments

2020-04-16 Thread John Stebbins
ode 100644 index 00..c983f6acf5 --- /dev/null +++ b/libavcodec/pgs_frame_split_bsf.c @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2020 John Stebbins + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Less

[FFmpeg-devel] [PATCH 1/3] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments

2020-04-16 Thread John Stebbins
0644 index 00..4b8061d4e1 --- /dev/null +++ b/libavcodec/pgs_frame_merge_bsf.c @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2020 John Stebbins + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser Gene

[FFmpeg-devel] [PATCH 2/3] lavf/matroskaenc: add PGS merge to auto bsf list

2020-04-16 Thread John Stebbins
PGS segments must be merged to one packet for muxing to mkv --- libavformat/matroskaenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 060e8b7816..6d88fcd784 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c

Re: [FFmpeg-devel] [PATCH 1/3] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments

2020-04-16 Thread John Stebbins
On Thu, 2020-04-16 at 22:39 +0200, Andreas Rheinhardt wrote: > John Stebbins: > > Required to remux m2ts to mkv > > --- > > libavcodec/Makefile | 1 + > > libavcodec/bitstream_filters.c | 1 + > > libav

[FFmpeg-devel] [PATCH 1/3] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments

2020-04-16 Thread John Stebbins
@@ +/* + * Copyright (c) 2020 John Stebbins + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the

Re: [FFmpeg-devel] [PATCH 1/3] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments

2020-04-16 Thread John Stebbins
On Thu, 2020-04-16 at 16:57 -0600, John Stebbins wrote: > Required to remux m2ts to mkv > --- > libavcodec/Makefile | 1 + > libavcodec/bitstream_filters.c | 1 + > libavcodec/pgs_frame_merge_bsf.c | 164 > +++ > 3 files ch

Re: [FFmpeg-devel] [PATCH 1/3] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments

2020-04-16 Thread John Stebbins
On Thu, 2020-04-16 at 15:59 -0700, John Stebbins wrote: > On Thu, 2020-04-16 at 16:57 -0600, John Stebbins wrote: > > Required to remux m2ts to mkv > > --- > > libavcodec/Makefile | 1 + > > libavcodec/bitstream_filters.c | 1 + > > libav

Re: [FFmpeg-devel] [PATCH 1/3] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments

2020-04-17 Thread John Stebbins
On Fri, 2020-04-17 at 13:21 +0300, Petri Hintukainen wrote: > to, 2020-04-16 kello 16:57 -0600, John Stebbins kirjoitti: > > Required to remux m2ts to mkv > > --- > > libavcodec/Makefile | 1 + > > libavcodec/bitstream_filters.c | 1 + > > libav

Re: [FFmpeg-devel] [PATCH 1/3] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments

2020-04-17 Thread John Stebbins
On Fri, 2020-04-17 at 08:52 -0700, John Stebbins wrote: > On Fri, 2020-04-17 at 13:21 +0300, Petri Hintukainen wrote: > > to, 2020-04-16 kello 16:57 -0600, John Stebbins kirjoitti: > > > Required to remux m2ts to mkv > > > --- > > > libavcodec/Makefile

[FFmpeg-devel] [PATCH 2/4] lavf/matroskaenc: add PGS merge to auto bsf list

2020-04-18 Thread John Stebbins
PGS segments must be merged to one packet for muxing to mkv --- libavformat/matroskaenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index d3256d8f5d..bccf8b11d2 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c

[FFmpeg-devel] PGS subtitle bitstream filters

2020-04-18 Thread John Stebbins
Added Changelog entries Added doc/bitstream_filters.texi entries Added minor version bump patch Changed how keyframe detection works in merge ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsu

[FFmpeg-devel] [PATCH 3/4] lavc/pgs_frame_split_bsf: add bsf to split PGS segments

2020-04-18 Thread John Stebbins
/pgs_frame_split_bsf.c b/libavcodec/pgs_frame_split_bsf.c new file mode 100644 index 00..c983f6acf5 --- /dev/null +++ b/libavcodec/pgs_frame_split_bsf.c @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2020 John Stebbins + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and

[FFmpeg-devel] [PATCH 1/4] lavc/pgs_frame_merge_bsf: add bsf to merge PGS segments

2020-04-18 Thread John Stebbins
_bsf.c new file mode 100644 index 00..cae5c75655 --- /dev/null +++ b/libavcodec/pgs_frame_merge_bsf.c @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2020 John Stebbins + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms

[FFmpeg-devel] [PATCH 4/4] avcodec/version: Bump minor-version for new PGS bsfs

2020-04-18 Thread John Stebbins
--- libavcodec/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/version.h b/libavcodec/version.h index 8cff2e855b..ad85fb15e5 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC

Re: [FFmpeg-devel] [PATCH v2 4/6] avformat/mux: add proper support for full N:M bitstream filtering

2020-04-18 Thread John Stebbins
On Sat, 2020-04-18 at 21:18 +0200, Marton Balint wrote: > Previously only 1:1 bitstream filters were supported, the end of the > stream was > not signalled to the bitstream filters and time base changes were > ignored. > > Signed-off-by: Marton Balint > --- > libavformat/mux.c | 91 +

Re: [FFmpeg-devel] PGS subtitle bitstream filters

2020-04-30 Thread John Stebbins
On Sat, 2020-04-18 at 08:25 -0600, John Stebbins wrote: > Added Changelog entries > Added doc/bitstream_filters.texi entries > Added minor version bump patch > Changed how keyframe detection works in merge > > > Ping. Of the 4 patches, only the first has received c

[FFmpeg-devel] [PATCH] avformat/matroskaenc: always reserve max aac private data

2020-05-01 Thread John Stebbins
When extra data is updated using AV_PKT_DATA_NEW_EXTRADATA, the data is written plus extra space is reserved for the max possible size extradata. But when extradata is written during mkv_write_header, no extra space is reserved. So the side data update overwrites whatever follows the extradata in t

Re: [FFmpeg-devel] [PATCH] avformat/matroskaenc: always reserve max aac private data

2020-05-01 Thread John Stebbins
On Fri, 2020-05-01 at 19:22 +0200, Andreas Rheinhardt wrote: > John Stebbins: > > When extra data is updated using AV_PKT_DATA_NEW_EXTRADATA, the > > data is > > written plus extra space is reserved for the max possible size > > extradata. > > But when extradata i

Re: [FFmpeg-devel] [PATCH] avformat/matroskaenc: always reserve max aac private data

2020-05-01 Thread John Stebbins
On Fri, 2020-05-01 at 14:27 -0300, James Almer wrote: > On 5/1/2020 2:09 PM, John Stebbins wrote: > > When extra data is updated using AV_PKT_DATA_NEW_EXTRADATA, the > > data is > > written plus extra space is reserved for the max possible size > > extradata. > &

Re: [FFmpeg-devel] [PATCH] avformat/matroskaenc: always reserve max aac private data

2020-05-01 Thread John Stebbins
On Fri, 2020-05-01 at 19:53 +0200, Nicolas George wrote: > John Stebbins (12020-05-01): > > The test case is a TS file with aac audio. It TS files, it is > > certainly possible for stream parameters to change on the fly. But, > > if > > the extradata changes, there'

Re: [FFmpeg-devel] [PATCH] avformat/matroskaenc: always reserve max aac private data

2020-05-01 Thread John Stebbins
On Fri, 2020-05-01 at 19:55 +0200, Andreas Rheinhardt wrote: > John Stebbins: > > On Fri, 2020-05-01 at 19:22 +0200, Andreas Rheinhardt wrote: > > > John Stebbins: > > > > When extra data is updated using AV_PKT_DATA_NEW_EXTRADATA, the > > > > data is &g

Re: [FFmpeg-devel] [PATCH] avformat/matroskaenc: always reserve max aac private data

2020-05-01 Thread John Stebbins
On Fri, 2020-05-01 at 20:03 +0200, Andreas Rheinhardt wrote: > John Stebbins: > > On Fri, 2020-05-01 at 14:27 -0300, James Almer wrote: > > > On 5/1/2020 2:09 PM, John Stebbins wrote: > > > > When extra data is updated using AV_PKT_DATA_NEW_EXTRADATA, the > > &g

Re: [FFmpeg-devel] [PATCH] avformat/matroskaenc: always reserve max aac private data

2020-05-01 Thread John Stebbins
On Fri, 2020-05-01 at 20:10 +0200, Nicolas George wrote: > John Stebbins (12020-05-01): > > If the parameters change on the fly, some part of the audio stream > > is > > going to be unplayable. Either the part after the change will be > > unplayable if you ignore extra

Re: [FFmpeg-devel] [PATCH] avformat/matroskaenc: always reserve max aac private data

2020-05-01 Thread John Stebbins
On Fri, 2020-05-01 at 20:28 +0200, Nicolas George wrote: > John Stebbins (12020-05-01): > > Well, current code in aac_adtstoasc silently ignores any > > changes. It > > only generates extradata from the initial packet. It's not checked > > in > > subsequen

  1   2   >