[FFmpeg-devel] [PATCH 6/6] avcodec/x86: allow 8-bit simple_idct to use slightly different coefficients

2017-06-12 Thread James Darnley
This makes it exact to the old MMX one, as reported by libavcodec/tests/dct. --- libavcodec/x86/proresdsp.asm | 18 + libavcodec/x86/simple_idct10.asm | 33 ++- libavcodec/x86/simple_idct10_template.asm | 19 ++ 3

[FFmpeg-devel] [PATCH 5/6] avcodec/x86: add x86-64 8-bit simple_idct add function

2017-06-12 Thread James Darnley
--- libavcodec/x86/idctdsp_init.c| 2 ++ libavcodec/x86/simple_idct.h | 3 ++ libavcodec/x86/simple_idct10.asm | 61 3 files changed, 66 insertions(+) diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c index

[FFmpeg-devel] [PATCH 2/6] avcodec/x86: modify simple_idct10 macros to add an action paramter

2017-06-12 Thread James Darnley
--- libavcodec/x86/proresdsp.asm | 2 +- libavcodec/x86/simple_idct10.asm | 8 +++ libavcodec/x86/simple_idct10_template.asm | 37 +-- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/libavcodec/x86/proresdsp.asm

[FFmpeg-devel] [PATCH 4/6] avcodec/x86: add x86-64 8-bit simple_idct put function

2017-06-12 Thread James Darnley
--- libavcodec/x86/idctdsp_init.c| 2 ++ libavcodec/x86/simple_idct.h | 3 +++ libavcodec/x86/simple_idct10.asm | 23 +++ 3 files changed, 28 insertions(+) diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c index 4b2145e478..1826d01e0e 100644

[FFmpeg-devel] [PATCH 1/6] avcodec/x86: cleanup simple_idct10

2017-06-12 Thread James Darnley
Use named arguments for the functions so we can remove a define. The stride/linesize argument is now ptrdiff_t type so we no longer need to sign extend the register. --- libavcodec/x86/proresdsp.asm | 2 +- libavcodec/x86/simple_idct10.asm | 8 ++--

[FFmpeg-devel] [PATCH 0/6] sse2/avx functions for 8-bit simple idct

2017-06-12 Thread James Darnley
I think I have reached the final state for these patches. There has been little change to the 1st, 3rd, 4th, and 5th. The 2nd adds an option to explicitly control what the macro does after the IDCT. This allows the small optimisation for 8-bit of not storing the data back to the source block.

[FFmpeg-devel] [PATCH 3/6] avcodec/x86: add x86-64 8-bit simple_idct function

2017-06-12 Thread James Darnley
Rounding contributed by Ronald S. Bultje --- libavcodec/tests/x86/dct.c | 2 ++ libavcodec/x86/idctdsp_init.c| 19 +++ libavcodec/x86/simple_idct.h | 3 +++ libavcodec/x86/simple_idct10.asm | 8 4 files changed, 32 insertions(+) diff --git

Re: [FFmpeg-devel] [PATCH 0/6] sse2/avx functions for 8-bit simple idct

2017-06-12 Thread Michael Niedermayer
On Mon, Jun 12, 2017 at 03:36:03PM +0200, James Darnley wrote: > I think I have reached the final state for these patches. There has been > little > change to the 1st, 3rd, 4th, and 5th. > > The 2nd adds an option to explicitly control what the macro does after the > IDCT. > This allows the

Re: [FFmpeg-devel] [PATCH 3/6] avcodec/x86: add x86-64 8-bit simple_idct function

2017-06-12 Thread Michael Niedermayer
On Mon, Jun 12, 2017 at 03:36:06PM +0200, James Darnley wrote: > Rounding contributed by Ronald S. Bultje > --- > libavcodec/tests/x86/dct.c | 2 ++ > libavcodec/x86/idctdsp_init.c| 19 +++ > libavcodec/x86/simple_idct.h | 3 +++ > libavcodec/x86/simple_idct10.asm

Re: [FFmpeg-devel] [PATCH] avcodec/vp9: ipred_dr_16x16_16 avx2 implementation

2017-06-12 Thread Ronald S. Bultje
Hi, On Sat, Jun 10, 2017 at 6:01 AM, Ilia Valiakhmetov wrote: > Signed-off-by: Ilia Valiakhmetov > --- > libavcodec/x86/vp9dsp_init_16bpp.c| 2 ++ > libavcodec/x86/vp9intrapred_16bpp.asm | 56 ++ > + > 2 files

[FFmpeg-devel] [PATCH] x86/aacpsdsp: add ff_ps_hybrid_synthesis_deint_{sse, sse4}

2017-06-12 Thread James Almer
About 2x faster than the c version. Signed-off-by: James Almer --- libavcodec/x86/aacpsdsp.asm| 123 + libavcodec/x86/aacpsdsp_init.c | 8 +++ libavutil/x86/x86util.asm | 15 +++-- 3 files changed, 140 insertions(+), 6

Re: [FFmpeg-devel] [PATCH] fate: fix source test for sofa2wavs

2017-06-12 Thread Paul B Mahol
On 6/12/17, Michael Bradshaw wrote: > commit 1a30bf60be9243830b68e8fe2e20539f08a85926 added the sofa2wavs > tool, which breaks fate: > $ make fate V=1 > TESTsource > ./tests/fate-run.sh fate-source "samples" "" "/Users/mjbshaw/ffmpeg" > 'runlocal

Re: [FFmpeg-devel] [PATCH] fate: fix source test for sofa2wavs

2017-06-12 Thread Michael Bradshaw
On Mon, Jun 12, 2017 at 11:14 AM, James Almer wrote: > On 6/12/2017 3:07 PM, Paul B Mahol wrote: >> OK, please apply. > > Wouldn't it be better/proper to add the license header to the file instead? Yeah. Paul, as the proper copyright holder of the sofa2wavs.c file, could you

Re: [FFmpeg-devel] [PATCH] fate: fix source test for sofa2wavs

2017-06-12 Thread James Almer
On 6/12/2017 3:07 PM, Paul B Mahol wrote: > On 6/12/17, Michael Bradshaw wrote: >> commit 1a30bf60be9243830b68e8fe2e20539f08a85926 added the sofa2wavs >> tool, which breaks fate: >> $ make fate V=1 >> TESTsource >> ./tests/fate-run.sh fate-source "samples" ""

Re: [FFmpeg-devel] [PATCH] fate: add test for -time_base option

2017-06-12 Thread Michael Bradshaw
On Sat, Jun 10, 2017 at 8:19 AM, James Almer wrote: > Is mxf as output needed for this? mxf was one of the (relatively few) number of muxers I knew of that would utilize the provided time base. It's not strictly needed. > If not, the framemd5() or framecrc() > fate functions

[FFmpeg-devel] [PATCH] avcodec/htmlsubtitles: Factor open brace handling into its own function

2017-06-12 Thread Michael Niedermayer
Suggested-by: wm4 Signed-off-by: Michael Niedermayer --- libavcodec/htmlsubtitles.c | 44 ++-- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c index

Re: [FFmpeg-devel] [PATCH 08/11] avfilter/vf_signature: use av_strlcpy instead of strcpy

2017-06-12 Thread Michael Niedermayer
On Sun, Jun 11, 2017 at 04:05:50PM +0200, Timo Rothenpieler wrote: > Fixes CID 1403236 > --- > libavfilter/vf_signature.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c > index f0078ba1a6..c20b0bfabb 100644 > ---

Re: [FFmpeg-devel] [PATCH] fate: fix source test for sofa2wavs

2017-06-12 Thread Paul B Mahol
On 6/12/17, Michael Bradshaw wrote: > On Mon, Jun 12, 2017 at 11:14 AM, James Almer wrote: >> On 6/12/2017 3:07 PM, Paul B Mahol wrote: >>> OK, please apply. >> >> Wouldn't it be better/proper to add the license header to the file >> instead?

[FFmpeg-devel] Sharing cuda context between transcode sessions to reduce initialization overhead

2017-06-12 Thread Ganapathy Raman Kasi
Hi, Currently incase of using 1 -> N transcode (1 SW decode -> N NVENC encodes) without HW upload filter, we end up allocating multiple Cuda contexts for the N transcode sessions for the same underlying gpu device. This comes with the cuda context initialization overhead. (~100 ms per

Re: [FFmpeg-devel] [PATCH] avcodec/htmlsubtitles: Replace very slow redundant sscanf() calls by cleaner and faster code

2017-06-12 Thread Michael Niedermayer
On Mon, Jun 12, 2017 at 11:35:14AM +0200, wm4 wrote: > On Sun, 11 Jun 2017 17:58:45 +0200 > Michael Niedermayer wrote: > > > This reduces the worst case from O(n²) to O(n) time > > > > Fixes Timeout > > Fixes: 2127/clusterfuzz-testcase-minimized-6595787859427328 > > > >

Re: [FFmpeg-devel] Sharing cuda context between transcode sessions to reduce initialization overhead

2017-06-12 Thread Hendrik Leppkes
Am 12.06.2017 10:38 nachm. schrieb "Ganapathy Raman Kasi" : Hi, Currently incase of using 1 -> N transcode (1 SW decode -> N NVENC encodes) without HW upload filter, we end up allocating multiple Cuda contexts for the N transcode sessions for the same underlying gpu device.

Re: [FFmpeg-devel] [PATCH 0/6] sse2/avx functions for 8-bit simple idct

2017-06-12 Thread James Darnley
On 2017-06-12 18:57, Michael Niedermayer wrote: > On Mon, Jun 12, 2017 at 03:36:06PM +0200, James Darnley wrote: >> Rounding contributed by Ronald S. Bultje >> --- >> libavcodec/tests/x86/dct.c | 2 ++ >> libavcodec/x86/idctdsp_init.c| 19 +++ >>

Re: [FFmpeg-devel] Sharing cuda context between transcode sessions to reduce initialization overhead

2017-06-12 Thread Timo Rothenpieler
Global state in the libraries is something we absolutely try to stay away from, so this approach is not quite appropriate. If you want to somehow share this, it should be in the ffmpeg command line tool somewhere, however we also try to reduce hardware specific magic in favor of abstractions.

Re: [FFmpeg-devel] [PATCH 01/11] avfilter/unsharp: fix uninitialized pointer read

2017-06-12 Thread Michael Niedermayer
On Sun, Jun 11, 2017 at 04:05:43PM +0200, Timo Rothenpieler wrote: > Fixes CID 1396855 > --- > libavfilter/unsharp_opencl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) LGTM thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB There will always

[FFmpeg-devel] [PATCH 22/24] vf_hwmap: Add device derivation

2017-06-12 Thread Mark Thompson
Also refactor a little and improve error messages to make failure cases easier to understand. (cherry picked from commit 38cb05f1c89cae1862b360d4e7e3f0cd2b5bbb67) --- libavfilter/vf_hwmap.c | 67 -- 1 file changed, 49 insertions(+), 18 deletions(-)

[FFmpeg-devel] configure/libopenjpegdec.c/libopenjpegenc.c: Add support for LibOpenJPEG v2.2/git

2017-06-12 Thread Reino Wijnsma
This patch adds support for LibOpenJPEG v2.2/git. At the moment v2.1 is the highest version FFmpeg supports. I've successfully cross-compiled FFmpeg this way. From df61d7a295bec74c85d37042051e9dc1ef5cdbce Mon Sep 17 00:00:00 2001 From: Reino17 Date: Tue, 13 Jun 2017 01:01:07

[FFmpeg-devel] Add libtwolame cppflags in 'configure' to prevent the use of '--extra-cflags'

2017-06-12 Thread Reino Wijnsma
This patch adds libtwolame cppflags in 'configure' to prevent the use of '--extra-cflags'. This is all that's needed to successfully cross-compile FFmpeg with LibTwoLAME. From 9aacc77f0dcb67d375fd3bdf4d0a1dc8d55b1cf7 Mon Sep 17 00:00:00 2001 From: Reino17 Date: Tue, 13 Jun

[FFmpeg-devel] configure: Add libmodplug cppflags in 'configure' to prevent the use of '--extra-cflags'

2017-06-12 Thread Reino Wijnsma
This patch adds libmodplug cppflags in 'configure' to prevent the use of '--extra-cflags'. This is all that's needed to successfully cross-compile FFmpeg with LibModplug. From 7fe7113ccc79f46610b2a89f8ab17e94c348e568 Mon Sep 17 00:00:00 2001 From: Reino17 Date: Tue, 13 Jun

[FFmpeg-devel] configure: Add libcaca cppflags in 'configure' to prevent the use of '--extra-cflags'

2017-06-12 Thread Reino Wijnsma
This patch adds libcaca cppflags in 'configure' to prevent the use of '--extra-cflags'. This is all that's needed to successfully cross-compile FFmpeg with Libcaca. From ba27f7d90c5c3883bd302caf977837d970d46387 Mon Sep 17 00:00:00 2001 From: Reino17 Date: Tue, 13 Jun 2017

[FFmpeg-devel] [PATCH] x86/aacpsdsp: add ff_ps_hybrid_analysis_ileave_sse

2017-06-12 Thread James Almer
About 2x faster than the c version. Signed-off-by: James Almer --- Depends on "[PATCH] x86/aacpsdsp: add ff_ps_hybrid_synthesis_deint_{sse,sse4}" libavcodec/x86/aacpsdsp.asm| 106 + libavcodec/x86/aacpsdsp_init.c | 3 ++ 2 files

[FFmpeg-devel] [PATCH 00/24] Generic hardware device setup and miscellaneous related merges

2017-06-12 Thread Mark Thompson
This merges a set of stuff from libav to do with hardware codecs/processing. The two most interesting features of this are: * Generic hardware device setup. This finishes the uniform structure for hardware device setup which has been in progress for a while, finally deleting several of the

[FFmpeg-devel] [PATCH 02/24] vaapi_encode: Discard output buffer if picture submission fails

2017-06-12 Thread Mark Thompson
Previously this was leaking, though it actually hit an assert making sure that the buffer had already been cleared when freeing the picture. (cherry picked from commit 17aeee5832b9188b570c3d3de4197e4cdc54c634) --- libavcodec/vaapi_encode.c | 2 ++ 1 file changed, 2 insertions(+) diff --git

[FFmpeg-devel] [PATCH 01/24] hwcontext_vaapi: Try to support the VDPAU wrapper

2017-06-12 Thread Mark Thompson
The driver is somewhat bitrotten (not updated for years) but is still usable for decoding with this change. To support it, this adds a new driver quirk to indicate no support at all for surface attributes. Based on a patch by wm4 . (cherry picked from commit

[FFmpeg-devel] [PATCH 04/24] hwcontext: Make it easier to work with device types

2017-06-12 Thread Mark Thompson
Adds functions to convert to/from strings and a function to iterate over all supported device types. Also adds a new invalid type AV_HWDEVICE_TYPE_NONE, which acts as a sentinel value. (cherry picked from commit b7487f4f3c39b4b202e1ea7bb2de13902f2dee45) --- doc/APIchanges| 4

[FFmpeg-devel] [PATCH 03/24] hwcontext: Add device derivation

2017-06-12 Thread Mark Thompson
Creates a new device context from another of a different type which refers to the same underlying hardware. (cherry picked from commit b266ad56fe0e4ce5bb70118ba2e2b1dabfaf76ce) --- doc/APIchanges | 3 ++ libavutil/hwcontext.c | 65

Re: [FFmpeg-devel] Add libtwolame cppflags in 'configure' to prevent the use of '--extra-cflags'

2017-06-12 Thread Hendrik Leppkes
On Tue, Jun 13, 2017 at 1:41 AM, Reino Wijnsma wrote: > This patch adds libtwolame cppflags in 'configure' to prevent the use of > '--extra-cflags'. This is all that's needed to successfully > cross-compile FFmpeg with LibTwoLAME. > And what happens if someone were to

[FFmpeg-devel] [PATCH 18/24] hwcontext: Add frame context mapping for nontrivial contexts

2017-06-12 Thread Mark Thompson
Some frames contexts are not usable without additional format-specific state in hwctx. This change adds new functions frames_derive_from and frames_derive_to to initialise this state appropriately when deriving a frames context which will require it to be set. (cherry picked from commit

[FFmpeg-devel] [PATCH 19/24] hwcontext_qsv: Implement mapping frames from the child device type

2017-06-12 Thread Mark Thompson
Factorises out existing surface initialisation code to reuse. (cherry picked from commit eaa5e0710496db50fc164806e5f49eaaccc83bb5) --- libavutil/hwcontext_qsv.c | 174 +- 1 file changed, 142 insertions(+), 32 deletions(-) diff --git

[FFmpeg-devel] [PATCH 17/24] hwcontext_qsv: Support derivation from child devices

2017-06-12 Thread Mark Thompson
(cherry picked from commit aa51bb3d2756ed912ee40645efccf5f4a9609696) --- libavutil/hwcontext_qsv.c | 113 ++ 1 file changed, 84 insertions(+), 29 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index

[FFmpeg-devel] [PATCH 08/24] ffmpeg: Document the -init_hw_device option

2017-06-12 Thread Mark Thompson
(cherry picked from commit 303fadf5963e01b8edf4ba2701e45f7e9e586aeb) --- doc/ffmpeg.texi | 85 +++-- 1 file changed, 58 insertions(+), 27 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index dcc0cfb341..db7f05a3e0 100644 ---

[FFmpeg-devel] [PATCH 20/24] hwcontext_qsv: Implement mapping frames to the child device type

2017-06-12 Thread Mark Thompson
(cherry picked from commit e1c5d56b18b82e3fb42382b1b1f972e8b371fc38) --- libavutil/hwcontext_qsv.c | 88 +-- 1 file changed, 86 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index

[FFmpeg-devel] [PATCH 21/24] hwcontext: Improve allocation in derived contexts

2017-06-12 Thread Mark Thompson
Use the flags argument of av_hwframe_ctx_create_derived() to pass the mapping flags which will be used on allocation. Also, set the format and hardware context on the allocated frame automatically - the user should not be required to do this themselves. (cherry picked from commit

[FFmpeg-devel] [PATCH 10/24] qsv: Add ability to create a session from a device

2017-06-12 Thread Mark Thompson
(cherry picked from commit 4936a48b1e6fc2147599541f8b25f43a8a9d1f16) --- libavcodec/qsv.c | 49 --- libavcodec/qsv_internal.h | 9 ++--- libavcodec/qsvdec.c | 6 +++--- libavcodec/qsvenc.c | 6 +++--- 4 files changed, 46

[FFmpeg-devel] [PATCH 15/24] vaapi: Add external control of allow-profile-mismatch

2017-06-12 Thread Mark Thompson
Uses the just-added ALLOW_PROFILE_MISMATCH flag. (cherry picked from commit 7acb90333a187b0e847b66f9d3511245423dc0ce) --- libavcodec/vaapi_decode.c | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index

[FFmpeg-devel] [PATCH 24/24] doc: Document hwupload, hwdownload and hwmap filters

2017-06-12 Thread Mark Thompson
(cherry picked from commit 66aa9b94dae217a0fc5acfb704490707629d95ed) --- doc/filters.texi | 98 1 file changed, 98 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 023096f4e0..db0bdfe254 100644 --- a/doc/filters.texi

[FFmpeg-devel] [PATCH 23/24] vf_hwmap: Add reverse mapping for hardware frames

2017-06-12 Thread Mark Thompson
This is something of a hack. It allocates a new hwframe context for the target format, then maps it back to the source link and overwrites the input link hw_frames_ctx so that the previous filter will receive the frames we want from ff_get_video_buffer(). It may fail if the previous filter

Re: [FFmpeg-devel] Sharing cuda context between transcode sessions to reduce initialization overhead

2017-06-12 Thread Mark Thompson
On 12/06/17 22:33, Hendrik Leppkes wrote: > Am 12.06.2017 10:38 nachm. schrieb "Ganapathy Raman Kasi" > : > > Hi, > > > Currently incase of using 1 -> N transcode (1 SW decode -> N NVENC > encodes) without HW upload filter, we end up allocating multiple Cuda > contexts for

[FFmpeg-devel] [PATCH] fate: fix source test for sofa2wavs

2017-06-12 Thread Michael Bradshaw
commit 1a30bf60be9243830b68e8fe2e20539f08a85926 added the sofa2wavs tool, which breaks fate: $ make fate V=1 TESTsource ./tests/fate-run.sh fate-source "samples" "" "/Users/mjbshaw/ffmpeg" 'runlocal fate/source-check.sh' '' '' '' '1' '' '' '' '' '' '' '' '' '' ./tests/fate/source-check.sh

Re: [FFmpeg-devel] [PATCH] libavfilter/scale: Populate ow/oh when using 0 as w/h

2017-06-12 Thread Michael Niedermayer
On Wed, Jun 07, 2017 at 03:54:26AM -0400, Kevin Mark wrote: > I also have to wonder if it would be advantageous to add the cast on > the right side as well. That way the var_values variables will have > the proper truncated values on future evaluations. Open to comments on > that. > > On Wed, Jun

Re: [FFmpeg-devel] configure/libopenjpegdec.c/libopenjpegenc.c: Add support for LibOpenJPEG v2.2/git

2017-06-12 Thread Michael Bradshaw
On Mon, Jun 12, 2017 at 4:36 PM, Reino Wijnsma wrote: > This patch adds support for LibOpenJPEG v2.2/git. At the moment v2.1 is > the highest version FFmpeg supports. I've successfully cross-compiled > FFmpeg this way. Are you sure you built ffmpeg using OpenJPEG v2.2?

Re: [FFmpeg-devel] [PATCH V4] lavc/golomb: Fix UE golomb overwrite issue.

2017-06-12 Thread Michael Niedermayer
On Fri, Jun 09, 2017 at 10:34:19AM +0800, Jun Zhao wrote: > V4: Fix rang check error in assert base on Mark's review > V3: Clean the code logic base on Michael's review. > V2: Add set_ue_golomb_long() to support 32bits UE golomb and update the unit > test. > golomb.h | 17

Re: [FFmpeg-devel] Add libtwolame cppflags in 'configure' to prevent the use of '--extra-cflags'

2017-06-12 Thread Reino Wijnsma
I just tried to build a shared LibTwoLAME, but it gave me errors. Building a shared LibModplug proved more successful. FFmpeg's 'configure' didn't have any problems with it and finished without errors. LibOpenJPEG was the reason

Re: [FFmpeg-devel] [PATCH] libavfilter/scale: Populate ow/oh when using 0 as w/h

2017-06-12 Thread Kevin Mark
On Mon, Jun 12, 2017 at 9:42 PM, Michael Niedermayer wrote: > why is there a cast at all ? The cast is there because if you run this: ffmpeg -frames:v 5 -filter_complex "sws_flags=+accurate_rnd+bitexact;testsrc=size=320x240 [main];testsrc=size=640x360 [ref];[main][ref]

Re: [FFmpeg-devel] [PATCH] libavfilter/scale: Populate ow/oh when using 0 as w/h

2017-06-12 Thread Kevin Mark
Still interested in thoughts on this patch/discussion. Thanks, Kevin On Wed, Jun 7, 2017 at 3:54 AM, Kevin Mark wrote: > I also have to wonder if it would be advantageous to add the cast on > the right side as well. That way the var_values variables will have > the proper

[FFmpeg-devel] [PATCH] libavfilter/scale: Populate ow/oh when using 0 as w/h

2017-06-12 Thread Kevin Mark
The input width and height is known at parse time so there's no reason ow/oh should not be usable when using 0 as the width or height expression. Previously in "scale=0:ow" ow would be set to "0" which works, conveniently, as "scale=0:0" is perfectly valid input but this breaks down when you do

[FFmpeg-devel] [PATCH] doc/filters: Correct scale doc regarding w/h <= 0

2017-06-12 Thread Kevin Mark
According to libavfilter/scale.c, if the width and height are both less than or equal to 0 then the input size is used for both dimensions. It does not need to be -1. -1:-1 is the same as 0:0 which is the same as -10:-42, etc. if (w < 0 && h < 0) eval_w = eval_h = 0; The documentation for

Re: [FFmpeg-devel] [PATCH] avcodec/htmlsubtitles: Replace very slow redundant sscanf() calls by cleaner and faster code

2017-06-12 Thread wm4
On Sun, 11 Jun 2017 17:58:45 +0200 Michael Niedermayer wrote: > This reduces the worst case from O(n²) to O(n) time > > Fixes Timeout > Fixes: 2127/clusterfuzz-testcase-minimized-6595787859427328 > > Signed-off-by: Michael Niedermayer > --- >

Re: [FFmpeg-devel] [PATCH] libavformat/avio: fix retry_transfer_wrapper return value on error

2017-06-12 Thread Michael Niedermayer
On Fri, Jun 09, 2017 at 03:51:30PM +0200, Daniel Kucera wrote: > Signed-off-by: Daniel Kucera > --- > libavformat/avio.c | 6 -- > 1 file changed, 4 insertions(+), 2 deletions(-) causes fate to infinte loop for example fate-filter-volume [...] -- Michael

Re: [FFmpeg-devel] [PATCH 07/11] avfilter/vf_signature: fix memory leaks in error cases

2017-06-12 Thread Michael Niedermayer
On Sun, Jun 11, 2017 at 04:05:49PM +0200, Timo Rothenpieler wrote: > Fixes CIDs 1403234 and 1403235 > --- > libavfilter/vf_signature.c | 5 - > 1 file changed, 4 insertions(+), 1 deletion(-) LGTM thx PS: i wont review the remaining signature fix, as its not obvious to me if the condition

[FFmpeg-devel] [PATCH 05/24] ffmpeg: Generic device setup

2017-06-12 Thread Mark Thompson
Not yet enabled for any hwaccels. (cherry picked from commit d2e6dd32a445b5744a51d090c0822dbd7e434592) (cherry picked from commit 9203aac22874c7259e155b7d00f1f33bb1355129) --- Makefile | 2 +- ffmpeg.c | 18 +++ ffmpeg.h | 17 +++ ffmpeg_hw.c | 387

[FFmpeg-devel] [PATCH 09/24] vf_deinterlace_vaapi: Add support for field rate output

2017-06-12 Thread Mark Thompson
In order to work correctly with the i965 driver, this also fixes the direction of forward/backward references - forward references are intended to be those from the past to the current frame, not from the current frame to the future. (cherry picked from commit

[FFmpeg-devel] [PATCH 06/24] ffmpeg: Enable generic hwaccel support for VAAPI

2017-06-12 Thread Mark Thompson
(cherry picked from commit 62a1ef9f26c654a3e988aa465c4ac1d776c4c356) --- Makefile | 1 - ffmpeg.h | 2 - ffmpeg_opt.c | 20 - ffmpeg_vaapi.c | 233 - 4 files changed, 16 insertions(+), 240 deletions(-) delete mode

[FFmpeg-devel] [PATCH 11/24] qsvdec: Allow use of hw_device_ctx to make the internal session

2017-06-12 Thread Mark Thompson
(cherry picked from commit 8848ba0bd6b035af77d4f13aa0d8d9806fe8) --- libavcodec/qsvdec.c | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 74866b57ff..c00817f1d9 100644 --- a/libavcodec/qsvdec.c +++

[FFmpeg-devel] [PATCH 14/24] lavc: Add flag to allow profile mismatch with hardware decoding

2017-06-12 Thread Mark Thompson
(cherry picked from commit 64a5260c695dd8051509d3270295fd64eac56587) --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 14 ++ libavcodec/version.h | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index

[FFmpeg-devel] [PATCH 16/24] ffmpeg: Support setting the hardware device to use when filtering

2017-06-12 Thread Mark Thompson
This only supports one device globally, but more can be used by passing them with input streams in hw_frames_ctx or by deriving new devices inside a filter graph with hwmap. (cherry picked from commit e669db76108de8d7a36c2274c99da82cc94d1dd1) --- doc/ffmpeg.texi | 11 +++ ffmpeg.h

[FFmpeg-devel] [PATCH 07/24] ffmpeg: Enable generic hwaccel support for VDPAU

2017-06-12 Thread Mark Thompson
(cherry picked from commit aa6b2e081c504cb99f5e2e0ceb45295ef24bdac2) --- Makefile | 1 - ffmpeg.h | 1 - ffmpeg_opt.c | 4 +- ffmpeg_vdpau.c | 159 - 4 files changed, 2 insertions(+), 163 deletions(-) delete mode 100644

[FFmpeg-devel] [PATCH 13/24] vaapi_encode: Use gop_size consistently in RC parameters

2017-06-12 Thread Mark Thompson
The non-H.26[45] codecs already use this form. Since we don't currently generate I frames for codecs which support them separately to IDR, the p_per_i variable is set to infinity by default so that it doesn't interfere with any other calculation. (All the code for I frames still exists, and it

[FFmpeg-devel] [PATCH 12/24] qsvenc: Allow use of hw_device_ctx to make the internal session

2017-06-12 Thread Mark Thompson
(cherry picked from commit 3d197514e613ccd9eab43180c0a7c8b09a307606) --- libavcodec/qsvenc.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 64227cea6e..5eb506fb76 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -700,6