Re: [FFmpeg-devel] [PATCH v1] lavf/url: fix rel path’s query string contains :/

2020-10-15 Thread 蔡昊凝
Simply add ? to the list of delimiters,and add comment. Signed-off-by: ruiquan.crq --- libavformat/tests/url.c | 1 + libavformat/url.c | 2 +- tests/ref/fate/url | 4 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/tests/url.c b/libavform

[FFmpeg-devel] [PATCH 5/5] fate: add test for adpcm_swf in wav

2020-10-15 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- tests/fate/acodec.mak | 7 +-- tests/ref/acodec/adpcm-swf-flv | 4 tests/ref/acodec/adpcm-swf-wav | 4 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 tests/ref/acodec/adpcm-swf-flv create mode 100644 tests/ref/acode

[FFmpeg-devel] [PATCH 3/5] avcodec/adpcm_swf: set block_align when encoding

2020-10-15 Thread Zane van Iperen
Allows it to be muxed to WAVs. Signed-off-by: Zane van Iperen --- libavcodec/adpcmenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 24bd31c4a9..00c7df3cd1 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc

[FFmpeg-devel] [PATCH 0/5] Fix adpcm_swf support in WAV.

2020-10-15 Thread Zane van Iperen
adpcm_swf support in WAV is completely broken. block_align isn't set correctly, so the demuxer gives incorrect packets to the decoder. The encoder doesn't provide a value for block_align, so it's set to 1. All of this has no bearing on (de)muxing to FLV. See https://trac.ffmpeg.org/ticket/5829.

[FFmpeg-devel] [PATCH 1/5] avformat/wav: prevent muxing adpcm_swf with a variable block size

2020-10-15 Thread Zane van Iperen
Prefer to error than to create a broken file. Closes ticket #5829. Effectively disables remuxing adpcm_swf from flv -> wav. Signed-off-by: Zane van Iperen --- libavformat/wavenc.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index 1027f1

[FFmpeg-devel] [PATCH 2/5] avcodec/adpcm_swf: support decoding multiple fixed-sized blocks at once

2020-10-15 Thread Zane van Iperen
For incoming packets from WAV. Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index f7da3dcf89..fef1e6714c 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c

[FFmpeg-devel] [PATCH 4/5] avcodec/adpcmenc: cosmetics

2020-10-15 Thread Zane van Iperen
Signed-off-by: Zane van Iperen --- libavcodec/adpcmenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 00c7df3cd1..9095411559 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -143,7 +143,7 @@ static av_

Re: [FFmpeg-devel] [PATCH] Ticket #8750 Add inline function for the vec_xl intrinsic in non-VSX environments

2020-10-15 Thread Andriy Gelman
On Fri, 09. Oct 20:17, Andriy Gelman wrote: > From: Chip Kerchner > > --- > libswscale/ppc/yuv2rgb_altivec.c | 10 ++ > 1 file changed, 10 insertions(+) > > diff --git a/libswscale/ppc/yuv2rgb_altivec.c > b/libswscale/ppc/yuv2rgb_altivec.c > index 536545293d..930ef6b98f 100644 > --- a/

Re: [FFmpeg-devel] [PATCH v1] lavf/url: fix rel path’s query string contains :/

2020-10-15 Thread 蔡昊凝
Thanks for your reply. Scheme can't contain ?. RFC3986 definition of Scheme (https://tools.ietf.org/html/rfc3986#section-3.1) scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) Delimiters is lavf "schemes" can contain options, and ? should not be part of schemes. So it is not suitable to

[FFmpeg-devel] [PATCH v2 3/3] avcodec/movtextenc: Remove redundant function parameters

2020-10-15 Thread Andreas Rheinhardt
It makes no sense to call the functions to write styl, hlit or hclr boxes with a different box name than "styl", "hlit" or "hclr". Therefore this commit inlines these values in the functions, removes the function parameter containing the box's name and removes the (non obsolete) box names from the

[FFmpeg-devel] [PATCH v2 2/3] avcodec/movtextenc: Simplify writing to AVBPrint

2020-10-15 Thread Andreas Rheinhardt
The mov_text encoder uses an AVBPrint to assemble the subtitles; yet mov_text subtitles are not pure text; they also have a binary portion that was mostly handled as follows: uint32_t size = /* calculation */; size = AV_RB32(&size); av_bprint_append_data(bprint, (const char*)&size, 4);

[FFmpeg-devel] [PATCH v2 1/3] avcodec/movtextenc: Fix potential use of uninitialized value

2020-10-15 Thread Andreas Rheinhardt
Background colour was never initialized if no style was available. Use a sane default of zero (i.e. completely transparent). Fixes Coverity issue #1461471. Signed-off-by: Andreas Rheinhardt --- Commit message updated to include Coverity issue. libavcodec/movtextenc.c | 2 +- 1 file changed, 1

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/movtextenc: fix writing to bytestream on BE arches

2020-10-15 Thread Andriy Gelman
On Thu, 15. Oct 23:55, Andreas Rheinhardt wrote: > Andriy Gelman: > > On Thu, 15. Oct 16:06, Andreas Rheinhardt wrote: > >> Andriy Gelman: > >>> From: Andriy Gelman > >>> > >>> Fixes fate-binsub-movtextenc on PPC64 > >>> > >>> Currently tags are written in reverse order on BE arches. This is fixed

[FFmpeg-devel] [PATCH] avcodec/av1dec: always update frame loop filter deltas using bitstream values

2020-10-15 Thread James Almer
Frames with primary_ref_frame == AV1_PRIMARY_REF_NONE can also have values for loop_filter_ref_deltas and loop_filter_mode_deltas coded in the bitstream that must overwrite the initial values if present. Signed-off-by: James Almer --- libavcodec/av1dec.c | 44

Re: [FFmpeg-devel] [PATCH v3] Unbreak av_malloc_max(0) API/ABI

2020-10-15 Thread Andreas Rheinhardt
Joakim Tjernlund: > From https://bugs.chromium.org/p/chromium/issues/detail?id=1095962 > > This seems to be caused by the custom handling of "av_max_alloc(0)" in > Chromium's ffmpeg fork to mean unlimited (added in [1]). > > Upstream ffmpeg doesn't treat 0 as a special

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/movtextenc: Fix potential use of unitialized value

2020-10-15 Thread Andreas Rheinhardt
Moritz Barsnick: > On Thu, Oct 15, 2020 at 16:00:50 +0200, Andreas Rheinhardt wrote: > > Nit: >> Subject: avcodec/movtextenc: Fix potential use of unitialized value > uninitialized > Thanks, fixed locally. Also added a reference to Coverity ticket #1461471 (which this commit fixes). - Andreas __

[FFmpeg-devel] [PATCH v2 1/5] libdc1394: Enable listing sources

2020-10-15 Thread Forest Crossman
IIDC camera sources can now be listed by using the following command: ffmpeg -sources libdc1394 The basic structure of this function was borrowed from libavdevice/alsa.c:ff_alsa_get_device_list. Signed-off-by: Forest Crossman --- libavdevice/libdc1394.c | 73 +++

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/movtextenc: fix writing to bytestream on BE arches

2020-10-15 Thread Andreas Rheinhardt
Andriy Gelman: > On Thu, 15. Oct 16:06, Andreas Rheinhardt wrote: >> Andriy Gelman: >>> From: Andriy Gelman >>> >>> Fixes fate-binsub-movtextenc on PPC64 >>> >>> Currently tags are written in reverse order on BE arches. This is fixed >>> by using MKBETAG() and AV_RB32() to be arch agnostics. >>> >

[FFmpeg-devel] [PATCH v2 0/5] libdc1394 enhancements

2020-10-15 Thread Forest Crossman
I was having trouble using libdc1394 the first time I tried it (e.g., setting unsupported video modes/framerates on cameras, trying to use multiple cameras, tring to figure out how to set the arguments so the command would actually work, etc.) so I thought I'd go ahead and add some ease-of-use enha

[FFmpeg-devel] [PATCH v2 4/5] doc/indevs: Add examples for libdc1394

2020-10-15 Thread Forest Crossman
Signed-off-by: Forest Crossman --- doc/indevs.texi | 32 1 file changed, 32 insertions(+) diff --git a/doc/indevs.texi b/doc/indevs.texi index 46203833e9..ca584f1d8e 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -1114,6 +1114,38 @@ Set the video size give

[FFmpeg-devel] [PATCH v2 5/5] libdc1394: Fix PTS wrapping

2020-10-15 Thread Forest Crossman
Without this, the timestamp will unexpectedly wrap around after approximately 2146 frames (on a 64-bit system, at least), which is about 19 minutes at the lowest framerate supported by the IIDC standard and about 9 seconds at the highest supported framerate. To fix this, we use av_rescale() to do

Re: [FFmpeg-devel] [PATCH 2/3] avcodec/exr: Fix overflow with many blocks

2020-10-15 Thread Michael Niedermayer
On Mon, Sep 28, 2020 at 04:13:00PM +0200, Michael Niedermayer wrote: > On Sun, Sep 27, 2020 at 10:21:25AM +0200, Andreas Rheinhardt wrote: > > Michael Niedermayer: > > > Fixes: signed integer overflow: 1073741827 * 8 cannot be represented in > > > type 'int' > > > Fixes: > > > 25621/clusterfuzz-t

[FFmpeg-devel] [PATCH 2/5] avcodec/h264idct_template: Fix integer overflow in ff_h264_chroma422_dc_dequant_idct()

2020-10-15 Thread Michael Niedermayer
Fixes: signed integer overflow: 241173056 + 1953511200 cannot be represented in type 'int' Fixes: 26086/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5068366420901888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-b

Re: [FFmpeg-devel] [PATCH 2/2] avcodec/mobiclip: set the bitstream size to the input

2020-10-15 Thread Michael Niedermayer
On Sat, Sep 12, 2020 at 04:51:04PM +0200, Paul B Mahol wrote: > On Sat, Sep 12, 2020 at 04:35:55PM +0200, Michael Niedermayer wrote: > > Fixes: out of array read > > Fixes: > > 25453/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOBICLIP_fuzzer-5163575973511168 > > > > Found-by: continuous fu

[FFmpeg-devel] [PATCH 1/5] avcodec/notchlc: Check uncompressed size against input for LZ4

2020-10-15 Thread Michael Niedermayer
Fixes: OOM Fixes: 26168/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NOTCHLC_fuzzer-6019839015256064 Equation is based on LZ4_COMPRESSBOUND from lz4.h Suggested-by: Paul Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michae

[FFmpeg-devel] [PATCH 5/5] avformat/au: Check for EOF in au_read_annotation()

2020-10-15 Thread Michael Niedermayer
Fixes: Timeout (too looong -> 1 ms) Fixes: 26366/clusterfuzz-testcase-minimized-ffmpeg_dem_SDX_fuzzer-5655584843759616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/au.c | 2 ++ 1 file chan

[FFmpeg-devel] [PATCH 3/5] avformat/asfdec_f: Check name_len for overflow

2020-10-15 Thread Michael Niedermayer
Fixes: signed integer overflow: -1172299744 * 2 cannot be represented in type 'int' Fixes: 26258/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5672758488596480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niede

Re: [FFmpeg-devel] [PATCH] Revert "aviobuf: Discard old buffered, previously read data in ffio_read_partial"

2020-10-15 Thread Marton Balint
On Fri, 9 Oct 2020, Marton Balint wrote: This is unneeded after 2ca48e466675a8a3630061cd2c15325eab8eda97 and it breaks ffio_ensure_seekback(). This reverts commit 53c25ee0736497b46bb76064cc2c84c976b2d295. --- libavformat/aviobuf.c | 7 --- 1 file changed, 7 deletions(-) diff --git a/libav

Re: [FFmpeg-devel] [PATCH v1] lavf/url: fix rel path’s query string contains :/

2020-10-15 Thread Marton Balint
On Thu, 15 Oct 2020, caihaonin...@gmail.com wrote: From: "ruiquan.crq" Signed-off-by: ruiquan.crq --- libavformat/tests/url.c | 1 + libavformat/url.c | 10 +++--- tests/ref/fate/url | 4 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/tests/ur

[FFmpeg-devel] [PATCH] libavcodec/cuviddec AV1 decoding support for Ampere cards

2020-10-15 Thread Roman Arzumanyan
Hello, This patch adds AV1 decoding support for av1_cuvid stand-alone decoder. It requires Ampere GPU. -- BR, Roman Arzumanyan 0001-AV1-nvcuvid-support.patch Description: 0001-AV1-nvcuvid-support.patch ___ ffmpeg-devel mailing list ffmpeg-devel@ffmp

Re: [FFmpeg-devel] [PATCH] libavformat/hls: add support for SAMPLE-AES decryption in HLS demuxer

2020-10-15 Thread Michael Niedermayer
On Thu, Oct 15, 2020 at 10:15:13PM +0530, Nachiket Tarate wrote: > Apple HTTP Live Streaming Sample Encryption: > > https://developer.apple.com/library/ios/documentation/AudioVideo/Conceptual/HLS_Sample_Encryption > > Signed-off-by: Nachiket Tarate > --- > libavformat/Makefile | 2 +-

[FFmpeg-devel] [PATCH] libavformat/hls: add support for SAMPLE-AES decryption in HLS demuxer

2020-10-15 Thread Nachiket Tarate
Apple HTTP Live Streaming Sample Encryption: https://developer.apple.com/library/ios/documentation/AudioVideo/Conceptual/HLS_Sample_Encryption Signed-off-by: Nachiket Tarate --- libavformat/Makefile | 2 +- libavformat/hls.c| 93 ++- libavformat/hls_sample_aes.c | 497

Re: [FFmpeg-devel] [PATCH] libavformat/avidec: check memory allocation

2020-10-15 Thread Michael Niedermayer
On Tue, Oct 13, 2020 at 02:22:25PM +1100, Chris Miceli wrote: > Memory allocation for AVIOContext should be checked. In this code, > all error conditions are sent to the "goto error". > --- > libavformat/avidec.c | 8 ++-- > 1 file changed, 6 insertions(+), 2 deletions(-) will apply thx [..

[FFmpeg-devel] [PATCH] avcodec/cri: Check for end of image in unpack_10bit()

2020-10-15 Thread Michael Niedermayer
Fixes: out of array write Fixes: 26242/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CRI_fuzzer-5161495882891264 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cri.c | 18

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/movtextenc: fix writing to bytestream on BE arches

2020-10-15 Thread Andriy Gelman
On Thu, 15. Oct 16:06, Andreas Rheinhardt wrote: > Andriy Gelman: > > From: Andriy Gelman > > > > Fixes fate-binsub-movtextenc on PPC64 > > > > Currently tags are written in reverse order on BE arches. This is fixed > > by using MKBETAG() and AV_RB32() to be arch agnostics. > > > > Also s->font

[FFmpeg-devel] [PATCH v1] lavf/url: fix rel path’s query string contains :/

2020-10-15 Thread caihaoning83
From: "ruiquan.crq" Signed-off-by: ruiquan.crq --- libavformat/tests/url.c | 1 + libavformat/url.c | 10 +++--- tests/ref/fate/url | 4 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/tests/url.c b/libavformat/tests/url.c index 2440ae08bc..c294

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/movtextenc: fix writing to bytestream on BE arches

2020-10-15 Thread Andreas Rheinhardt
Andriy Gelman: > From: Andriy Gelman > > Fixes fate-binsub-movtextenc on PPC64 > > Currently tags are written in reverse order on BE arches. This is fixed > by using MKBETAG() and AV_RB32() to be arch agnostics. > > Also s->font_count is of type int. On BE arches with 32bit int, > count = AV_RB

[FFmpeg-devel] [PATCH 1/2] avcodec/movtextenc: Fix potential use of unitialized value

2020-10-15 Thread Andreas Rheinhardt
Background colour was never initialized if no style was available. Use a sane default of zero (i.e. completely transparent). Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movt