summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '90adbf4abf336f8042aecdf1e18fdf76a96304b1'James Almer2019-02-20
|\ | | | | | | | | | | | | * commit '90adbf4abf336f8042aecdf1e18fdf76a96304b1': cook: Use the correct table for 6-bit stereo coupling Merged-by: James Almer <jamrial@gmail.com>
| * cook: Use the correct table for 6-bit stereo couplingLuca Barbato2019-01-17
| | | | | | | | Thanks to Kostya for digging it out and telling me.
* | Merge commit '70ab2778be9c83dab84340af7e3ba83fa0f98576'James Almer2019-02-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70ab2778be9c83dab84340af7e3ba83fa0f98576': libdav1d: update API usage to the first stable release libdav1d: fix build after a recent API break qsvenc: Add VDENC support for H264 and HEVC avcodec: libdav1d AV1 decoder wrapper. swscale: Add GRAY10 pixfmt: Add GRAY10 libx264: Pass the reordered_opaque field through the encoder libavutil: Undeprecate the AVFrame reordered_opaque field libaom: remove references to yuva444p pixfmt Revert "decode: copy the output parameters from the last bsf in the chain back to the AVCodecContext" This commit is a noop, see 87588caf8cff318cd022ad5002304198c6ddbd51 4e9cff2824769e792c7867b09e1efb67278abe79 882ae091d48b112004b977314884176841f12cef 3f1b5ca22ec372bc6d4a45694e3070b8f5d05ad3 b5177c7051d1bece9e26d78c9978599334e90836 beaa350e24167f4ff31275a6114693f5ce7cd409 e92ce340e63058de32aec733b59fe2b196bed214 Merged-by: James Almer <jamrial@gmail.com>
| * libdav1d: update API usage to the first stable releaseJames Almer2018-12-12
| | | | | | | | | | | | | | | | | | | | | | | | The color fields were moved to another struct, and a way to propagate timestamps and other input metadata was introduced, so the packet fifo can be removed. Add support for 12bit streams, an option to disable film grain, and read the profile from the sequence header referenced by the ouput picture instead of guessing based on output pix_fmt. Signed-off-by: James Almer <jamrial@gmail.com>
| * libdav1d: fix build after a recent API breakJames Almer2018-11-14
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
| * qsvenc: Add VDENC support for H264 and HEVCLinjie Fu2018-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add VDENC(lowpower mode) support for QSV h264 and HEVC It's an experimental function(like lowpower in vaapi) with some limitations: - CBR/VBR require HuC which should be explicitly loaded via i915 module parameter(i915.enable_guc=2 for linux kerner version >= 4.16) - HEVC VDENC was supported >= ICE LAKE use option "-low_power 1" to enable VDENC. Signed-off-by: Linjie Fu <linjie.fu@intel.com>
| * avcodec: libdav1d AV1 decoder wrapper.James Almer2018-11-06
| | | | | | | | | | | | | | Originally written by Ronald S. Bultje, with fixes, optimizations and improvements by James Almer. Signed-off-by: James Almer <jamrial@gmail.com>
| * swscale: Add GRAY10Carl Eugen Hoyos2018-11-06
| | | | | | | | | | | | Based on ab839054 by Luca Barbato. Signed-off-by: James Almer <jamrial@gmail.com>
| * pixfmt: Add GRAY10Carl Eugen Hoyos2018-11-06
| | | | | | | | | | | | Based on 7471352f by Luca Barbato. Signed-off-by: James Almer <jamrial@gmail.com>
| * libx264: Pass the reordered_opaque field through the encoderMartin Storsjö2018-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | libx264 does have a field for opaque data to pass along with frames through the encoder, but it is a pointer, while the libavcodec reordered_opaque field is an int64_t. Therefore, allocate an array within the libx264 wrapper, where reordered_opaque values in flight are stored, and pass a pointer to this array to libx264. Update the public libavcodec documentation for the AVCodecContext field to explain this usage, and add a codec capability that allows detecting whether an encoder handles this field. Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavutil: Undeprecate the AVFrame reordered_opaque fieldMartin Storsjö2018-11-05
| | | | | | | | | | | | | | | | This was marked as deprecated (but only in the doxygen, not with an actual deprecation attribute) in 81c623fae05 in 2011, but was undeprecated in ad1ee5fa7. Signed-off-by: Martin Storsjö <martin@martin.st>
| * libaom: remove references to yuva444p pixfmtJames Almer2018-10-27
| | | | | | | | | | | | | | | | | | Support for it was apparently never in the codebase, and the enum value was recently removed from the public headers [1] [1] https://aomedia.googlesource.com/aom/+/f1570f0c2f70832dd170285f8de60bd2379c8efa Signed-off-by: James Almer <jamrial@gmail.com>
| * Revert "decode: copy the output parameters from the last bsf in the chain ↵James Almer2018-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | back to the AVCodecContext" This reverts commit 662558f985f50834eebe82d6b6854c66f33ab320. The avcodec_parameters_to_context() call was freeing and reallocating AVCodecContext->extradata, essentially taking ownership of it, which according to the doxy is user owned. This is an API break and has produces crashes in some library users like Firefox. Revert until a better solution is found to internally propagate the filtered extradata back into the decoder context. Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '1ff6cb2ca6652e7d2a929afd33d8ed6268c45568'James Almer2019-02-20
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1ff6cb2ca6652e7d2a929afd33d8ed6268c45568': lavc/qsvenc_jpeg: set a default quality lavc/qsvenc_jpeg: add async_depth support This commit is a noop, see 0e3d7d845d9b4596c0dac1f6e99c493af07308ae 92c25963e8b68c47055b813334eaf76599936a90 Merged-by: James Almer <jamrial@gmail.com>
| * lavc/qsvenc_jpeg: set a default qualityZhong Li2018-10-13
| | | | | | | | | | | | | | Keep alignment with vaapi mjpeg encoder. Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * lavc/qsvenc_jpeg: add async_depth supportZhong Li2018-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently qsv (m)jpeg encoding is broken. Regression introducing by the commit(id: c1bcd3): fix async support, which requires the minimum async_depth to be 1, instead previous zero. But the default async_depth of qsv (m)jpeg encoding is still initialized (mostly) as zero. This patch also abviously improves qsv (m)jpeg encoding performance due to the default async_depth is changed to 4. Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5584abf69d83169a010aca404cd1cf95c23ad9ef'James Almer2019-02-20
|\| | | | | | | | | | | | | * commit '5584abf69d83169a010aca404cd1cf95c23ad9ef': arm: Emit .thumb_func directives Merged-by: James Almer <jamrial@gmail.com>
| * arm: Emit .thumb_func directivesMartin Storsjö2018-10-12
| | | | | | | | | | | | | | | | | | | | | | Prior to Xcode 9.3, the clang built-in assembler didn't support altmacro, and gas-preprocessor was used for assembling for arm/darwin. For thumb functions, gas-preprocessor took care of adding the .thumb_func directives, but when now being able to assemble without gas-preprocessor, we need to add these directives ourselves. Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc/libav-merge: add a line about the previous skipped mergeJames Almer2019-02-20
| |
* | Merge commit '04e8b8b0530e2aa33010faba3d0b6b6c9c5b704e'James Almer2019-02-20
|\| | | | | | | | | | | | | | | | | | | * commit '04e8b8b0530e2aa33010faba3d0b6b6c9c5b704e': avcodec/libaomenc: export the Sequence Header OBU as extradata This commit is a noop. aom_codec_get_global_headers() is buggy at the moment. See https://bugs.chromium.org/p/aomedia/issues/detail?id=2208 Merged-by: James Almer <jamrial@gmail.com>
| * avcodec/libaomenc: export the Sequence Header OBU as extradataJames Almer2018-10-11
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '97c9a5084479eeb66f4beb100cc7589a2c8bfe81'James Almer2019-02-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97c9a5084479eeb66f4beb100cc7589a2c8bfe81': avcodec/libaomenc: remove AVOption related to frame partitions avcodec/extract_extradata: don't uninitialize the H2645Packet on every processed packet avcodec/extract_extradata: Move the reference in the bsf internal buffer avcodec/extract_extradata: Do not allocate more space than needed when removing NALUs in h264/hevc avcodec/extract_extradata: Zero-initialize the padding bytes in all allocated buffers avcodec/extract_extradata_bsf: Fix leak discovered via fuzzing avcodec/bsf: Add ff_bsf_get_packet_ref() function This commit is a noop, see 7ae52f8a6b4a137f79b032b7094b3d5867839d52 5a412a5c3cc216ae1d15e6b884bda7214b73a5b0 d168e78effd170377ec57f67bca05c9f0de91bca 2536bd863246218631ab27144d8a3be45036445a 9c6dd9d6248897a2d8dd4ede948c166e5a579a4b 016d40011ac2815157fc11f6dda2f9bfb520ecfe b69ea742ab23ad74b2ae2772764743642212a139 Merged-by: James Almer <jamrial@gmail.com>
| * avcodec/libaomenc: remove AVOption related to frame partitionsJames Almer2018-10-11
| | | | | | | | | | | | | | | | | | | | Support for it was apparently never in the codebase, and the enum value was recently removed from the public headers [1] [1] https://aomedia.googlesource.com/aom/+/df4ffb73140fe31bebdabd17c1a7b53721e74838 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avcodec/extract_extradata: don't uninitialize the H2645Packet on every ↵James Almer2018-10-06
| | | | | | | | | | | | | | | | | | | | | | processed packet Based on hevc_parser code. This prevents repeated unnecessary allocations and frees on every packet processed by the bsf. Reviewed-by: Jun Zhao <mypopydev@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avcodec/extract_extradata: Move the reference in the bsf internal bufferJames Almer2018-10-06
| | | | | | | | | | | | | | | | There is no need to allocate a new packet for it. Reviewed-by: Mark Thompson <sw@jkqxz.net> Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avcodec/extract_extradata: Do not allocate more space than needed when ↵James Almer2018-10-06
| | | | | | | | | | | | | | removing NALUs in h264/hevc Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avcodec/extract_extradata: Zero-initialize the padding bytes in all ↵James Almer2018-10-06
| | | | | | | | | | | | | | | | allocated buffers Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avcodec/extract_extradata_bsf: Fix leak discovered via fuzzingNikolas Bowe2018-10-03
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * avcodec/bsf: Add ff_bsf_get_packet_ref() functionJan Sebechlebsky2018-10-03
| | | | | | | | | | | | | | | | | | Use of this function can save unnecessary malloc operation in bitstream filter. Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | aarch64: vp8: Move the vp8dsp makefile entries to the right placesMartin Storsjö2019-02-19
| | | | | | | | | | | | | | | | | | | | | | | | Even if NEON would be disabled, the init functions should be built as they are called as long as ARCH_AARCH64 is set. These functions are part of a generic DSP subsytem, not tied directly to one decoder. (They should be built if the vp7 decoder is enabled, even if the vp8 decoder is disabled.) Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit b4b27dce95a6d40bfcd78043d3abec7d80dae143)
* | aarch64: vp8: Remove superfluous includesMartin Storsjö2019-02-19
| | | | | | | | | | | | | | This fixes building with MSVC, which lacks unistd.h. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit ad32f7b1264dbc614f0db1c443d5361420e9e07e)
* | aarch64: vp8: Fix assembling with armasm64Martin Storsjö2019-02-19
| | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 2eeac79936e83c4495cbe5905064ab797e9b45ff)
* | aarch64: vp8: Fix assembling with clangMartin Storsjö2019-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also partially fixes assembling with MS armasm64 (via gas-preprocessor). The movrel macro invocations need to pass the offset via a separate parameter. Mach-o and COFF relocations don't allow a negative offset to a symbol, which is handled properly if the offset is passed via the parameter. If no offset parameter is given, the macro evaluates to something like "adrp x17, subpel_filters-16+(0)", which older clang versions also fail to parse (the older clang versions only support one single offset term, although it can be a parenthesis. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 26d7af4c381ee3c7b13b032b3817168b84b98ca6)
* | palettegen: Fill with last color, not blackTomas Härdin2019-02-19
| | | | | | | | | | | | If we fill with black then the generated palette will have one color more than what the user requested. This also resulted in unwanted black specks in the output of paletteuse, especially when generating small palettes.
* | libavcodec/zmbvenc: motion estimation improvements/bug fixes:Matthew Fearnley2019-02-19
| | | | | | | | | | | | | | | | - Clamp ME range to -64..63 (prevents corruption when me_range is too high) - Allow MV's up to *and including* the positive range limit - Allow out-of-edge ME by padding the prev buffer with a border of 0's - Try previous MV before checking the rest (improves speed in some cases) - More robust logic in code - ensure *mx,*my,*xored are updated together
* | libavcodec/zmbvenc: block scoring improvements/bug fixesMatthew Fearnley2019-02-19
| | | | | | | | | | | | | | | | - Improve block choices by counting 0-bytes in the entropy score - Make histogram use uint16_t type, to allow byte counts from 16*16 (current block size) up to 255*255 (maximum allowed 8bpp block size) - Make sure score table is big enough for a full block's worth of bytes - Calculate *xored without using code in inner loop
* | lavc/libdavs2: fix parameter setting errorhwren2019-02-19
| | | | | | | | Signed-off-by: hwrenx <hwrenx@126.com>
* | lavc/libxavs2: use upper layer qp parameters firsthwren2019-02-19
| | | | | | | | Signed-off-by: hwrenx <hwrenx@126.com>
* | lavc/libxavs2: remove unused context parameterhwren2019-02-19
| | | | | | | | Signed-off-by: hwrenx <hwrenx@126.com>
* | lavf/mpeg: fix indentXiaofeng Wang2019-02-18
| | | | | | | | | | Signed-off-by: Xiaofeng Wang <xiaofeng.wang@bqvision.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/matroskadec: Check parents remaining lengthSteve Lhomme2019-02-17
| | | | | | | | | | This was found through the Hacker One program on VLC but is not a security issue in libavformat Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/webmdashenc: Check id in adaption_setsMichael Niedermayer2019-02-17
| | | | | | | | | | | | | | Fixes: out of array access Found-by: Wenxiang Qian Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/http: Fix Out-of-Bounds access in process_line()Wenxiang Qian2019-02-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/ftp: Fix Out-of-Bounds Access and Information Leak in ftp.c:393Wenxiang Qian2019-02-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/htmlsubtitles: Fixes denial of service due to use of sscanf in inner ↵Kevin Backhouse via RT2019-02-17
| | | | | | | | | | | | | | | | | | loop for handling braces Fixes: [Semmle Security Reports #19439] Fixes: dos_sscanf2.mkv Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/htmlsubtitles: Fixes denial of service due to use of sscanf in inner ↵Kevin Backhouse via RT2019-02-17
| | | | | | | | | | | | | | | | | | loop for tag scaning Fixes: [Semmle Security Reports #19438] Fixes: dos_sscanf1.mkv Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpegvideo_enc: Use av_assert1() instead of assert()Michael Niedermayer2019-02-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/matroskadec: Do not leak queued packets on sync errorsMichael Niedermayer2019-02-17
| | | | | | | | | | | | | | | | | | Fixes: memleak Fixes: clusterfuzz-testcase-minimized-audio_decoder_fuzzer-5649187601121280 Reported-by: Chris Cunningham <chcunningham@google.com> Tested-by: Chris Cunningham <chcunningham@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/fftools-common-opts: add example for codec option stream specifiersGyan Doshi2019-02-17
| |
* | doc/muxers: grammar fixReto Kromer2019-02-17
| | | | | | | | Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>