[FFmpeg-devel] [PATCH] mov demuxer: Check if a key is longer than the atom containing it

2024-04-01 Thread Eugene Zemtsov via ffmpeg-devel
From: Eugene Zemtsov Stop reading keys and return AVERROR_INVALIDDATA if key_size is larger than the amount of space left in the atom. Bug: https://crbug.com/41496983 Signed-off-by: Eugene Zemtsov --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

Re: [FFmpeg-devel] [PATCH] mov demuxer: Check if a key is longer than the atom containing it

2024-04-01 Thread Eugene Zemtsov via ffmpeg-devel
Thanks for the comments. I got rid of bytes_left_in_atom. ___ 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

Re: [FFmpeg-devel] [PATCH 3/3] avformat/mov: fix the entry count overflow check in the keys atom

2024-04-01 Thread Andreas Rheinhardt
James Almer: > Signed-off-by: James Almer > --- > libavformat/mov.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/mov.c b/libavformat/mov.c > index a935ef7326..9fca402896 100644 > --- a/libavformat/mov.c > +++ b/libavformat/mov.c > @@ -5025,7 +5025,7 @@

[FFmpeg-devel] [PATCH v11 0/6] RCWT Closed Captions demuxer (v11)

2024-04-01 Thread Marth64
Since v9: * Removes .bin extension association in demuxer and muxer * Updates examples in documentation Signed-off-by: Marth64 -- 2.34.1 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To

Re: [FFmpeg-devel] 7.0 Name

2024-04-01 Thread AV Preservation by reto.ch (lists)
Sean McGovern wrote: >Not sure if I am allowed to pick, my choice is Dijkstra. When I started programming in 1975, Edsger W. Dijkstra was one of my heroes, which is why I support your proposal, even though I am not an FFmpeg developer. Best regards, Reto

[FFmpeg-devel] [PATCH] web/download: List the expected differences for releases and git and the expected signing key

2024-04-01 Thread Michael Niedermayer
This is kept terse, as few users are expected to check that but its important that we list what the expected differences and signing key is, so any anomalies can be quickly detected. Signed-off-by: Michael Niedermayer --- src/download | 2 ++ 1 file changed, 2 insertions(+) diff --git

Re: [FFmpeg-devel] 7.0 Name

2024-04-01 Thread Sean McGovern
Hi, On Mon, Apr 1, 2024, 18:00 Lynne wrote: > Apr 1, 2024, 22:01 by mich...@niedermayer.cc: > > > Hi all > > > > I think we didnt decide on a name for 7.0 yet > > > > Previously suggested names: > > Darwin, > > De broglie, > > Dijkstra, > > Galois, > > Gauss, > > Jacobi, > > Jemison > > Johnson

[FFmpeg-devel] [PATCH 3/7] fate/wavpack: Add test for DSD

2024-04-01 Thread Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt --- Tested on aarch64, alpha, arm, mips, ppc and riscv via qemu; of course also tested on x64 and x86. tests/fate/wavpack.mak | 3 +++ tests/ref/fate/wavpack-lossless-dsd | 1 + 2 files changed, 4 insertions(+) create mode 100644

[FFmpeg-devel] [PATCH 2/7] avcodec/dsd: Use double for LUTs

2024-04-01 Thread Andreas Rheinhardt
Needed to make DSD->PCM conversion bitexact across arches. Signed-off-by: Andreas Rheinhardt --- libavcodec/dsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dsd.c b/libavcodec/dsd.c index e039302c99..ec63a706f6 100644 --- a/libavcodec/dsd.c +++

[FFmpeg-devel] [PATCH 4/7] avcodec/wavpack: Only initialize DSD data when encountering DSD

2024-04-01 Thread Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt --- libavcodec/wavpack.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 36bd4662e8..c96c8e0583 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1049,8 +1049,6 @@ static

[FFmpeg-devel] [PATCH 6/7] avcodec/dsd: Hoist branch out of loop

2024-04-01 Thread Andreas Rheinhardt
This is possible by not converting from LSBF to MSBF; instead add LSBF LUTs. This approach necessitates reversing the initial values. Signed-off-by: Andreas Rheinhardt --- libavcodec/dsd.c| 12 libavcodec/dsddec.c | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-)

[FFmpeg-devel] [PATCH 5/7] avcodec/dsddec: Fix decoding LSBF samples

2024-04-01 Thread Andreas Rheinhardt
ff_dsd2pcm_translate() works internally by converting LSBF input to MSBF upon reading; its buffer is therefore always MSBF and should therefore be initialized with MSBF silence; but this is not true since e3d8963c3cb5b8cd31460dd9b3b9dba2a2343bf5 which this patch effectively reverts.

[FFmpeg-devel] [PATCH 7/7] avcodec/wavpack: Remove always-false check

2024-04-01 Thread Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt --- libavcodec/wavpack.c | 5 - 1 file changed, 5 deletions(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index c96c8e0583..73d69d66ff 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1095,11 +1095,6 @@ static int

[FFmpeg-devel] [PATCH 3/3] avformat/mov: fix the entry count overflow check in the keys atom

2024-04-01 Thread James Almer
Signed-off-by: James Almer --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index a935ef7326..9fca402896 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5025,7 +5025,7 @@ static int mov_read_keys(MOVContext

Re: [FFmpeg-devel] [PATCH] mov demuxer: Check if a key is longer than the atom containing it

2024-04-01 Thread James Almer
On 4/1/2024 11:28 PM, Eugene Zemtsov via ffmpeg-devel wrote: From: Eugene Zemtsov Stop reading keys and return AVERROR_INVALIDDATA if key_size is larger than the amount of space left in the atom. Bug: https://crbug.com/41496983 Signed-off-by: Eugene Zemtsov --- libavformat/mov.c | 3 ++-

[FFmpeg-devel] [PATCH 2/3] avformat/mov: don't read key_size bytes twice in the keys atom

2024-04-01 Thread James Almer
We only support mdta as type, yet we were not skipping other types, but rather reading key_size worth of bytes twice per entry. Signed-off-by: James Almer --- libavformat/mov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3273e2e89b..a935ef7326

[FFmpeg-devel] [PATCH 1/3] avformat/mov: take into account the first eight bytes in the keys atom

2024-04-01 Thread James Almer
Signed-off-by: James Almer --- libavformat/mov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2b7ddc516c..3273e2e89b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5024,6 +5024,7 @@ static int mov_read_keys(MOVContext *c, AVIOContext

Re: [FFmpeg-devel] [PATCH v3 2/2] lavc/vaapi_encode_h265: Set general_*_constriaint flags with profile

2024-04-01 Thread Wang, Fei W
On Mon, 2024-04-01 at 21:02 +0100, Mark Thompson wrote: > On 20/03/2024 08:44, Wang, Fei W wrote: > > On Mon, 2024-03-18 at 21:22 +, Mark Thompson wrote: > > > On 18/03/2024 04:21, fei.w.wang-at-intel@ffmpeg.org wrote: > > > > From: Fei Wang > > > > > > > > According to Table A.2 in

[FFmpeg-devel] [PATCH] mov demuxer: Check if a key is longer than the atom containing it

2024-04-01 Thread Eugene Zemtsov via ffmpeg-devel
From: Eugene Zemtsov Stop reading keys and return AVERROR_INVALIDDATA if key_size is larger than the amount of space left in the atom. Bug: https://crbug.com/41496983 Signed-off-by: Eugene Zemtsov --- libavformat/mov.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git

Re: [FFmpeg-devel] [PATCH 1/3] avcodec/vvc/vvcdec: Do not submit frames without VVCFrameThread

2024-04-01 Thread Nuo Mi
On Tue, Apr 2, 2024 at 1:06 AM Michael Niedermayer wrote: > On Fri, Jan 26, 2024 at 10:46:49PM +0100, Michael Niedermayer wrote: > > Such frames will crash when pthread functions are called on the NULL > pointer > > > > Fixes: member access within null pointer of type 'VVCFrameThread' (aka >

Re: [FFmpeg-devel] [PATCH v10 2/5] avformat/rcwtdec: add RCWT Closed Captions demuxer

2024-04-01 Thread Marth64
Sorry for the delay, v11 coming shortly with the fix. ___ 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

Re: [FFmpeg-devel] [PATCH] mov demuxer: Check if a key is longer than the atom containing it

2024-04-01 Thread James Almer
On 4/1/2024 8:12 PM, Eugene Zemtsov via ffmpeg-devel wrote: From: Eugene Zemtsov Stop reading keys and return AVERROR_INVALIDDATA if key_size is larger than the amount of space left in the atom. Bug: https://crbug.com/41496983 Signed-off-by: Eugene Zemtsov --- libavformat/mov.c | 5 -

Re: [FFmpeg-devel] [PATCH 4/6] avformat/demux_utils: Avoid leaking the packet in ff_add_attached_pic()

2024-04-01 Thread Michael Niedermayer
On Mon, Apr 01, 2024 at 11:35:56PM +0200, Andreas Rheinhardt wrote: > Michael Niedermayer: > > Fixes: memleak > > Fixes: > > 67714/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5671570999476224 > > > > Found-by: continuous fuzzing process > >

Re: [FFmpeg-devel] [PATCH 1/6] avformat/isom: Uninit layout in ff_mp4_read_dec_config_descr()

2024-04-01 Thread James Almer
On 4/1/2024 8:40 PM, Michael Niedermayer wrote: On Mon, Apr 01, 2024 at 06:33:22PM -0300, James Almer wrote: On 4/1/2024 5:56 PM, Michael Niedermayer wrote: Fixes: memleak Fixes: 67442/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-5068813261406208 Found-by: continuous fuzzing process

[FFmpeg-devel] [PATCH 3/7] fate/wavpack: Add test for DSD

2024-04-01 Thread Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt --- Tested on aarch64, alpha, arm, mips, ppc and riscv via qemu; of course also tested on x64 and x86. tests/fate/wavpack.mak | 3 +++ tests/ref/fate/wavpack-lossless-dsd | 1 + 2 files changed, 4 insertions(+) create mode 100644

[FFmpeg-devel] [PATCH 1/7] avcodec/wavpack: Fix leak and segfault on reallocation error

2024-04-01 Thread Andreas Rheinhardt
av_realloc_f() frees the buffer it is given on allocation failure. But in this case, the buffer is an array of ownership pointers, causing leaks on error. Furthermore, the count of pointers is unchanged on error and the codec's close function uses it to free said ownership pointers, causing a NPD.

[FFmpeg-devel] [PATCH 2/7] avcodec/dsd: Use double for LUTs

2024-04-01 Thread Andreas Rheinhardt
Needed to make DSD->PCM conversion bitexact across arches. Signed-off-by: Andreas Rheinhardt --- libavcodec/dsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dsd.c b/libavcodec/dsd.c index e039302c99..ec63a706f6 100644 --- a/libavcodec/dsd.c +++

Re: [FFmpeg-devel] [PATCH] avcodec/proresdec2: Rename to proresdec

2024-04-01 Thread Andreas Rheinhardt
Andreas Rheinhardt: > Once upon a time, there used to be a LGPL and a GPL ProRes decoder > in FFmpeg; the current decoder evolved from the second of these. > But given that it is now the only ProRes decoder we have, it's file > should simply be named proresdec.c (which also brings it in line with

Re: [FFmpeg-devel] [PATCH 1/4] fate/libswscale: Disable ffmpeg-dependent tests without ffmpeg

2024-04-01 Thread Andreas Rheinhardt
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > tests/fate/libswscale.mak | 9 - > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/tests/fate/libswscale.mak b/tests/fate/libswscale.mak > index f8572f9c37..4c29220e6f 100644 > ---

[FFmpeg-devel] [PATCH v1] lavfi/dnn_backend_torch: Include mem.h

2024-04-01 Thread fei . w . wang-at-intel . com
From: Fei Wang Fix build fail since 790f793844. Signed-off-by: Fei Wang --- libavfilter/dnn/dnn_backend_torch.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/dnn/dnn_backend_torch.cpp b/libavfilter/dnn/dnn_backend_torch.cpp index fa9a2e6d99..ae55893a50 100644 ---

Re: [FFmpeg-devel] [PATCH 1/6] avformat/isom: Uninit layout in ff_mp4_read_dec_config_descr()

2024-04-01 Thread Michael Niedermayer
On Mon, Apr 01, 2024 at 06:33:22PM -0300, James Almer wrote: > On 4/1/2024 5:56 PM, Michael Niedermayer wrote: > > Fixes: memleak > > Fixes: > > 67442/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-5068813261406208 > > > > Found-by: continuous fuzzing process > >

Re: [FFmpeg-devel] [PATCH 2/6] avformat/mov: Check that tile_item_list is initialized in read_image_iovl()

2024-04-01 Thread Michael Niedermayer
On Mon, Apr 01, 2024 at 06:54:35PM -0300, James Almer wrote: > On 4/1/2024 5:56 PM, Michael Niedermayer wrote: > > Fixes: null pointer dereference > > Fixes: > > 67494/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6528714521247744 > > > > Found-by: continuous fuzzing process > >

[FFmpeg-devel] [PATCH v11 6/6] doc/indevs: update CC extraction example to use RCWT muxer

2024-04-01 Thread Marth64
Signed-off-by: Marth64 --- doc/indevs.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index d1b2bacf8b..734fc65752 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -1069,9 +1069,9 @@ ffplay -f lavfi

Re: [FFmpeg-devel] FFmpeg TC input needed

2024-04-01 Thread Gyan Doshi
Ping. As the TC rules matter has been concluded, this should go ahead. Regards, Gyan On 2024-02-17 05:15 pm, Gyan Doshi wrote: Issue: Patch: avcodec/s302m: enable non-PCM decoding URL: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20240127103854.9971-1-ffm...@gyani.pro/ The issue

[FFmpeg-devel] [PATCH v11 1/6] avformat/subtitles: extend ff_subtitles_queue_insert() to support not yet available events

2024-04-01 Thread Marth64
If ff_subtitles_queue_insert() were given a NULL buffer with 0 length, it would still attempt to grow the packet or memcpy depending on if merge option is enabled. In this commit, allow passing a NULL buffer with 0 length without attempting to do such operations. This way, if a subtitle demuxer

[FFmpeg-devel] [PATCH v11 2/6] avformat/rcwtdec: add RCWT Closed Captions demuxer

2024-04-01 Thread Marth64
RCWT (Raw Captions With Time) is a format native to ccextractor, a commonly used OSS tool for processing 608/708 Closed Captions (CC). RCWT can be used to archive the original extracted CC bitstream. The muxer was added in January 2024. In this commit, add the demuxer. One can now demux RCWT

[FFmpeg-devel] [PATCH v11 5/6] doc/muxers: refresh the RCWT muxer's doc to be consistent with the demuxer

2024-04-01 Thread Marth64
Signed-off-by: Marth64 --- doc/muxers.texi | 29 +++-- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index a10a8e216f..c960af1bdc 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -3038,19 +3038,18 @@ ogg files can

[FFmpeg-devel] [PATCH v11 4/6] avformat/rcwtenc: remove repeated documentation

2024-04-01 Thread Marth64
The high level summary of RCWT can be delegated doc/muxers, which makes it easier to maintain and more consistent with the documentation of the demuxer. Signed-off-by: Marth64 --- libavformat/rcwtenc.c | 5 - 1 file changed, 5 deletions(-) diff --git a/libavformat/rcwtenc.c

[FFmpeg-devel] [PATCH v11 3/6] avformat/rcwtenc: don't assume .bin extension

2024-04-01 Thread Marth64
Signed-off-by: Marth64 --- libavformat/rcwtenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/rcwtenc.c b/libavformat/rcwtenc.c index f2459ef1d3..ed613d45f5 100644 --- a/libavformat/rcwtenc.c +++ b/libavformat/rcwtenc.c @@ -159,7 +159,6 @@ static int

Re: [FFmpeg-devel] [PATCH 1/5] avcodec/ppc/hpeldsp_altivec: Fix left-shift of negative number

2024-04-01 Thread Andreas Rheinhardt
Andreas Rheinhardt: > It is UB and affected e.g. the vp5 and vp61 FATE tests: > https://fate.ffmpeg.org/report.cgi?time=20240327083327=ppc-linux-gcc-13.2-ubsan-altivec-qemu > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/ppc/hpeldsp_altivec.c | 4 ++-- > 1 file changed, 2

Re: [FFmpeg-devel] [PATCH] lavc/vaapi_encode_av1: Set roi_quant_range

2024-04-01 Thread Mark Thompson
On 01/04/2024 19:00, David Rosca wrote: --- libavcodec/vaapi_encode_av1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/vaapi_encode_av1.c b/libavcodec/vaapi_encode_av1.c index a46b882ab9..02a31b894d 100644 --- a/libavcodec/vaapi_encode_av1.c +++

Re: [FFmpeg-devel] [PATCH] [v4] avcodec/vaapi_encode: add customized surface alignment

2024-04-01 Thread Mark Thompson
On 27/03/2024 11:14, Araz wrote: On Fri, Mar 22, 2024 at 11:35 AM Anton Khirnov wrote: Why this unnecessary complication? Just use two ints, or two uint8_t's if you really need to save space, though that also seems unncessary as this struct is allocated rarely and usually does not live long.

Re: [FFmpeg-devel] [PATCH v3 2/2] lavc/vaapi_encode_h265: Set general_*_constriaint flags with profile

2024-04-01 Thread Mark Thompson
On 20/03/2024 08:44, Wang, Fei W wrote: On Mon, 2024-03-18 at 21:22 +, Mark Thompson wrote: On 18/03/2024 04:21, fei.w.wang-at-intel@ffmpeg.org wrote: From: Fei Wang According to Table A.2 in spec. Signed-off-by: Fei Wang --- libavcodec/vaapi_encode_h265.c | 176

Re: [FFmpeg-devel] [PATCH 1/6] avformat/isom: Uninit layout in ff_mp4_read_dec_config_descr()

2024-04-01 Thread James Almer
On 4/1/2024 5:56 PM, Michael Niedermayer wrote: Fixes: memleak Fixes: 67442/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-5068813261406208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer ---

Re: [FFmpeg-devel] [PATCH 1/6] avformat/isom: Uninit layout in ff_mp4_read_dec_config_descr()

2024-04-01 Thread James Almer
On 4/1/2024 5:56 PM, Michael Niedermayer wrote: Fixes: memleak Fixes: 67442/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-5068813261406208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer ---

Re: [FFmpeg-devel] 7.0 Name

2024-04-01 Thread Lynne
Apr 1, 2024, 22:01 by mich...@niedermayer.cc: > Hi all > > I think we didnt decide on a name for 7.0 yet > > Previously suggested names: > Darwin, > De broglie, > Dijkstra, > Galois, > Gauss, > Jacobi, > Jemison > Johnson > Leavitt > Maxwell, > Mellin, > Perelman, > Poincaré, > Ramanujan, >

Re: [FFmpeg-devel] [RFC] clarifying the TC conflict of interest rule

2024-04-01 Thread Anton Khirnov
Hi all, the vote has now ended with 23 votes cast, results are available at https://vote.ffmpeg.org/cgi-bin/civs/results.pl?id=E_a6be1eb156d0e589 The winning option is 'Anton', i.e. my proposal. Voting data as reported by CIVS is attached to this email for future reference. Cheers, -- Anton

Re: [FFmpeg-devel] [RFC] clarifying the TC conflict of interest rule

2024-04-01 Thread Gyan Doshi
On 2024-04-01 04:46 pm, Anton Khirnov wrote: Hi all, the vote has now ended with 23 votes cast, results are available at https://vote.ffmpeg.org/cgi-bin/civs/results.pl?id=E_a6be1eb156d0e589 The winning option is 'Anton', i.e. my proposal. Voting data as reported by CIVS is attached to this

Re: [FFmpeg-devel] [RFC] clarifying the TC conflict of interest rule

2024-04-01 Thread Anton Khirnov
Quoting Gyan Doshi (2024-04-01 14:20:01) > On 2024-04-01 04:46 pm, Anton Khirnov wrote: > > Hi all, > > > > the vote has now ended with 23 votes cast, results are available at > > https://vote.ffmpeg.org/cgi-bin/civs/results.pl?id=E_a6be1eb156d0e589 > > > > The winning option is 'Anton', i.e. my

Re: [FFmpeg-devel] [PATCH] avformat/movenc: Check that cts fits in 32bit

2024-04-01 Thread Michael Niedermayer
On Sun, Mar 31, 2024 at 01:30:26PM -0300, James Almer wrote: > On 3/31/2024 8:40 AM, Michael Niedermayer wrote: > > Fixes: Assertion av_rescale_rnd(start_dts, mov->movie_timescale, > > track->timescale, AV_ROUND_DOWN) <= 0 failed at libavformat/movenc.c:3694 > > Fixes: poc2 > > > > Found-by:

Re: [FFmpeg-devel] [PATCH] avcodec/mfenc: expose more properties of the media foundation encoder

2024-04-01 Thread Mark Samuelson
On Mon, Apr 1, 2024 at 10:06 AM Mark Thompson wrote: > > On 28/03/2024 12:34, Mark Samuelson wrote: > > > Thank you for the notes, here is a new patch that incorporates your > suggestions. You are right, the default value of 12 for gop_size is > suprising, I didn't know about it before now. > >

Re: [FFmpeg-devel] [PATCH 2/3] avcodec/iff: dont add into unused pointers

2024-04-01 Thread Michael Niedermayer
On Sat, Mar 16, 2024 at 10:26:35PM +0100, Michael Niedermayer wrote: > Fixes: overflowing pointers > Fixes: > 66444/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-4812862400823296 > > Found-by: continuous fuzzing process >

[FFmpeg-devel] 7.0 Name

2024-04-01 Thread Michael Niedermayer
Hi all I think we didnt decide on a name for 7.0 yet Previously suggested names: Darwin, De broglie, Dijkstra, Galois, Gauss, Jacobi, Jemison Johnson Leavitt Maxwell, Mellin, Perelman, Poincaré, Ramanujan, Sagan, Ting Viterbi, Voltaire, de Sitter, Please reply with what you prefer or add more

Re: [FFmpeg-devel] [PATCH] lavc/vaapi_hevc: Add support for Main Intra & Main 10 Intra

2024-04-01 Thread Mark Thompson
On 28/03/2024 02:07, Xiang, Haihao wrote: From: Haihao Xiang Both Main Intra and Main 10 Intra are Rext, we may use Main and Main 10 instead for decoding. This patch fixes the error below: [hevc @ 0x55a771b80a00] No support for codec hevc profile 4. [hevc @ 0x55a771b80a00] Failed setup for

Re: [FFmpeg-devel] 7.0 Name

2024-04-01 Thread Paul B Mahol
On Mon, Apr 1, 2024 at 10:01 PM Michael Niedermayer wrote: > Hi all > > I think we didnt decide on a name for 7.0 yet > > Previously suggested names: > Darwin, > De broglie, > Dijkstra, > Galois, > Gauss, > Jacobi, > Jemison > Johnson > Leavitt > Maxwell, > Mellin, > Perelman, > Poincaré, >

[FFmpeg-devel] [PATCH 2/6] avformat/mov: Check that tile_item_list is initialized in read_image_iovl()

2024-04-01 Thread Michael Niedermayer
Fixes: null pointer dereference Fixes: 67494/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6528714521247744 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 4 1 file

[FFmpeg-devel] [PATCH 3/6] tools/target_dec_fuzzer: Adjust threshold for RV30

2024-04-01 Thread Michael Niedermayer
Fixes: Timeout Fixes: 67530/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RV30_fuzzer-6635676118351872 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

[FFmpeg-devel] [PATCH 1/6] avformat/isom: Uninit layout in ff_mp4_read_dec_config_descr()

2024-04-01 Thread Michael Niedermayer
Fixes: memleak Fixes: 67442/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-5068813261406208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/isom.c | 1 + 1 file changed, 1 insertion(+)

Re: [FFmpeg-devel] [PATCH 4/6] avformat/demux_utils: Avoid leaking the packet in ff_add_attached_pic()

2024-04-01 Thread Andreas Rheinhardt
Michael Niedermayer: > Fixes: memleak > Fixes: > 67714/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5671570999476224 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- >

Re: [FFmpeg-devel] [PATCH 2/6] avformat/mov: Check that tile_item_list is initialized in read_image_iovl()

2024-04-01 Thread James Almer
On 4/1/2024 5:56 PM, Michael Niedermayer wrote: Fixes: null pointer dereference Fixes: 67494/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6528714521247744 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael

Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Reset local nb_prg on add_program() failure

2024-04-01 Thread Michael Niedermayer
On Sun, Mar 10, 2024 at 07:07:19PM +0100, Michael Niedermayer wrote: > add_program() will deallocate the whole array on failure so > we must clear nb_prgs > > Fixes: null pointer dereference > Fixes: crash-35a3b39ddcc5babeeb005b7399a3a1217c8781bc > > Found-by: Catena cyber > Signed-off-by:

[FFmpeg-devel] [RFC/PATCH] web: add a news entry for 7.0

2024-04-01 Thread Anton Khirnov
--- src/index | 27 +++ 1 file changed, 27 insertions(+) diff --git a/src/index b/src/index index 1eb5524..ba4f0e8 100644 --- a/src/index +++ b/src/index @@ -35,6 +35,33 @@ News + April xxth, 2024, FFmpeg 7.0 "XXX" + + A new major release, FFmpeg 7.0

Re: [FFmpeg-devel] [PATCH 1/3] avcodec/vvc/vvcdec: Do not submit frames without VVCFrameThread

2024-04-01 Thread Michael Niedermayer
On Fri, Jan 26, 2024 at 10:46:49PM +0100, Michael Niedermayer wrote: > Such frames will crash when pthread functions are called on the NULL pointer > > Fixes: member access within null pointer of type 'VVCFrameThread' (aka > 'struct VVCFrameThread') > Fixes: >

[FFmpeg-devel] [PATCH 3/4] avformat/mov_chan: respect channel order when parsing and creating chnl atom

2024-04-01 Thread Marton Balint
Previously we always assumed that the channels are in native order, even if they were not. The new channel layout API allows us to signal the proper channel order, so let's do so. Signed-off-by: Marton Balint --- libavformat/mov_chan.c | 145 +

[FFmpeg-devel] [PATCH 4/4] avformat/mov_chan: add support for omitted_channel bitmask in chnl atom

2024-04-01 Thread Marton Balint
Signed-off-by: Marton Balint --- libavformat/mov_chan.c | 43 ++ libavformat/mov_chan.h | 2 +- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index e3cef3f4e8..e591ff031b 100644 ---

Re: [FFmpeg-devel] [PATCH v1 1/7] lavc/vaapi_dec: Create VA parameters dynamically

2024-04-01 Thread Mark Thompson
On 28/03/2024 01:26, fei.w.wang-at-intel@ffmpeg.org wrote: From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vaapi_decode.c | 29 ++--- libavcodec/vaapi_decode.h | 7 ++- 2 files changed, 24 insertions(+), 12 deletions(-) This is because the VVC code

Re: [FFmpeg-devel] [PATCH 3/4] avformat/mov_chan: respect channel order when parsing and creating chnl atom

2024-04-01 Thread Marton Balint
On Mon, 1 Apr 2024, James Almer wrote: On 4/1/2024 3:56 PM, Marton Balint wrote: Previously we always assumed that the channels are in native order, even if they were not. The new channel layout API allows us to signal the proper channel order, so let's do so. Signed-off-by: Marton

Re: [FFmpeg-devel] [PATCH] avformat/movenc: Check that cts fits in 32bit

2024-04-01 Thread Michael Niedermayer
On Mon, Apr 01, 2024 at 12:45:36PM -0300, James Almer wrote: > On 4/1/2024 12:38 PM, Michael Niedermayer wrote: > > On Sun, Mar 31, 2024 at 01:30:26PM -0300, James Almer wrote: > > > On 3/31/2024 8:40 AM, Michael Niedermayer wrote: > > > > Fixes: Assertion av_rescale_rnd(start_dts,

Re: [FFmpeg-devel] [PATCH 01/10] avcodec/libvpxenc: Avoid unused-variable warning if VP9 enc is disabled

2024-04-01 Thread James Zern via ffmpeg-devel
On Sat, Mar 30, 2024 at 10:30 PM Andreas Rheinhardt wrote: > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/libvpxenc.c | 7 --- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c > index 635cdf7a0e..bcbdc4981e 100644 >

Re: [FFmpeg-devel] [PATCH 01/10] avcodec/libvpxenc: Avoid unused-variable warning if VP9 enc is disabled

2024-04-01 Thread Andreas Rheinhardt
James Zern via ffmpeg-devel: > On Sat, Mar 30, 2024 at 10:30 PM Andreas Rheinhardt > wrote: >> >> Signed-off-by: Andreas Rheinhardt >> --- >> libavcodec/libvpxenc.c | 7 --- >> 1 file changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c

Re: [FFmpeg-devel] [PATCH] avcodec/mfenc: expose more properties of the media foundation encoder

2024-04-01 Thread Mark Thompson
On 01/04/2024 17:25, Mark Samuelson wrote: On Mon, Apr 1, 2024 at 10:06 AM Mark Thompson wrote: On 28/03/2024 12:34, Mark Samuelson wrote: Thank you for the notes, here is a new patch that incorporates your suggestions. You are right, the default value of 12 for gop_size is suprising, I

[FFmpeg-devel] [PATCH 2/4] avformat/mov_chan: factorize some layout map search functions

2024-04-01 Thread Marton Balint
Signed-off-by: Marton Balint --- libavformat/mov_chan.c | 62 -- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 6ccc26b3f1..9ee896f229 100644 --- a/libavformat/mov_chan.c +++

[FFmpeg-devel] [PATCH 1/4] avformat/mov_chan: check channel count at compile time by using a nonconst expression

2024-04-01 Thread Marton Balint
If the channel tag does not match the number of channels, the constant expression evaluation should fail. Signed-off-by: Marton Balint --- libavformat/mov_chan.c | 48 +++--- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git

Re: [FFmpeg-devel] [PATCH 3/4] avformat/mov_chan: respect channel order when parsing and creating chnl atom

2024-04-01 Thread James Almer
On 4/1/2024 3:56 PM, Marton Balint wrote: Previously we always assumed that the channels are in native order, even if they were not. The new channel layout API allows us to signal the proper channel order, so let's do so. Signed-off-by: Marton Balint --- libavformat/mov_chan.c | 145

Re: [FFmpeg-devel] [PATCH 1/4] avformat/mov_chan: check channel count at compile time by using a nonconst expression

2024-04-01 Thread Andreas Rheinhardt
Marton Balint: > If the channel tag does not match the number of channels, the constant > expression evaluation should fail. > > Signed-off-by: Marton Balint > --- > libavformat/mov_chan.c | 48 +++--- > 1 file changed, 22 insertions(+), 26 deletions(-) > >

[FFmpeg-devel] [PATCH 5/6] avcodec/hevc_ps: --typo

2024-04-01 Thread Michael Niedermayer
Fixes: null pointer dereference Fixes: 67737/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-4858162608930816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc_ps.c | 2 +- 1

[FFmpeg-devel] [PATCH 4/6] avformat/demux_utils: Avoid leaking the packet in ff_add_attached_pic()

2024-04-01 Thread Michael Niedermayer
Fixes: memleak Fixes: 67714/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5671570999476224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/demux_utils.c | 2 +- 1 file changed, 1

[FFmpeg-devel] [PATCH 6/6] avcodec/apedec: Use NABS to avoid undefined negation

2024-04-01 Thread Michael Niedermayer
Fixes: negation of -2147483648 cannot be represented in type 'int32_t' (aka 'int'); cast to an unsigned type to negate this value to itself Fixes: 67738/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5444313212321792 Found-by: continuous fuzzing process

Re: [FFmpeg-devel] [PATCH 1/6] avformat/isom: Uninit layout in ff_mp4_read_dec_config_descr()

2024-04-01 Thread James Almer
On 4/1/2024 6:25 PM, James Almer wrote: On 4/1/2024 5:56 PM, Michael Niedermayer wrote: Fixes: memleak Fixes: 67442/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-5068813261406208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg

[FFmpeg-devel] [PATCH] web: add a news entry for 7.0

2024-04-01 Thread Anton Khirnov
--- Now mentioning that vvcdec is experimental, as suggested by Martin on IRC. --- src/index | 28 1 file changed, 28 insertions(+) diff --git a/src/index b/src/index index 1eb5524..2deb6af 100644 --- a/src/index +++ b/src/index @@ -35,6 +35,34 @@ News +

Re: [FFmpeg-devel] [PATCH 3/3] avformat/aiffdec: Check for previously set channels

2024-04-01 Thread Michael Niedermayer
On Sat, Mar 23, 2024 at 12:08:18AM +0100, Michael Niedermayer wrote: > Fixes: out of array access (av_channel_layout_copy()) > Fixes: > 67087/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-4920720268263424 > > Found-by: continuous fuzzing process >

[FFmpeg-devel] [PATCH] lavc/vaapi_encode_av1: Set roi_quant_range

2024-04-01 Thread David Rosca
--- libavcodec/vaapi_encode_av1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/vaapi_encode_av1.c b/libavcodec/vaapi_encode_av1.c index a46b882ab9..02a31b894d 100644 --- a/libavcodec/vaapi_encode_av1.c +++ b/libavcodec/vaapi_encode_av1.c @@ -155,6 +155,8 @@ static av_cold int

[FFmpeg-devel] [PATCH 1/2] avcodec/liblc3: Add encoding/decoding support of LC3 audio codec

2024-04-01 Thread Antoine Soulier via ffmpeg-devel
The LC3 audio codec is the default codec of Bluetooth LE audio. This is a wrapper over the liblc3 library (https://github.com/google/liblc3). Signed-off-by: Antoine Soulier --- Changelog | 4 + configure | 6 ++ doc/encoders.texi | 57 +++

[FFmpeg-devel] [PATCH 2/2] avformat/lc3: Add file format for LC3/LC3plus transport

2024-04-01 Thread Antoine Soulier via ffmpeg-devel
A file format is described in Bluetooth SIG LC3 and ETSI TS 103 634, for test purpose. This is the format implemented here. Signed-off-by: Antoine Soulier --- Changelog| 1 + doc/muxers.texi | 6 ++ libavformat/Makefile | 2 + libavformat/allformats.c | 2 +

Re: [FFmpeg-devel] [PATCH] avformat/mxfdec: Check that edit_unit_byte_count is not negative

2024-04-01 Thread Michael Niedermayer
On Mon, Apr 01, 2024 at 06:22:47PM +0200, Marton Balint wrote: > > > On Mon, 1 Apr 2024, Michael Niedermayer wrote: > > > Signed-off-by: Michael Niedermayer > > --- > > libavformat/mxfdec.c | 6 +- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/libavformat/mxfdec.c

Re: [FFmpeg-devel] [RFC] clarifying the TC conflict of interest rule

2024-04-01 Thread Paul B Mahol
On Mon, Apr 1, 2024 at 4:59 PM Michael Niedermayer wrote: > On Mon, Apr 01, 2024 at 01:16:48PM +0200, Anton Khirnov wrote: > > Hi all, > > > > the vote has now ended with 23 votes cast, results are available at > > https://vote.ffmpeg.org/cgi-bin/civs/results.pl?id=E_a6be1eb156d0e589 > > > > The

Re: [FFmpeg-devel] [PATCH 1/3] avcodec/jpeg2000htdec: Check magp before using it in a shift

2024-04-01 Thread Michael Niedermayer
On Sat, Mar 30, 2024 at 09:56:58AM +0100, Tomas Härdin wrote: > fre 2024-03-29 klockan 20:32 +0100 skrev Michael Niedermayer: > > Fixes: shift exponent -1 is negative > > Fixes: 65378/clusterfuzz-testcase-minimized- > > ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5457678193197056 > > > > Found-by:

Re: [FFmpeg-devel] [PATCH 1/4] avutil/pix{desc, fmt}: add new matrix coefficients from H.273 v3

2024-04-01 Thread Jan Ekström
On Fri, Mar 29, 2024 at 8:32 PM Jan Ekström wrote: > > On Fri, Mar 29, 2024 at 2:33 AM Jan Ekström wrote: > > > > * SMPTE ST 2128 IPT-C2 defines the coefficients utilized in DoVi > > Profile 5. Profile 5 can thus now be represented in VUI as > > {AVCOL_RANGE_JPEG, AVCOL_PRI_BT2020,

Re: [FFmpeg-devel] [PATCH 3/3] avcodec/hevcdec: Fix null dereference in hevc_frame_end()

2024-04-01 Thread Andreas Rheinhardt
Michael Niedermayer: > Fixes: member access within null pointer of type 'const AVFilmGrainParams' > (aka 'const struct AVFilmGrainParams') > Fixes: > 67701/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-6595117570916352 > > Found-by: continuous fuzzing process >

Re: [FFmpeg-devel] [PATCH 2/3] lavf/srtdec: Permit streaming input

2024-04-01 Thread arch1t3cht
On 30/03/2024 17:02, Andreas Rheinhardt wrote: Tomas Härdin: lör 2024-03-30 klockan 15:49 +0100 skrev Nicolas George: ASS demuxer sorts its packets because there is no guarantee the text are sorted in the file So? I'm making a normative argument. Normative about what? The ASS

Re: [FFmpeg-devel] [PATCH 2/3] lavf/srtdec: Permit streaming input

2024-04-01 Thread Tomas Härdin
lör 2024-03-30 klockan 17:02 +0100 skrev Andreas Rheinhardt: > If you force reordering on our users, then this is a breaking change Another thing that bears keeping in mind: sorting isn't consistent even across demuxers that sort. Most sort by timestamp (SUB_SORT_TS_POS), but vobsub sorts by byte

Re: [FFmpeg-devel] [RFC] clarifying the TC conflict of interest rule

2024-04-01 Thread Michael Niedermayer
On Mon, Apr 01, 2024 at 01:16:48PM +0200, Anton Khirnov wrote: > Hi all, > > the vote has now ended with 23 votes cast, results are available at > https://vote.ffmpeg.org/cgi-bin/civs/results.pl?id=E_a6be1eb156d0e589 > > The winning option is 'Anton', i.e. my proposal. Voting data as reported >

[FFmpeg-devel] [PATCH 1/2] avformat/flvenc: Implement support for multi-track video

2024-04-01 Thread Dennis Sädtler via ffmpeg-devel
Based on enhanced-rtmp v2 spec published by Veovera: https://veovera.github.io/enhanced-rtmp/docs/enhanced/enhanced-rtmp-v2 This implementation maintains some backwards compatibility by only writing the track information for track indices > 0. This means that older FFmpeg versions - and possibly

[FFmpeg-devel] [PATCH 2/2] avformat/flvdec: Add support for demuxing multi-track FLV

2024-04-01 Thread Dennis Sädtler via ffmpeg-devel
Based on enhanced-rtmp v2 spec published by Veovera: https://veovera.github.io/enhanced-rtmp/docs/enhanced/enhanced-rtmp-v2 Signed-off-by: Dennis Sädtler --- libavformat/flvdec.c | 117 +++ 1 file changed, 96 insertions(+), 21 deletions(-) diff --git

Re: [FFmpeg-devel] [PATCH 2/2] avformat/iamf_reader: Check len before summing

2024-04-01 Thread Michael Niedermayer
On Mon, Mar 25, 2024 at 04:29:08AM +0100, Michael Niedermayer wrote: > Fixes: integer overflow > Fixes: > 67275/clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-5438920751906816 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg >

Re: [FFmpeg-devel] [PATCH] avcodec/mfenc: expose more properties of the media foundation encoder

2024-04-01 Thread Mark Thompson
On 28/03/2024 12:34, Mark Samuelson wrote: Thank you for the notes, here is a new patch that incorporates your suggestions. You are right, the default value of 12 for gop_size is suprising, I didn't know about it before now. --- libavcodec/mf_utils.h | 5 + libavcodec/mfenc.c| 33

Re: [FFmpeg-devel] [RFC] clarifying the TC conflict of interest rule

2024-04-01 Thread Paul B Mahol
On Mon, Apr 1, 2024 at 1:17 PM Anton Khirnov wrote: > Hi all, > > the vote has now ended with 23 votes cast, results are available at > https://vote.ffmpeg.org/cgi-bin/civs/results.pl?id=E_a6be1eb156d0e589 > > The winning option is 'Anton', i.e. my proposal. Voting data as reported > by CIVS is

Re: [FFmpeg-devel] [PATCH 3/3] avformat/mxfdec: Check first case of offset_temp computation for overflow

2024-04-01 Thread Michael Niedermayer
On Sat, Mar 30, 2024 at 10:01:32AM +0100, Tomas Härdin wrote: > fre 2024-03-29 klockan 20:32 +0100 skrev Michael Niedermayer: > > This is kind of ugly > > Fixes: signed integer overflow: 255 * 1157565362826411919 cannot be > > represented in type 'long' > > Fixes:

Re: [FFmpeg-devel] [PATCH] avformat/mxfdec: Check that edit_unit_byte_count is not negative

2024-04-01 Thread Marton Balint
On Mon, 1 Apr 2024, Michael Niedermayer wrote: Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index e484db052ef..37446963369 100644 --- a/libavformat/mxfdec.c +++

Re: [FFmpeg-devel] Fixes #10509

2024-04-01 Thread Poorva
> > > On Sun, Mar 31, 2024 at 8:35 PM Marton Balint wrote: > > > On Fri, 29 Mar 2024, Poorva wrote: > > >> > > > > On Tue, Mar 26, 2024 at 2:36 AM Poorva <2003gaikarpoo...@gmail.com> > wrote: > >>> > >>> > >> > >> > >> Thank you for your feedback on the Git patch I submitted for review. > >> I

  1   2   >