Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-01avutil/common: Fix integer overflow in av_ceil_log2_c()Michael Niedermayer
Fixes: left shift of 1913647649 by 1 places cannot be represented in type 'int' Fixes: 23572/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5082619795734528 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e409262837712016097c187e97bf99aadf6a4cdf) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-07-01avutil/lfg: Correct index increment type to avoid undefined behaviorMichael Niedermayer
Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 18333/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_COMFORTNOISE_fuzzer-5668481831272448 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6014bcf1b74e903f535461ade4aa5fb44dbf5d8b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-11-11avutil/lfg: Document the AVLFG structMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d6fea2ef221a2f438cc55e82c61d0375750edf94) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-11-11avutil/softfloat_ieee754: Fix odd bit position for exponent and sign in ↵Michael Niedermayer
av_bits2sf_ieee754() Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 82e389d066923412dd945543418e8cb6c63d0997) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-11-11avutil/avstring: Fix bug and undefined behavior in av_strncasecmp()Michael Niedermayer
The function in case of n=0 would read more bytes than 0. The end pointer could be beyond the allocated space, which is undefined. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6f0e9a863466bfcbd75ee15d4d8a6aad2a5126a4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-07-23avutil/mem: Fix invalid use of av_alloc_sizeMark Harris
The alloc_size attribute is valid only on functions that return a pointer. GCC 9 (not yet released) warns about invalid usage: ./libavutil/mem.h:342:1: warning: 'alloc_size' attribute ignored on a function returning int' [-Wattributes] 342 | av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size); | ^~~~~~~~~~~~~ Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 4361293fcf59edb56879c36edcd25f0a91e0edf8)
2019-03-21avutil/imgutils: Optimize memset_bytes() by using av_memcpy_backptr()Michael Niedermayer
This is strongly based on code by Marton Balint, and depends on the previous commit Fixes: Timeout Fixes: 11502/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5664893810769920 Before: Executed clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5664893810769920 in 11209 ms After: Executed clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5664893810769920 in 4104 ms Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f64c0dffa13e6263de3fdff0058ab2fdb03ac1d6) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-03-21avutil/mem: Optimize fill32() by unrolling and using 64bitMichael Niedermayer
Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 12b1338be376a3e5fb606d9fe41b58dc4a9e62c7) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-11-03avutil/integer: Fix integer overflow in av_mul_i()Michael Niedermayer
Found-by: fate Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3cc3cb663bf3061e40356392d2f7638de6a479fe) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-10-07avutil/pixfmt: Document chroma plane size for odd resolutionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit be0b77e6e83b61c2da338201b5ddfae1c9acedc5) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-06-15avutil/common: Fix undefined behavior in av_clip_uintp2_c()Michael Niedermayer
Fixes: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself Fixes: 8521/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5639024952737792 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit aa41d322be71106ce147445f2b42bb763f1eff86) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-28hwcontext_vaapi: Fix compilation with libva versions < 1.4.0Mark Thompson
The BufferHandle API was added in libva 1.4.0 / VAAPI 0.36.0. (cherry picked from commit 92a0a6bea9dc3087fa8d232b750db1dd0d70b157)
2018-04-16Bump minor versions for branching release/4.0Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-15avutil/random_seed: use bcrypt instead of the old wincrypt APISteve Lhomme
Remove the wincrypt API calls since we don't support XP anymore and bcrypt is available since Vista, even on Windows Store builds. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2018-04-14Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'James Almer
* commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce': Drop Windows XP support remnants Merged-by: James Almer <jamrial@gmail.com>
2018-04-14Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'James Almer
* commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42': qsv: adding Multi Frame Encode support Merged-by: James Almer <jamrial@gmail.com>
2018-04-09Drop Windows XP support remnantsDiego Biurrun
2018-04-08qsv: adding Multi Frame Encode supportMaxym Dmytrychenko
Starting from API 1.25 helps to improve performance of the simultaneous encode, 1:N scenario, like: ./avconv -y -hwaccel qsv -c:v h264_qsv -r 30000/1001 -i ~/bbb_sunflower_1080p_60fps_normal.mp4 -vframes 600 -an \ -filter_complex "split=2[s1][s2]; [s1]scale_qsv=1280:720[o1]; [s2]scale_qsv=960:540[o2]" \ -map [o1] -c:v h264_qsv -b:v 3200k -minrate 3200k -maxrate 3200k -f rawvideo /tmp/3200a.264 \ -map [o2] -c:v h264_qsv -b:v 1750k -minrate 1750k -maxrate 1750k -f rawvideo /tmp/1750a.264 Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
2018-04-03avutil/pixdesc: deprecate AV_PIX_FMT_FLAG_PSEUDOPALwm4
PSEUDOPAL pixel formats are not paletted, but carried a palette with the intention of allowing code to treat unpaletted formats as paletted. The palette simply mapped the byte values to the resulting RGB values, making it some sort of LUT for RGB conversion. It was used for 1 byte formats only: RGB4_BYTE, BGR4_BYTE, RGB8, BGR8, GRAY8. The first 4 are awfully obscure, used only by some ancient bitmap formats. The last one, GRAY8, is more common, but its treatment is grossly incorrect. It considers full range GRAY8 only, so GRAY8 coming from typical Y video planes was not mapped to the correct RGB values. This cannot be fixed, because AVFrame.color_range can be freely changed at runtime, and there is nothing to ensure the pseudo palette is updated. Also, nothing actually used the PSEUDOPAL palette data, except xwdenc (trivially changed in the previous commit). All other code had to treat it as a special case, just to ignore or to propagate palette data. In conclusion, this was just a very strange old mechnaism that has no real justification to exist anymore (although it may have been nice and useful in the past). Now it's an artifact that makes the API harder to use: API users who allocate their own pixel data have to be aware that they need to allocate the palette, or FFmpeg will crash on them in _some_ situations. On top of this, there was no API to allocate the pseuo palette outside of av_frame_get_buffer(). This patch not only deprecates AV_PIX_FMT_FLAG_PSEUDOPAL, but also makes the pseudo palette optional. Nothing accesses it anymore, though if it's set, it's propagated. It's still allocated and initialized for compatibility with API users that rely on this feature. But new API users do not need to allocate it. This was an explicit goal of this patch. Most changes replace AV_PIX_FMT_FLAG_PSEUDOPAL with FF_PSEUDOPAL. I first tried #ifdefing all code, but it was a mess. The FF_PSEUDOPAL macro reduces the mess, and still allows defining FF_API_PSEUDOPAL to 0. Passes FATE with FF_API_PSEUDOPAL enabled and disabled. In addition, FATE passes with FF_API_PSEUDOPAL set to 1, but with allocation functions manually changed to not allocating a palette.
2018-03-30Merge commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a'James Almer
* commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a': arm: Produce .const_data instead of .section .rodata for Mach-O Merged-by: James Almer <jamrial@gmail.com>
2018-03-30arm: Produce .const_data instead of .section .rodata for Mach-OMartin Storsjö
This is the same combination of .section directives as used in aarch64/asm.S. Since Xcode 9.3, the bundled clang supports altmacro and doesn't require using gas-preprocessor any longer. Signed-off-by: Martin Storsjö <martin@martin.st>
2018-03-30Merge commit '86499771d1228d8303c8eb6509e20c0caaa02da5'James Almer
* commit '86499771d1228d8303c8eb6509e20c0caaa02da5': qsv: align surface width/height to 16. Merged-by: James Almer <jamrial@gmail.com>
2018-03-28hwcontext_d3d11: Fix crash with valid adapter but no deviceMark Thompson
This crash was introduced by 8bbf2dacbfb4ead1535dea411035994f507f517d, which could incorrectly overwrite the failure result from creating the device. Fixes ticket #7108. Reviewed-by: wm4 <nfxjfg@googlemail.com>
2018-03-24avcodec/avcodec.h: Add encryption info side data.Jacob Trimble
This new side-data will contain info on how a packet is encrypted. This allows the app to handle packet decryption. Signed-off-by: Jacob Trimble <modmaker@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-23hwcontext_opencl: Add support for mapping DRM objects to BeignetMark Thompson
Also use that to support mapping VAAPI to Beignet.
2018-03-23hwcontext_vaapi: Pass correct read/write flags when exporting surfacesMark Thompson
2018-03-23hwcontext_vaapi: Add support for legacy DRM mappingMark Thompson
The old vaAcquireBufferHandle() API works in fewer cases and provides less information than the current vaExportSurfaceHandle(), but it exists on older versions and is already used by the OpenCL code.
2018-03-23hwcontext_drm: Clarify value for unknown format modifiersMark Thompson
2018-03-23hwcontext_opencl: Avoid deprecation warnings when built with post-1.2 headersMark Thompson
Matching the previous commit. This is not applied to the installed header because it could incorrectly suppress the warning inside user programs.
2018-03-21qsv: align surface width/height to 16.Ruiling Song
Per MediaSDK documentation, it requires width/height to 16 alignment. Without this patch, hwupload pipeline may fail if 16 alignment is not met. Although this patch also apply 16 alignment to qsv encoder/decoder, it will not bring any side-effect to them as they are already aligned. Signed-off-by: Ruiling Song <ruiling.song@intel.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2018-03-21avutil/integer: move the test to the corresponding subdirectoryJames Almer
And actually enable it. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2018-03-18hwcontext_vaapi: Always include DRM hwcontext headerMark Thompson
Fixes building with VAAPI but not libdrm, which was broken by 389f4c3e0d0a26a7d3d2696017384874cf5e93fa. Just unconditionally include the header, since it doesn't depend on libdrm being present.
2018-03-18hwcontext_vaapi: Fix condition for DRM device derivationMark Thompson
vaGetDisplayDRM() is required for this code to work, libdrm is not.
2018-03-18lavu/frame: add QP side datawm4
This adds a way for an API user to transfer QP data and metadata without having to keep the reference to AVFrame, and without having to explicitly care about QP APIs. It might also provide a way to finally remove the deprecated QP related fields. In the end, the QP table should be handled in a very similar way to e.g. AV_FRAME_DATA_MOTION_VECTORS. There are two side data types, because I didn't care about having to repack the QP data so the table and the metadata are in a single AVBufferRef. Otherwise it would have either required a copy on decoding (extra slowdown for something as obscure as the QP data), or would have required making intrusive changes to the codecs which support export of this data. The new side data types are added under deprecation guards, because I don't intend to change the status of the QP export as being deprecated (as it was before this patch too).
2018-03-18lavu/frame: fix inconsistent qp_table_buf deprecationwm4
Everything related to the QP data is deprecated, with qp_table_buf being an inconsistent exception. Some parts were under the deprecation guards, some not. It probably didn't even compile.
2018-03-16avutil/log: print level prefix also when no AVClass context is availableTobias Rapp
Adds the level prefix to all log messages, except those with level <= AV_LOG_QUIET as they seem to be used for flushing the log buffer. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2018-03-16avutil: bump version after the latest AVOption flag additionJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2018-03-16lavu/opt: add bit stream filter option dump support.Jun Zhao
enable dump bit stream filter and update opt fate test ref. Signed-off-by: Jun Zhao <mypopydev@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-16lavu/opt: add AV_OPT_FLAG_BSF_PARAMJun Zhao
add AV_OPT_FLAG_BSF_PARAM for bit stream filter options. Signed-off-by: Jun Zhao <mypopydev@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-10avutil: add missing version bump for AV_CRC_8_EBUJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2018-03-10avutil/parseutils: only accept full us duration, do not accept mss durationMarton Balint
Accepting 'u' suffix for a time specification is neither intuitive nor consistent (now that we don't accept m). Also there was a bug in the code accepting an extra 's' even after 'ms'. Signed-off-by: Marton Balint <cus@passwd.hu>
2018-03-08crc: add AV_CRC_8_SBC as a 8 bits CRC with polynomial 0x1DAurelien Jacobs
2018-03-06Merge commit '8ca39b855a7b0e4d9f726fa9d285bc8edcb953e6'Mark Thompson
* commit '8ca39b855a7b0e4d9f726fa9d285bc8edcb953e6': qsv: Default PicStruct to progressive Merged-by: Mark Thompson <sw@jkqxz.net>
2018-03-05parseutils: accept only full "ms" suffixRostislav Pehlivanov
The commit which added those was pushed prematurely before anyone could object to illogical suffixes like just m for milliseconds. Without this, we'd be locked into never being able to implement the "m" suffix for minutes. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2018-03-03parseutils: add support for ms and us suffix for AV_OPT_TYPE_DURATIONAurelien Jacobs
supported suffixes are: - s: seconds (default when no suffix specified) - m or ms: milliseconds - u or us: microseconds
2018-03-01frame: add an av_frame_new_side_data_from_buf functionRostislav Pehlivanov
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2018-02-23avutil/timecode: fix starting frame number for 59.94 fpsGyan Doshi
The existing code for adjusting starting frame number assumes 29.97 as stream fps. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-02-22qsv: Default PicStruct to progressiveRuiling Song
The PicStruct is required by MediaSDK, so give a default value. hwupload does not work without this. Signed-off-by: Ruiling Song <ruiling.song@intel.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2018-02-22hwcontext_vaapi: Fix frames context creation with external attributesMark Thompson
2018-02-22hwcontext_vaapi: Add more surface formatsMark Thompson
Adds YUV 4:1:1, 4:4:0 and 4:4:4 - these will be needed for JPEG decoding.