[FFmpeg-devel] [PATCH 1/2] avutil/common: Add FF_PTR_ADD()

2021-03-15 Thread Michael Niedermayer
Suggested-by: Andreas Rheinhardt Signed-off-by: Michael Niedermayer --- libavutil/common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/common.h b/libavutil/common.h index aee353d399..c2d47a45b4 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -108,6 +108,8 @@ #defi

[FFmpeg-devel] [PATCH 2/2] avfilter/vf_scale: Fix adding 0 to NULL (which is UB) in scale_slice()

2021-03-15 Thread Michael Niedermayer
Found-by: Jeremy Leconte Signed-off-by: Michael Niedermayer --- libavfilter/vf_scale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 58eee96744..5ad9334d02 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_sca

[FFmpeg-devel] [PATCH 1/2] avformat/libsrt: fix setsockopt() typo

2021-03-15 Thread Zhao Zhili
--- libavformat/libsrt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 233e9096fa..ac865c5658 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -334,7 +334,7 @@ static int libsrt_set_options_pre(URLContext *h, in

[FFmpeg-devel] [PATCH 2/2] avformat/libsrt: fix help message

2021-03-15 Thread Zhao Zhili
SRTO_TLPKTDROP works for receiver and sender both. --- libavformat/libsrt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index ac865c5658..c1e96f700e 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -122,7 +122,7 @@

Re: [FFmpeg-devel] [PATCH 1/2] avformat/mxfdec: Don't use wrong type of pointer

2021-03-15 Thread Tomas Härdin
fre 2021-03-12 klockan 14:07 +0100 skrev Andreas Rheinhardt: > @@ -2922,20 +2929,19 @@ static int mxf_read_local_tags(MXFContext *mxf, > KLVPacket *klv, MXFMetadataReadF > } > } > } > -if (ctx_size && tag == 0x3C0A) { > -avio_read(pb, ctx-

Re: [FFmpeg-devel] [PATCH] avformat/aviobuf: don't reduce short seek threshold

2021-03-15 Thread Martin Storsjö
On Sat, 13 Mar 2021, Andriy Gelman wrote: From: Andriy Gelman Commit 8c8e5d5286bf598a89ef9993a2cf6ea409d03a32 added a way to reduce seek time by waiting for the windowed tcp packets instead of creating a new socket connection. It implemented this by overwriting s->short_seek_threshold in the a

[FFmpeg-devel] [PATCH] Fix wrong time_base bug

2021-03-15 Thread Donough Liu
Set time_base to inv of frame rate is only valid when input video have fixed frame rate. Signed-off-by: Donough Liu --- doc/examples/transcoding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/transcoding.c b/doc/examples/transcoding.c index 5aff08c135..49ae32

[FFmpeg-devel] [PATCH] doc/encoders: remove text about single bit-depth libx264 support

2021-03-15 Thread Tobias Rapp
In the meanwhile libx264 allows to be configured for including both 8/10 bit support within a single library. The new libx264 interface was enabled in 2f96190732d15510ba29471fa45d66841c0c3df1. Signed-off-by: Tobias Rapp --- doc/encoders.texi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(

Re: [FFmpeg-devel] [PATCH 1/2] avformat/mxfdec: Don't use wrong type of pointer

2021-03-15 Thread Andreas Rheinhardt
Tomas Härdin: > fre 2021-03-12 klockan 14:07 +0100 skrev Andreas Rheinhardt: >> @@ -2922,20 +2929,19 @@ static int mxf_read_local_tags(MXFContext *mxf, >> KLVPacket *klv, MXFMetadataReadF >> } >> } >> } >> -if (ctx_size && tag == 0x3C0A) { >> -

Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg: use the correct size value for wrapped_avframe packets

2021-03-15 Thread James Almer
On 3/15/2021 12:53 AM, Andreas Rheinhardt wrote: James Almer: pkt->size on packets wrapping an AVFrame signaled by the wrapped_avframe codec_id are set to the size of the AVFrame structure and not the actual raw data contained in it. ffmpeg.c was using those values to print bogus stats about the

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Andreas Rheinhardt
Florian Nouwt: > This video format is mainly used in older Nintendo DS games in a .vx > container. It is the predecessor of the Mobiclip format. > > Signed-off-by: Florian Nouwt > --- > Changelog |1 + > configure |1 + > doc/general_contents.texi |2

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Florian Nouwt
I have uploaded an example video here: https://mega.nz/file/PVwGAbbB#9tL6p3uE-Ej1DP7ngovAPqYghkQckTpW26XlrpAop9w There's both an .avi file which can be read by ffmpeg and a vx file containing the exact same video data, for which I will write a demuxer soon (note that the vx is smaller because it co

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Florian Nouwt
I applied the few changes you suggested. I moved the shared tables to h264_cavlc_data.c. Am I supposed to share the actual vlc tables (such as "static VLC_TYPE coeff_token_vlc_tables[520+332+280+256][2];") which are generated by actimagine_init_static respectively ff_h264_decode_init_vlc as well?

[FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Florian Nouwt
Signed-off-by: Florian Nouwt --- Changelog|1 + configure|1 + doc/general_contents.texi|2 + libavcodec/Makefile |3 +- libavcodec/actimagine.c | 1523 ++ libavcodec/allcodecs.c |1

Re: [FFmpeg-devel] [PATCH 1/2] avformat/mxfdec: Don't use wrong type of pointer

2021-03-15 Thread Tomas Härdin
mån 2021-03-15 klockan 14:38 +0100 skrev Andreas Rheinhardt: > Tomas Härdin: > > fre 2021-03-12 klockan 14:07 +0100 skrev Andreas Rheinhardt: > > > @@ -2922,20 +2929,19 @@ static int mxf_read_local_tags(MXFContext *mxf, > > > KLVPacket *klv, MXFMetadataReadF > > > } > > >

Re: [FFmpeg-devel] [PATCH] doc/encoders: remove text about single bit-depth libx264 support

2021-03-15 Thread Gyan Doshi
On 2021-03-15 18:54, Tobias Rapp wrote: In the meanwhile libx264 allows to be configured for including both 8/10 bit support within a single library. The new libx264 interface was enabled in 2f96190732d15510ba29471fa45d66841c0c3df1. Signed-off-by: Tobias Rapp --- doc/encoders.texi | 4 +---

[FFmpeg-devel] [PATCH] avformat/mov: Handle when we have an mfra box but have not read the full sidx for a fragment

2021-03-15 Thread Derek Buitenhuis
Use the tfra timestamp if it is available and sidx timestamp is not. Fixes reading the entire file after seeking in a live-style DASH FMP4 with an MFRA. This specifically fixes when use_mfra_for is set. Signed-off-by: Derek Buitenhuis --- I could also put it behind an additional use_mfra_for op

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Lynne
Mar 15, 2021, 16:09 by fnou...@gmail.com: > Signed-off-by: Florian Nouwt > --- > Changelog|1 + > configure|1 + > doc/general_contents.texi|2 + > libavcodec/Makefile |3 +- > libavcodec/actimagine.c | 1523 ++

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Florian Nouwt
I'll have a look if functions can be reused. If it's the case, the same could likely be done to the mobiclip decoder too since that one does a lot of stuff in a similar way. The "idct" looks very similar to "ff_h264_idct_add" in h264idct_template.c. Which would make sense since the codec is largely

Re: [FFmpeg-devel] Bash 2.04.0(1)-release in configure script

2021-03-15 Thread Ed Martin
On 3/15/21 1:20 PM, Hritik Vijay wrote: Hello I trying to work on the prerequisite tasks for GSoC this year. The codebase is huge and I found the following line introduced in c21d6325ab0 on line 50. if test "$BASH_VERSION" = '2.04.0(1)-release'; then echo "This bash version ($BASH_VERSION) is b

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Andreas Rheinhardt
Florian Nouwt: > I applied the few changes you suggested. I moved the shared tables to > h264_cavlc_data.c. Am I supposed to share the actual vlc tables (such > as "static VLC_TYPE coeff_token_vlc_tables[520+332+280+256][2];") > which are generated by actimagine_init_static respectively > ff_h264_d

Re: [FFmpeg-devel] [PATCH 1/2] avformat/mxfdec: Don't use wrong type of pointer

2021-03-15 Thread Andreas Rheinhardt
Tomas Härdin: > mån 2021-03-15 klockan 14:38 +0100 skrev Andreas Rheinhardt: >> Tomas Härdin: >>> fre 2021-03-12 klockan 14:07 +0100 skrev Andreas Rheinhardt: @@ -2922,20 +2929,19 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF }

Re: [FFmpeg-devel] [PATCH 1/4] avformat/matroskadec: Check for EOF in resync loop

2021-03-15 Thread Michael Niedermayer
On Tue, Feb 02, 2021 at 06:10:39AM +0100, Andreas Rheinhardt wrote: > Michael Niedermayer: > > Fixes: Timeout (too long -> instantly) > > Fixes: > > 29136/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-4586141227548672 > > > > Found-by: continuous fuzzing process > > https:/

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Lynne
Mar 15, 2021, 19:37 by fnou...@gmail.com: > I'll have a look if functions can be reused. If it's the case, the same > could likely be done to the mobiclip decoder too since that one does a lot > of stuff in a similar way. > The "idct" looks very similar to "ff_h264_idct_add" in h264idct_template.c

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Florian Nouwt
Good to know the order doesn't matter. In that case I should be able to use it! I don't have any docs about the format because it's all proprietary, but I did some testing with the official codec for windows and the color conversion I reverse engineered from the decoder used in ds games r = y + (v

Re: [FFmpeg-devel] [PATCH 1/2] avformat/mxfdec: Don't use wrong type of pointer

2021-03-15 Thread Tomas Härdin
mån 2021-03-15 klockan 19:48 +0100 skrev Andreas Rheinhardt: > Tomas Härdin: > > mån 2021-03-15 klockan 14:38 +0100 skrev Andreas Rheinhardt: > > > Tomas Härdin: > > > > fre 2021-03-12 klockan 14:07 +0100 skrev Andreas Rheinhardt: > > > > > @@ -2922,20 +2929,19 @@ static int mxf_read_local_tags(MXF

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Lynne
Mar 15, 2021, 21:20 by fnou...@gmail.com: > Good to know the order doesn't matter. In that case I should be able to use > it! > > I don't have any docs about the format because it's all proprietary, but I > did some testing with the official codec for windows and the color > conversion I reverse e

Re: [FFmpeg-devel] [PATCH 4/8] avformat/mxfdec: Fix file position addition

2021-03-15 Thread Michael Niedermayer
On Thu, Feb 04, 2021 at 05:07:31PM -0300, James Almer wrote: > On 2/4/2021 3:43 PM, Tomas Härdin wrote: > > mån 2021-02-01 klockan 23:31 +0100 skrev Michael Niedermayer: > > > Not sure this is the best solution, maybe a more general solution > > > limiting the avio_tell() output to less than 63bit

Re: [FFmpeg-devel] [PATCH 3/8] avcodec/utils: Use more bits for intermediate for AV_CODEC_ID_ADPCM_MS

2021-03-15 Thread Michael Niedermayer
On Mon, Feb 01, 2021 at 11:31:11PM +0100, Michael Niedermayer wrote: > Fixes: signed integer overflow: 1172577312 * 2 cannot be represented in type > 'int' > Fixes: > 29924/clusterfuzz-testcase-minimized-ffmpeg_dem_BOA_fuzzer-4882912874594304 > > Found-by: continuous fuzzing process > https://g

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Florian Nouwt
It's actually closer to normal yuv than ycocg. If you look at the coefficients of normal yuv r = y + 1.14v g = y - 0.39u - 0.58v b = y + 2.03u ycocg r = y + co - cg g = y + cg b = y - co - cg the format used in actimagine r = y + 2v g = y - 0.5u - v b = y + 2u You can see it's more like yuv than

Re: [FFmpeg-devel] [PATCH 2/8] avformat/ipmovie: Free packets allocated in header reading

2021-03-15 Thread Michael Niedermayer
On Mon, Feb 01, 2021 at 11:31:10PM +0100, Michael Niedermayer wrote: > Fixes: memleaks > Fixes: > 29905/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5679700745781248 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by:

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Lynne
Mar 15, 2021, 22:02 by fnou...@gmail.com: > It's actually closer to normal yuv than ycocg. If you look at the > coefficients of normal yuv > r = y + 1.14v > g = y - 0.39u - 0.58v > b = y + 2.03u > > ycocg > r = y + co - cg > g = y + cg > b = y - co - cg > > the format used in actimagine > r = y +

[FFmpeg-devel] Bash 2.04.0(1)-release in configure script

2021-03-15 Thread Hritik Vijay
Hello I trying to work on the prerequisite tasks for GSoC this year. The codebase is huge and I found the following line introduced in c21d6325ab0 on line 50. if test "$BASH_VERSION" = '2.04.0(1)-release'; then echo "This bash version ($BASH_VERSION) is broken on your platform." echo "Upgrade to

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Florian Nouwt
Now that I think about it, it might not be possible to an accurate straightforward conversion to regular yuv because of the subsampling. The u and v cannot just linearly be scaled to line up with the required values for regular yuv. That would mean the output would have to be in rgb format. It woul

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Lynne
Mar 15, 2021, 22:54 by fnou...@gmail.com: > Now that I think about it, it might not be possible to an accurate > straightforward conversion to regular yuv because of the subsampling. The u > and v cannot just linearly be scaled to line up with the required values > for regular yuv. That would mean

Re: [FFmpeg-devel] GSOC 2021 project Guided Filter

2021-03-15 Thread Shubham Sahoo
Hello Steven, I have implemented the code for the Guided filter. Can you guide me with the next steps? And should I submit a patch? *Regards* *Shubham* On Fri, Mar 12, 2021 at 4:36 PM Steven Liu wrote: > > > > 2021年3月12日 下午6:27,Shubham Sahoo 写道: > > > > Hi everyone, > > > > I'm Shubham Saho

Re: [FFmpeg-devel] [PATCH] avcodec: add Actimagine VX video decoder

2021-03-15 Thread Hendrik Leppkes
On Mon, Mar 15, 2021 at 10:55 PM Florian Nouwt wrote: > > Now that I think about it, it might not be possible to an accurate > straightforward conversion to regular yuv because of the subsampling. The u > and v cannot just linearly be scaled to line up with the required values > for regular yuv. T

Re: [FFmpeg-devel] GSOC 2021 project Guided Filter

2021-03-15 Thread Steven Liu
> 2021年3月16日 上午5:20,Shubham Sahoo 写道: > > Hello Steven, > > I have implemented the code for the Guided filter. Can you guide me with > the next steps? And should I submit a patch? Next step you should read GSoC rules careful, follow the rhythm of GSoC, And read some documentations: https://ff

[FFmpeg-devel] [PATCH 1/4] avcodec/adpcm_ima_cunning: support stereo

2021-03-15 Thread Zane van Iperen
Changes the sample format to S16P, but was only ever mono so it affects nothing. Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 11 +++ tests/fate/adpcm.mak | 18 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcode

[FFmpeg-devel] [PATCH 2/4] avcodec/adpcm_ima_cunning: reindent

2021-03-15 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 44f14763fb..5b6d1040af 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1379,11 +1379,11 @@ static int adp

[FFmpeg-devel] [PATCH 3/4] avformat/pp_bnk: treat music files are stereo

2021-03-15 Thread Zane van Iperen
These files are technically a series of planar mono tracks. If the "music" flag is set, merge the packets from the two mono tracks, essentially replicating: [0:a:0][0:a:1]join=inputs=2:channel_layout=stereo[a] Signed-off-by: Zane van Iperen --- libavformat/pp_bnk.c | 60 ++

[FFmpeg-devel] [PATCH 4/4] fate: add adpcm_ima_cunning stereo test case

2021-03-15 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- tests/fate/adpcm.mak| 3 +++ tests/ref/fate/adpcm-ima-cunning-stereo | 1 + 2 files changed, 4 insertions(+) create mode 100644 tests/ref/fate/adpcm-ima-cunning-stereo diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index 84c6996bd

Re: [FFmpeg-devel] [PATCH 3/4] avformat/pp_bnk: treat music files are stereo

2021-03-15 Thread Andreas Rheinhardt
Zane van Iperen: > These files are technically a series of planar mono tracks. > If the "music" flag is set, merge the packets from the two > mono tracks, essentially replicating: > > [0:a:0][0:a:1]join=inputs=2:channel_layout=stereo[a] > > Signed-off-by: Zane van Iperen > --- > libavformat/p