summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/cbs_h265_syntax_template: Check num_negative/positive_pics when ↵Michael Niedermayer2020-04-26
| | | | | | | | | | inter_ref_pic_set_prediction_flag is set Fixes: out of array access Fixes: 20446/clusterfuzz-testcase-minimized-ffmpeg_BSF_HEVC_METADATA_fuzzer-5707770718584832 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/intrax8: Check for end of bitstream in ff_intrax8_decode_picture()Michael Niedermayer2020-04-26
| | | | | | | | Fixes: Timeout (105sec -> 1sec) Fixes: 20479/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC1_fuzzer-5769846937878528 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/movenc: cosmeticsLimin Wang2020-04-26
| | | | | Signed-off-by: Limin Wang <lance.lmwang@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_pixscope: also show standard deviation of zoomed areaPaul B Mahol2020-04-26
|
* avcodec/dirac_vlc: Fix integer overflow in ff_dirac_golomb_read_32/16bit()Michael Niedermayer2020-04-25
| | | | | | | | | | | Fixes: left shift of 1073741824 by 1 places cannot be represented in type 'int32_t' (aka 'int') Fixes: 21245/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5683334274613248 Change to int16_t suggested by Lynne Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Lynne <dev@lynne.ee> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/bsf: simplify the codeLimin Wang2020-04-25
| | | | | Signed-off-by: Limin Wang <lance.lmwang@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* avfilter/f_interleave: no need to check for inlink eof if non-empty queuePaul B Mahol2020-04-25
| | | | Also set state to ready if there is any inlink with queued frame.
* avfilter/f_interleave: make sure that all frames in inlink queue are usedPaul B Mahol2020-04-25
|
* avfilter/f_interleave: add duration optionPaul B Mahol2020-04-25
|
* ffplay: set stream_index to -1 earlier to prevent segfaultPeter Ross2020-04-25
| | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Marton Balint <cus@passwd.hu>
* avcodec/vp9: prevent null pointer use on init_frames() failurePeter Ross2020-04-25
| | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: James Almer <jamrial@gmail.com>
* lavu/version: bump minor version for DOVI sidedataJun Zhao2020-04-25
| | | | | | | bump minor version for DOVI sidedata, because added the dovi_meta.h as lavu API part. Also update APIchanges. Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
* avcodec: add support for Cunning Developments' ADPCMZane van Iperen2020-04-24
| | | | | Signed-off-by: Zane van Iperen <zane@zanevaniperen.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnn-layer-mathbinary-test: Fix tests for cases with extra intermediate precisionMartin Storsjö2020-04-24
| | | | | | | | | | | | | | | | | | | | | This fixes tests on 32 bit x86 mingw with clang, which uses x87 fpu by default. In this setup, while the get_expected function is declared to return float, the compiler is (especially given the optimization flags set) free to keep the intermediate values (in this case, the return value from the inlined function) in higher precision. This results in the situation where 7.28 (which actually, as a float, ends up as 7.2800002098), multiplied by 100, is 728.000000 when really forced into a 32 bit float, but 728.000021 when kept with higher intermediate precision. For the multiplication case, a more suitable epsilon would e.g. be 2*FLT_EPSILON*fabs(expected_output), but just increase the current hardcoded threshold for now. Signed-off-by: Martin Storsjö <martin@martin.st>
* avcodec/mjpeg2jpeg_bsf: Remove unnecessary headerAndreas Rheinhardt2020-04-24
| | | | | | | | | | libavutil/mem.h is unneeded since 33d18982fa03feb061c8f744a4f0a9175c1f63ab, the commit that introduced the new packet-based bsf API, because with this switch the allocations were no longer performed directly, but by av_new_packet(). Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/noise_bsf: Remove unnecessary headersAndreas Rheinhardt2020-04-24
| | | | | | | | | | | | | | | With 33d18982fa03feb061c8f744a4f0a9175c1f63ab, the commit introducing the new packet-based bsf API, a new buffer was no longer allocated directly, but via av_new_packet(), so that libavutil/mem.h was no longer needed. Moreover since commit dc99ee6b08e54de13b4c82ff265609b6ab83e3d8 av_packet_make_writable() is employed which copies the data in case it is unavoidable so that string.h is no longer used (it was used for memcpy()). Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/dump_extradata_bsf: Remove unnecessary headerAndreas Rheinhardt2020-04-24
| | | | | | | | | | Since 33d18982fa03feb061c8f744a4f0a9175c1f63ab (the commit that introduced the new bsf API) allocating an enlarged buffer in case extradata needs to be added to a packet is done via av_new_packet(), so that libavutil/mem.h is no longer needed. Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/dca_core_bsf: Remove unnecessary headerAndreas Rheinhardt2020-04-24
| | | | | | | This bsf never needed libavutil/mem.h. Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/chomp_bsf: Remove unnecessary headerAndreas Rheinhardt2020-04-24
| | | | | | | This bsf never needed internal.h. Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/vp9_raw_reorder_bsf: Remove unnecessary headerAndreas Rheinhardt2020-04-24
| | | | | | | | | This bsf doesn't have any options, so including libavutil/opt.h is unnecessary. Reviewed-by: Peter Ross <pross@xvid.org> Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/mux: Remove unnecessary headersAndreas Rheinhardt2020-04-24
| | | | | | | | | | | mux.c was split from utils.c in 55f9037f38bc3beacb2f5a17408c1d24c077d7fd and during this split all headers were simply copied without checking if they were only needed in the part that stayed in utils.c (or whether these haeders were needed at all). As a result quite a lot of headers in mux.c are unnecessary. This commit removes them. Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/utils: Remove superfluous headersAndreas Rheinhardt2020-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stdarg.h has been included in 780d7897a9c9295b43f1f0e9b49a11f99cd402c3 for ff_url_join(). This header became unnecessary when this function was moved into a separate file in df9f22d42b0905385629a9d368bb5a1eef2b45ef. libavutil/pixdesc.h has been included for av_get_pix_fmt_name() in 603b8bc2a109978c8499b06d2556f1433306eca7 and is unused since commit 2fb7501938b7103624c9bef740ca498258cacdab that removed the stuff belonging to FF_API_FORMAT_PARAMETERS. Notice that this file still uses AV_PIX_FMT_NONE and that therefore the header libavutil/pixfmt.h has been included (this header is included in pixdesc.h as well as also in libavutil/internal.h which is also included). libavutil/time_internal.h has been included for gmtime_r() in commit e7dd97b5d8cd6ea150446591f37a5946e8ab7cfb; it is unused since commit b72a7b96f84e5f16dd93b60668aecfda99442c71 which basically moved the code making use of gmtime_r() to libavutil/dict.c to use in avpriv_dict_set_timestamp(). audiointerleave.h has been added in c26e58e32cf430f060209e0d6088181f4426b3ce because of ff_interleave_compare_dts() (at that time the muxing code was not split from utils.c yet); said function became static in commit 101e1f6ff90c3365bfde05469ae26d2ee7f71f3e, making this header redundant. metadata.h has been mostly included for what now resides in libavutil/dict.h. The stuff that now resides in metadata.h has only been used briefly: From commits ed7694d8cf4633da444237f4df7efc48936419d2 to d60a9f52eb42dc76dea9996c8ba3567ae98a9a04. riff.h has been added in 45da8124a09d0ac5f9d8174884584c5f80309d0c because riff.h once contained declarations for (ff_)codec_get_tag(). This was changed in bfe5454cd238b16e7977085f880205229103eccb. Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/webvttdec: Remove write-only variableAndreas Rheinhardt2020-04-23
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/r3d: Remove write-only arrayAndreas Rheinhardt2020-04-23
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* libavcodec/avpacket: Don't simply forward return value of av_dict_set()Andreas Rheinhardt2020-04-23
| | | | | | | | | | | The documentation of av_dict_set() states that values >= 0 indicate success, whereas av_packet_unpack_dictionary() implies that return values > 0 are impossible. So only forward the return value of av_dict_set() in av_packet_unpack_dictionary() on error. (Btw: av_dict_set() does currently not return values > 0.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avcodec/hevc_mp4toannexb_bsf: Check nalu_sizeMichael Niedermayer2020-04-23
| | | | | | | | Fixes: Timeout (29sec -> 5ms) Fixes: 20237/clusterfuzz-testcase-minimized-ffmpeg_BSF_HEVC_MP4TOANNEXB_fuzzer-5165615044362240 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavcodec/jpeg2000dec.c: ROI marker supportGautam Ramakrishnan2020-04-23
| | | | | | | | | This patch adds support for decoding images with a Region of Interest. Allows decoding samples such as p0_03.j2k. This patch should fix ticket #4681. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* scale_vulkan: take frame cropping parameters in account when scalingLynne2020-04-23
| | | | | Then sample_aspect_ratio line at the bottom was cargo-culted from the vaapi scaling filter, but its unnecesary.
* overlay_vulkan: add support for overlaying images with an alpha channelLynne2020-04-23
|
* configure: enable ffnvcodec, nvenc, nvdec for aarch64ManojGuptaBonda2020-04-23
| | | | | | | Adding the support to build FFMPEG with HW accelerated decode(nvdec) and encode on aarch64 architecture. Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* avformat/mpegtsenc: use av_log_once for data stream warningGyan Doshi2020-04-23
|
* doc/APIChanges: add AV_PKT_DATA_DOVI_CONF entryJun Zhao2020-04-23
| | | | Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
* lavc/version: bump minor version for DOVI sidedataJun Zhao2020-04-23
| | | | Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
* lavf/movenc: enable dvcC/dvvC box support from DOVI sidedataJun Zhao2020-04-23
| | | | | | enable dvcC/dvvC box support from DOVI sidedata. Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
* fftools/ffprobe: support DOVI sidedataJun Zhao2020-04-23
| | | | | | support DOVI sidedata. Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
* lavf/dump: dump DOVI side dataJun Zhao2020-04-23
| | | | | | dump DOVI side data. Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
* lavf/mov: support dvcC/dvvC box for DOVIvacingfang2020-04-23
| | | | | | | | | | | support dvcC/dvcC box from spec Dolby Vision Streams Within the ISO Base MediaFile Format Version 2.1.2 (https://www.dolby.com/in/en/technologies/dolby-vision/dolby-vision\ -bitstreams-within-the-iso-base-media-file-format-v2.1.2.pdf) export the DOVI information to sidedata. Signed-off-by: vacingfang <vacingfang@tencent.com>
* lavf/mpegts: support DOVI Video Stream Descriptorvacingfang2020-04-23
| | | | | | | | | | | | | support DOVI Video Stream Descriptor from Dolby Vision Streams Within the MPEG-2 Transport Stream Format V1.2 From the spec: https://www.dolby.com/us/en/technologies/\ dolby-vision/dolby-vision-bitstreams-in-mpeg-2-transport-\ stream-multiplex-v1.2.pdf. export the DOVI information with sidedata. Signed-off-by: vacingfang <vacingfang@tencent.com>
* lavutil: add DOVI related headervacingfang2020-04-23
| | | | | | add DOVI related struct Signed-off-by: vacingfang <vacingfang@tencent.com>
* lavc: add a new sidedata type for DOVIJun Zhao2020-04-23
| | | | | | add a new sidedata type for DOVI. Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
* mpeg4videoenc: Don't crash with -fsanitize=boundsVitaly Buka2020-04-22
| | | | | | Also the patch makes this code consistent with mpeg4videodec.c Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavcodec/jpeg2000dec.c: Support for CRG markerGautam Ramakrishnan2020-04-22
| | | | | | | | This patch adds support to skip the CRG marker. The CRG marker, is an informational marker. Allows samples such as p0_03.j2k to be decoded. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/iff: Check length before memcpy() in decode_deep_rle32()Michael Niedermayer2020-04-22
| | | | | | | | Fixes: out of array read Fixes: 20796/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5111364702175232.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/iff: Fix invalid pointer intermediates in decode_deep_rle32()Michael Niedermayer2020-04-22
| | | | | Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavd/avfoundation.m: Do not use transport controls for screen capture devices.Thilo Borgmann2020-04-22
|
* lavd/avfoundation.m: Remove transport controls for iOS.Thilo Borgmann2020-04-22
|
* avformat/mpegtsenc: don't print warning for DVB text streamsGyan Doshi2020-04-22
| | | | They can be demuxed by ffmpeg.
* dnn-layer-mathbinary-test: add unit test for divideGuo, Yejun2020-04-22
| | | | Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
* dnn/native: add native support for divideGuo, Yejun2020-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it can be tested with model file generated with below python script: import tensorflow as tf import numpy as np import imageio in_img = imageio.imread('input.jpg') in_img = in_img.astype(np.float32)/255.0 in_data = in_img[np.newaxis, :] x = tf.placeholder(tf.float32, shape=[1, None, None, 3], name='dnn_in') z1 = 2 / x z2 = 1 / z1 z3 = z2 / 0.25 + 0.3 z4 = z3 - x * 1.5 - 0.3 y = tf.identity(z4, name='dnn_out') sess=tf.Session() sess.run(tf.global_variables_initializer()) graph_def = tf.graph_util.convert_variables_to_constants(sess, sess.graph_def, ['dnn_out']) tf.train.write_graph(graph_def, '.', 'image_process.pb', as_text=False) print("image_process.pb generated, please use \ path_to_ffmpeg/tools/python/convert.py to generate image_process.model\n") output = sess.run(y, feed_dict={x: in_data}) imageio.imsave("out.jpg", np.squeeze(output)) Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
* dnn-layer-mathbinary-test: add unit test for 'mul'Guo, Yejun2020-04-22
| | | | Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 00:26:58 +0000