summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* avformat/Makefile: add missing pcm dependency to sdx demuxerLou Logan2019-11-041-1/+1
| | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
* avformat/Makefile: add missing pcm dependency to nsp demuxerLou Logan2019-11-041-1/+1
| | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
* avformat/Makefile: add missing pcm dependency to hcom demuxerLou Logan2019-11-041-1/+1
| | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
* configure: select riffdec for act demuxerLou Logan2019-11-041-0/+1
| | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
* configure: select jpegtables for rtp muxerLou Logan2019-11-041-1/+1
| | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
* tools/enum_options: replace the deprecated APIZhong Li2019-11-041-4/+6
| | | | Signed-off-by: Zhong Li <zhongli_dev@126.com>
* tools/probetest: replace the deprecated APIZhong Li2019-11-041-3/+5
| | | | Signed-off-by: Zhong Li <zhongli_dev@126.com>
* lavc/qsvenc: add the missing vp9 filezhongli_dev@126.com2019-11-041-0/+113
| | | | | | It is missed in commit 3358380 Signed-off-by: Zhong Li <zhongli_dev@126.com>
* lavf/asfdec: Simplify the check conditionsJun Zhao2019-11-041-1/+1
| | | | | | Simplify the check conditions Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
* lavf/mpegtsenc: fix logic check errorJun Zhao2019-11-041-1/+1
| | | | | | | | | fix the logic check error fix #6751 Reviewed-by: Andriy Gelman <andriy.gelman@gmail.com> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
* avformat/ftp: add AVOptions for authenticationNicolas Frattaroli2019-11-033-6/+25
| | | | | | | | | | | | | | | | | This introduces two new AVOption options for the FTP protocol, one named ftp-user to supply the username to be used for auth, one named ftp-password to supply the password to be used for auth. These are useful for when an API user does not wish to deal with URL manipulation and percent encoding. Setting them while also having credentials in the URL will use the credentials from the URL. The rationale for this is that credentials embedded in the URL are probably more specific to what the user is trying to do than anything set by some API user. Signed-off-by: Nicolas Frattaroli <ffmpeg@fratti.ch> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat: Add max_probe_packets optionAndriy Gelman2019-11-036-6/+16
| | | | | | | Allows user to set maximum number of buffered packets when probing a codec. It was a hard-coded parameter before this commit. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/qsvenc: enable vp9 encoderZhong Li2019-11-036-1/+76
| | | | | | | | | | 1. must enable low_power mode since just VDENC can be supported by iHD driver right now 2. Coding option1 and extra_data are not supported by MSDK 3. IVF header will be inserted in MSDK by default, but it is not needed for FFmpeg, so disable it. Signed-off-by: Zhong Li <zhongli_dev@126.com>
* lavc/qsvenc: Fix bitrate_limit to allow AVC encode in limited bitrateLinjie Fu2019-11-031-19/+19
| | | | | | | | | | | | | | | | MFXVideoENCODE_Query calls CheckVideoParamQueryLike in MSDK and will determine whether to set param.mfx.TargetKbps to the allowed minTargetKbps according to the bitrate_limit in extco2 buffer. Thus q->param.ExtParam must be set before MFXVideoENCODE_Query in case minTargetKbps is written to TargetKbps by default. 1080P AVC encoding with option "-bitrate_limit 0 -b:v 100k": Before patch: 902 kbps After patch: 156 kbps Signed-off-by: Linjie Fu <linjie.fu@intel.com>
* avcodec/v4l2_m2m: Fix indentationAndriy Gelman2019-11-011-1/+1
| | | | Signed-off-by: Aman Gupta <aman@tmm1.net>
* avcodec/v4l2_buffers: Fix infinite loopAndriy Gelman2019-11-011-5/+3
| | | | | | | | | | | | This part of the code counts the number of planes returned by the v4l2 device for each queried capture/output buffer. When testing the GPU h264 encoder on Nvidia's Jetson Nano, this caused an infinite loop because avbuf->buf.length included some empty buffers (i.e. where avbuf->buf.m.planes[i].length = 0), meaning that the counter was never incremented and break was never reached. This is fixed in the commit by using a well defined iteration range. Signed-off-by: Aman Gupta <aman@tmm1.net>
* tools/target_dec_fuzzer: Adjust threshold for G2MMichael Niedermayer2019-11-011-0/+1
| | | | | | | | | | | G2M allows large images from small input and also reallocates multiple buffers on any resolution change. Fixes: Timeout (22sec -> 5sec) Fixes: 18022/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5089192530411520 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/aptx: Check the number of channelsMichael Niedermayer2019-11-011-0/+3
| | | | | | | | Fixes: store to null pointer of type 'uint32_t' (aka 'unsigned int') Fixes: 18021/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APTX_HD_fuzzer-5761738313564160 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/rv10: Check input for minimal frame sizeMichael Niedermayer2019-11-011-2/+5
| | | | | | | | Fixes: Timeout (18sec -> 4sec) Fixes: 18012/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RV20_fuzzer-5767486145822720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/aacdec_template: Check samplerateMichael Niedermayer2019-11-011-0/+3
| | | | | | | | Fixes: signed integer overflow: 2 * 1881153568 cannot be represented in type 'int' Fixes: 17996/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5687126468853760 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/truemotion2: Fix several integer overflows in tm2_low_res_block()Michael Niedermayer2019-11-011-3/+3
| | | | | | | | Fixes: signed integer overflow: 1077952576 + 1355863565 cannot be represented in type 'int' Fixes: 16196/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5679842317565952 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/truemotion2: Fix several integer overflows with *Yo, *Uo, *VoMichael Niedermayer2019-11-011-8/+8
| | | | | | | | Fixes: signed integer overflow: 538976288 - -2080374792 cannot be represented in type 'int' Fixes: 16196/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5144044274974720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/utils: Check block_alignMichael Niedermayer2019-11-011-0/+5
| | | | | | | | | | | Fixes: out of array access Fixes: 18432/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMAV2_fuzzer-5675574936207360 Fixes: 18326/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMAV2_fuzzer-5071752362721280 Fixes: 18384/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMAV1_fuzzer-5769439500304384 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_lut3d: simplify codeLimin Wang2019-11-011-48/+6
| | | | | | | Signed-off-by: Limin Wang <lance.lmwang@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/swscale_unscaled: fix gbrap10be md5 different on big endian systemLimin Wang2019-11-011-0/+1
| | | | | | | | | | | | | | | | You can reproduce it by below command: ./ffmpeg -f lavfi -i "testsrc=duration=1:rate=30" -vf format=gbrap10 -vcodec rawvideo \ -pix_fmt gbrap10le -flags +bitexact -sws_flags +accurate_rnd+bitexact -fflags +bitexact \ -frames:v 1 -f nut md5: little-endian: f91e2edd8098276579c1929e5e160416 big-endian: ba4d011dbbdc78ccbf6cc7d698630929 Signed-off-by: Limin Wang <lance.lmwang@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavformat/flacenc: reject too big picture blocksMattias Wadman2019-11-011-2/+8
| | | | | | | | | | | | | | | | A too big picture will case the muxer to write a truncated block size (uint24) causing the output file to be corrupt. How to reproduce: Write a file with truncated block size: ffmpeg -y -f lavfi -i sine -f lavfi -i color=red:size=2400x2400 -map 0:a:0 -map 1:v:0 -c:v:0 bmp -disposition:1 attached_pic -t 1 test.flac Try to decode: ffmpeg -i test.flac test.wav Signed-off-by: Mattias Wadman <mattias.wadman@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/libtwolame: fix mono default bitrateJames Cowgill2019-11-011-2/+6
| | | | | | | | | | | | As of libtwolame 0.4.0, 384 kbps is not accepted as a valid bitrate for encoding mono audio and the maximum bitrate is now halved to 192 kbps to comply with the MP2 standard. Example error: twolame_init_params(): 384kbps is an invalid bitrate for mono encoding. Adjust the default bitrate calculation to take this into account. Signed-off-by: James Cowgill <jcowgill@debian.org>
* doc/filters: fix overlay_opencl document typoSteven Liu2019-11-011-1/+1
| | | | | Reported-by: Yabo Wei <weiyabo@kuaishou.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avfilter/vf_median: add radiusV optionPaul B Mahol2019-10-314-12/+21
|
* avfilter/af_afade: start crossfading only when first stream reached endPaul B Mahol2019-10-311-1/+1
|
* avformat/hlsenc: fix the av_dirname path isn't include separator in the end ↵Limin Wang2019-10-311-6/+10
| | | | | | | of string Reviewed-by: Liu Steven <lq@chinaffmpeg.org> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
* configure: fix standalone compilation of mxf muxerLou Logan2019-10-301-0/+1
| | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/apngenc: Add deinit functionAndreas Rheinhardt2019-10-301-4/+10
| | | | | | | | | | Prevents memleaks when the trailer is never written (e.g. when there was a write error when writing the header). Fixes ticket #8347. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avfilter/af_afade: check for eof after crossfade laterPaul B Mahol2019-10-301-6/+6
| | | | Fixes memleaks and #8346
* avcodec/mips: msa optimizations for vc1dspgxw2019-10-305-4/+514
| | | | | | | Performance of WMV3 decoding has speed up from 3.66x to 5.23x tested on 3A4000. Reviewed-by: Shiyou Yin <yinshiyou-hf@loongson.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/f_sidedata: fix Wtautological-constant-out-of-range-compareZhao Zhili2019-10-301-1/+1
| | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* FATE: add a test for freeezedetectLimin Wang2019-10-302-0/+255
| | | | | Signed-off-by: Limin Wang <lance.lmwang@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/filters: move drawgraph to video filters chapterPaul B Mahol2019-10-301-105/+110
|
* doc/filters: move agraphmonitor to multimedia filters chapterPaul B Mahol2019-10-301-1/+6
|
* avfilter/vf_sr: correct flags since the filter changes frame w/hGuo, Yejun2019-10-301-1/+0
| | | | | | | | If filter changes frame w/h, AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC cannot be supported. Signed-off-by: Guo, Yejun <yejun.guo@intel.com> Signed-off-by: Pedro Arthur <bygrandao@gmail.com>
* avfilter/dnn: add a new interface to query dnn model's input infoGuo, Yejun2019-10-303-1/+58
| | | | | | | | | | | | to support dnn networks more general, we need to know the input info of the dnn model. background: The data type of dnn model's input could be float32, uint8 or fp16, etc. And the w/h of input image could be fixed or variable. Signed-off-by: Guo, Yejun <yejun.guo@intel.com> Signed-off-by: Pedro Arthur <bygrandao@gmail.com>
* avfilter/dnn: get the data type of network output from dnn execution resultGuo, Yejun2019-10-308-13/+13
| | | | | | | | | | | so, we can make a filter more general to accept different network models, by adding a data type convertion after getting data from network. After we add dt field into struct DNNData, it becomes the same as DNNInputData, so merge them with one struct: DNNData. Signed-off-by: Guo, Yejun <yejun.guo@intel.com> Signed-off-by: Pedro Arthur <bygrandao@gmail.com>
* dnn: add tf.nn.conv2d support for native modelGuo, Yejun2019-10-306-18/+82
| | | | | | | | | | | | | Unlike other tf.*.conv2d layers, tf.nn.conv2d does not create many nodes (within a scope) in the graph, it just acts like other layers. tf.nn.conv2d only creates one node in the graph, and no internal nodes such as 'kernel' are created. The format of native model file is also changed, a flag named has_bias is added, so change the version number. Signed-off-by: Guo, Yejun <yejun.guo@intel.com> Signed-off-by: Pedro Arthur <bygrandao@gmail.com>
* doc: fix typo in muxers documentationAlfred E. Heggestad2019-10-301-1/+1
|
* avformat/hls: Set AVFMT_TS_DISCONT flag on HLS input formatPhilip Langdale2019-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | There have been many reports over the years about problems when taking an HLS stream as input to `ffmpeg` where there are timestamp discontinuities present. This is explicitly supported in the HLS spec (EXT-X-DISCONTINUITY) and often used for ad injection. Various fixes and work-arounds have been proposed over the years, but one step that seems obvious, even if it's not a complete fix, is to mark the HLS input format as supporting discontinuities. This will prevent timestamp fixup logic in ffmpeg.c kicking in that ends up mangling the timestamps unnecessarily. I've tested this out with an example provided by Joe Koberg early last year, and it is sufficient to allow `ffmpeg` to download and mux the stream correctly. Joe had briefly suggested that other situations can still be handled incorrectly, but this seems like a strict improvement. Joe's example: https://s3.amazonaws.com/playon-test-videos/discont_test_new/discont_test.m3u8 Reviewed-by: Steven Liu <lq@onvideo.cn> Reviewed-by: Dennis Mungai <dmngaie@gmail.com>
* vp4: prevent unaligned memory access in loop filterPeter Ross2019-10-304-6/+14
| | | | | | | | | | | | VP4 applies a loop filter during motion compensation, causing the block offset will often by unaligned. This produces a bus error on some platforms, namely ARMv7 NEON. This patch adds a unaligned version of the loop filter function pointer to VP3DSPContext. Reported-by: Mike Melanson <mike@multimedia.cx> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wmalosslessdec: Fix some integer anomaliesMichael Niedermayer2019-10-291-3/+3
| | | | | | | | | Fixes: left shift of negative value -341180 Fixes: 18401/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5686380134400000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/adpcm: Fix invalid shifts in ADPCM DTKMichael Niedermayer2019-10-291-1/+1
| | | | | | | | | Fixes: left shift of negative value -1 Fixes: 18397/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_DTK_fuzzer-5675653487132672 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/apedec: Only clear the needed buffer space, instead of allMichael Niedermayer2019-10-291-1/+1
| | | | | | | | | Fixes: Timeout (15sec -> 0.4sec) Fixes: 18396/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5730080487112704 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/asrc_anoisesrc: change color variable to intLimin Wang2019-10-291-1/+1
| | | | | | | | | | | | Or it'll cause invalid color and s->filter is NULL. Please reproduce it with below command on big endian system: $ ./ffmpeg -f lavfi -i "anoisesrc=d=60:c=1:r=48000" -f s16le -c:a pcm_s16le -f null - Segmentation fault (core dumped) Signed-off-by: Limin Wang <lance.lmwang@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
OpenPOWER on IntegriCloud