summaryrefslogtreecommitdiffstats
path: root/libavutil
Commit message (Collapse)AuthorAgeFilesLines
* avutil/integer: Fix integer overflow in av_mul_i()Michael Niedermayer2018-11-031-1/+1
| | | | | | | Found-by: fate Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 3cc3cb663bf3061e40356392d2f7638de6a479fe) Signed-off-by: Michael Niedermayer <[email protected]>
* avutil/pixfmt: Document chroma plane size for odd resolutionsMichael Niedermayer2018-10-071-0/+4
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit be0b77e6e83b61c2da338201b5ddfae1c9acedc5) Signed-off-by: Michael Niedermayer <[email protected]>
* avutil/common: Fix undefined behavior in av_clip_uintp2_c()Michael Niedermayer2018-06-151-1/+1
| | | | | | | | | | 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 <[email protected]> (cherry picked from commit aa41d322be71106ce147445f2b42bb763f1eff86) Signed-off-by: Michael Niedermayer <[email protected]>
* hwcontext_vaapi: Fix compilation with libva versions < 1.4.0Mark Thompson2018-04-271-0/+5
| | | | | | The BufferHandle API was added in libva 1.4.0 / VAAPI 0.36.0. (cherry picked from commit 92a0a6bea9dc3087fa8d232b750db1dd0d70b157)
* Bump minor versions for branching release/4.0Michael Niedermayer2018-04-161-1/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avutil/random_seed: use bcrypt instead of the old wincrypt APISteve Lhomme2018-04-141-9/+10
| | | | | | | | 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 <[email protected]> Signed-off-by: James Almer <[email protected]>
* Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'James Almer2018-04-132-12/+1
|\ | | | | | | | | | | | | * commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce': Drop Windows XP support remnants Merged-by: James Almer <[email protected]>
| * Drop Windows XP support remnantsDiego Biurrun2018-04-092-12/+1
| |
* | Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'James Almer2018-04-131-0/+5
|\| | | | | | | | | | | | | * commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42': qsv: adding Multi Frame Encode support Merged-by: James Almer <[email protected]>
| * qsv: adding Multi Frame Encode supportMaxym Dmytrychenko2018-04-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | avutil/pixdesc: deprecate AV_PIX_FMT_FLAG_PSEUDOPALwm42018-04-036-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a'James Almer2018-03-301-1/+7
|\| | | | | | | | | | | | | * commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a': arm: Produce .const_data instead of .section .rodata for Mach-O Merged-by: James Almer <[email protected]>
| * arm: Produce .const_data instead of .section .rodata for Mach-OMartin Storsjö2018-03-301-1/+7
| | | | | | | | | | | | | | | | | | | | 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ö <[email protected]>
* | Merge commit '86499771d1228d8303c8eb6509e20c0caaa02da5'James Almer2018-03-291-4/+4
|\| | | | | | | | | | | | | * commit '86499771d1228d8303c8eb6509e20c0caaa02da5': qsv: align surface width/height to 16. Merged-by: James Almer <[email protected]>
| * qsv: align surface width/height to 16.Ruiling Song2018-03-211-4/+4
| | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
* | hwcontext_d3d11: Fix crash with valid adapter but no deviceMark Thompson2018-03-281-3/+5
| | | | | | | | | | | | | | | | | | | | This crash was introduced by 8bbf2dacbfb4ead1535dea411035994f507f517d, which could incorrectly overwrite the failure result from creating the device. Fixes ticket #7108. Reviewed-by: wm4 <[email protected]>
* | avcodec/avcodec.h: Add encryption info side data.Jacob Trimble2018-03-244-1/+498
| | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | hwcontext_opencl: Add support for mapping DRM objects to BeignetMark Thompson2018-03-221-135/+130
| | | | | | | | Also use that to support mapping VAAPI to Beignet.
* | hwcontext_vaapi: Pass correct read/write flags when exporting surfacesMark Thompson2018-03-221-3/+8
| |
* | hwcontext_vaapi: Add support for legacy DRM mappingMark Thompson2018-03-221-12/+182
| | | | | | | | | | | | 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.
* | hwcontext_drm: Clarify value for unknown format modifiersMark Thompson2018-03-221-0/+3
| |
* | hwcontext_opencl: Avoid deprecation warnings when built with post-1.2 headersMark Thompson2018-03-221-0/+2
| | | | | | | | | | Matching the previous commit. This is not applied to the installed header because it could incorrectly suppress the warning inside user programs.
* | avutil/integer: move the test to the corresponding subdirectoryJames Almer2018-03-203-38/+50
| | | | | | | | | | | | | | And actually enable it. Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: James Almer <[email protected]>
* | hwcontext_vaapi: Always include DRM hwcontext headerMark Thompson2018-03-181-3/+1
| | | | | | | | | | | | 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.
* | hwcontext_vaapi: Fix condition for DRM device derivationMark Thompson2018-03-181-1/+1
| | | | | | | | vaGetDisplayDRM() is required for this code to work, libdrm is not.
* | lavu/frame: add QP side datawm42018-03-183-7/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | lavu/frame: fix inconsistent qp_table_buf deprecationwm42018-03-182-3/+5
| | | | | | | | | | | | 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.
* | avutil/log: print level prefix also when no AVClass context is availableTobias Rapp2018-03-161-3/+3
| | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Tobias Rapp <[email protected]>
* | avutil: bump version after the latest AVOption flag additionJames Almer2018-03-161-1/+1
| | | | | | | | Signed-off-by: James Almer <[email protected]>
* | lavu/opt: add bit stream filter option dump support.Jun Zhao2018-03-161-0/+1
| | | | | | | | | | | | | | enable dump bit stream filter and update opt fate test ref. Signed-off-by: Jun Zhao <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | lavu/opt: add AV_OPT_FLAG_BSF_PARAMJun Zhao2018-03-161-0/+1
| | | | | | | | | | | | | | add AV_OPT_FLAG_BSF_PARAM for bit stream filter options. Signed-off-by: Jun Zhao <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avutil: add missing version bump for AV_CRC_8_EBUJames Almer2018-03-101-1/+1
| | | | | | | | Signed-off-by: James Almer <[email protected]>
* | avutil/parseutils: only accept full us duration, do not accept mss durationMarton Balint2018-03-091-4/+3
| | | | | | | | | | | | | | | | 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 <[email protected]>
* | crc: add AV_CRC_8_SBC as a 8 bits CRC with polynomial 0x1DAurelien Jacobs2018-03-073-3/+31
| |
* | Merge commit '8ca39b855a7b0e4d9f726fa9d285bc8edcb953e6'Mark Thompson2018-03-051-0/+1
|\| | | | | | | | | | | | | * commit '8ca39b855a7b0e4d9f726fa9d285bc8edcb953e6': qsv: Default PicStruct to progressive Merged-by: Mark Thompson <[email protected]>
| * qsv: Default PicStruct to progressiveRuiling Song2018-02-221-0/+1
| | | | | | | | | | | | | | | | The PicStruct is required by MediaSDK, so give a default value. hwupload does not work without this. Signed-off-by: Ruiling Song <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
| * hwcontext: Perform usual uninitialisation on derived frames contextsMark Thompson2018-02-111-10/+7
| |
| * hwcontext: Perform usual initialisation on derived device contextsMark Thompson2018-02-112-11/+4
| | | | | | | | | | The initialisation should be common. For libmfx, it was previously happening in the derivation function and this moves it out.
* | parseutils: accept only full "ms" suffixRostislav Pehlivanov2018-03-051-2/+2
| | | | | | | | | | | | | | | | 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 <[email protected]>
* | parseutils: add support for ms and us suffix for AV_OPT_TYPE_DURATIONAurelien Jacobs2018-03-021-2/+13
| | | | | | | | | | | | | | supported suffixes are: - s: seconds (default when no suffix specified) - m or ms: milliseconds - u or us: microseconds
* | frame: add an av_frame_new_side_data_from_buf functionRostislav Pehlivanov2018-03-013-19/+33
| | | | | | | | Signed-off-by: Rostislav Pehlivanov <[email protected]>
* | avutil/timecode: fix starting frame number for 59.94 fpsGyan Doshi2018-02-231-1/+1
| | | | | | | | | | | | | | The existing code for adjusting starting frame number assumes 29.97 as stream fps. Signed-off-by: Michael Niedermayer <[email protected]>
* | hwcontext_vaapi: Fix frames context creation with external attributesMark Thompson2018-02-211-2/+2
| |
* | hwcontext_vaapi: Add more surface formatsMark Thompson2018-02-211-0/+3
| | | | | | | | Adds YUV 4:1:1, 4:4:0 and 4:4:4 - these will be needed for JPEG decoding.
* | avutil/common: Fix integer overflow in av_clip_uint8_c() and av_clip_uint16_c()Michael Niedermayer2018-02-171-2/+2
| | | | | | | | | | | | | | | | Fixes: 5567/clusterfuzz-testcase-minimized-5769966247739392 Fixes: runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]>
* | avutil/crypto: change length parameter to size_t on the remaining modulesJames Almer2018-02-156-0/+28
| | | | | | | | | | | | | | See 651ee9346105b9d492e01172ab447c04d03fa32e fcc4ed1efa1a7575dc45fe57ce552af331941469 Signed-off-by: James Almer <[email protected]>
* | avutil/opt: remove ABI hackswm42018-02-132-10/+10
| | | | | | | | | | These were needed for ABI compatibility with Libav. We don't need them anymore.
* | Merge commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906'James Almer2018-02-115-4/+2
|\| | | | | | | | | | | | | * commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906': Drop some unnecessary config.h #includes Merged-by: James Almer <[email protected]>
| * Drop some unnecessary config.h #includesDiego Biurrun2018-02-065-4/+2
| |
* | Merge commit '2eb396b175e55e515aa6a13c5b1789a2a18d3935'James Almer2018-02-111-1/+3
|\| | | | | | | | | | | | | * commit '2eb396b175e55e515aa6a13c5b1789a2a18d3935': hwcontext: Fix memory leak on derived frame allocation failure Merged-by: James Almer <[email protected]>