summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'b446f0e98f85e2e931b476e52b319f1c49244660'James Almer2017-09-28
|\ | | | | | | | | | | | | | | | | * commit 'b446f0e98f85e2e931b476e52b319f1c49244660': mov: Do not try to parse multiple stsd for the same track See 8b43ee4054af799e388d380b379a13a60849c1b5 Merged-by: James Almer <jamrial@gmail.com>
| * mov: Do not try to parse multiple stsd for the same trackLuca Barbato2017-02-15
| | | | | | | | | | | | | | Bug-Id: 1017 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e791b915c774408fbc0ec9e7270b021899e08ccc'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit 'e791b915c774408fbc0ec9e7270b021899e08ccc': hwcontext_vaapi: Try to support the VDPAU wrapper This commit is a noop, see f2e4fb61af4b47c329fbf2b9a245594957d7bbab Merged-by: James Almer <jamrial@gmail.com>
| * hwcontext_vaapi: Try to support the VDPAU wrapperMark Thompson2017-02-13
| | | | | | | | | | | | | | | | The driver is somewhat bitrotten (not updated for years) but is still usable for decoding with this change. To support it, this adds a new driver quirk to indicate no support at all for surface attributes. Based on a patch by wm4 <nfxjfg@googlemail.com>.
* | Merge commit '5dd9a4b88b287bf8c93520afda7becb1ad0d1894'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit '5dd9a4b88b287bf8c93520afda7becb1ad0d1894': vaapi: Implement device-only setup This commit is a noop, see 81b7deab8296f8446a64e20b9fcaf8eba88b9e29 Merged-by: James Almer <jamrial@gmail.com>
| * vaapi: Implement device-only setupMark Thompson2017-02-13
| | | | | | | | | | In this case, the user only supplies a device and the frame context is allocated internally by lavc.
* | Merge commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c': lavc: Add device context field to AVCodecContext This commit is a noop, see c1a5fca06f75cc0e7b9b2808fecaa0c1b424da50 Merged-by: James Almer <jamrial@gmail.com>
| * lavc: Add device context field to AVCodecContextMark Thompson2017-02-13
| | | | | | | | For use by codec implementations which can allocate frames internally.
* | Merge commit '07b5136c481d394992c7e951967df0cfbb346c0b'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07b5136c481d394992c7e951967df0cfbb346c0b': aarch64: vp9lpf: Fix broken indentation/vertical alignment aarch64: vp9lpf: Interleave the start of flat8in into the calculation above arm: vp9lpf: Interleave the start of flat8in into the calculation above This commit is a noop, see 83399cf569c9f78e0c72e21aa67184c222bb2d59 9f3a8863648ed19ea69ca5ddfcfa3c80e0df15b0 c8d6eec85d6a87c9075c87d5eb75af47c964fff8 Merged-by: James Almer <jamrial@gmail.com>
| * aarch64: vp9lpf: Fix broken indentation/vertical alignmentMartin Storsjö2017-02-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * aarch64: vp9lpf: Interleave the start of flat8in into the calculation aboveMartin Storsjö2017-02-11
| | | | | | | | | | | | | | This adds lots of extra .ifs, but speeds it up by a couple cycles, by avoiding stalls. Signed-off-by: Martin Storsjö <martin@martin.st>
| * arm: vp9lpf: Interleave the start of flat8in into the calculation aboveMartin Storsjö2017-02-11
| | | | | | | | | | | | | | This adds lots of extra .ifs, but speeds it up by a couple cycles, by avoiding stalls. Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc/libav-merge: mention skipped or incomplete runtime alignment commitsJames Almer2017-09-27
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | | | * commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b': dv: Convert to the new bitstream reader This commit is a noop, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html Merged-by: James Almer <jamrial@gmail.com>
| * dv: Convert to the new bitstream readerLuca Barbato2017-02-11
| |
* | Merge commit 'ba30b74686f0cb6c9dd465ac4820059c48bf9d08'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit 'ba30b74686f0cb6c9dd465ac4820059c48bf9d08': aac: Validate the sbr sample rate before using the value See cf5f4c5169639349262aa221ae485a0de188afb1 Merged-by: James Almer <jamrial@gmail.com>
| * aac: Validate the sbr sample rate before using the valueLuca Barbato2017-02-11
| | | | | | | | | | | | | | Avoid a floating point exception. Bug-Id: 1027 CC: libav-stable@libav.org
* | Merge commit '0ee78020cd41d81eec651acd7fc65906207796f3'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit '0ee78020cd41d81eec651acd7fc65906207796f3': configure: Move up the avbuild directory creation This commit is a noop, see 19bf50406ebf8bff1be7388da2ed7a85738d055f Merged-by: James Almer <jamrial@gmail.com>
| * configure: Move up the avbuild directory creationLuca Barbato2017-02-11
| | | | | | | | | | | | | | The early check for inconsistent in-source vs out-of-source build cannot generate a config.log otherwise. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'c2f97f050870897575570708ac48c5c15e6a0dd8'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit 'c2f97f050870897575570708ac48c5c15e6a0dd8': hwcontext_dxva2: support D3D9Ex This commit is a noop, see 50708f4aa40ce96122cf93d9e36cca8024baf025 Merged-by: James Almer <jamrial@gmail.com>
| * hwcontext_dxva2: support D3D9Exwm42017-02-11
| | | | | | | | | | | | | | | | D3D9Ex uses different driver paths. This helps with "headless" configurations when no user logs in. Plain D3D9 device creation will fail if no user is logged in, while it works with D3D9Ex. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '04f3bd349651694f30feeb8c4ed9bc58106fca54'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit '04f3bd349651694f30feeb8c4ed9bc58106fca54': AVFrame: add an opaque_ref field This commit is a noop, see e3af49b14bf371e18fab1c12cba0239e6658672c Merged-by: James Almer <jamrial@gmail.com>
| * AVFrame: add an opaque_ref fieldwm42017-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an extended version of the AVFrame.opaque field, which can be used to attach arbitrary user information to an AVFrame. The usefulness of the opaque field is rather limited, because it can store only up to 32 bits of information (or 64 bit on 64 bit systems). It's not possible to set this field to a memory allocation, because there is no way to deallocate it correctly. The opaque_ref field circumvents this by letting the user set an AVBuffer, which makes the user data refcounted. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4de220d2e3751c459f8739a08ac6ca52e63eba30'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit '4de220d2e3751c459f8739a08ac6ca52e63eba30': frame: allow align=0 (meaning automatic) for av_frame_get_buffer() See https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html Merged-by: James Almer <jamrial@gmail.com>
| * frame: allow align=0 (meaning automatic) for av_frame_get_buffer()Anton Khirnov2017-02-11
| | | | | | | | | | This will avoid every caller from hardcoding some specific alignment, which may break in the future with new instruction sets.
* | Merge commit 'f44ec22e095c5ba00ffeadd891655c456e3dd014'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | | | * commit 'f44ec22e095c5ba00ffeadd891655c456e3dd014': lavc: use av_cpu_max_align() instead of hardcoding alignment requirements This commit is a noop, see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html Merged-by: James Almer <jamrial@gmail.com>
| * lavc: use av_cpu_max_align() instead of hardcoding alignment requirementsAnton Khirnov2017-02-11
| |
* | avutil/cpu: split flag checks per arch in av_cpu_max_align()James Almer2017-09-27
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit 'e6bff23f1e11aefb16a2b5d6ee72bf7469c5a66e'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | | | * commit 'e6bff23f1e11aefb16a2b5d6ee72bf7469c5a66e': cpu: add a function for querying maximum required data alignment Adapted to work with the arbitrary runtime cpuflag changes av_force_cpu_flags() can generate. Merged-by: James Almer <jamrial@gmail.com>
| * cpu: add a function for querying maximum required data alignmentAnton Khirnov2017-02-11
| |
* | Merge commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8': scale_npp: explicitly set the output frames context for passthrough mode See 62b75537db15816fde8b8a33976ffc4a8277f1fc Merged-by: James Almer <jamrial@gmail.com>
| * scale_npp: explicitly set the output frames context for passthrough modeAnton Khirnov2017-02-11
| | | | | | | | | | This is no longer done automatically for filters marked as hwframe-aware.
* | Merge commit '6f554521afdf7ab4edbfaa9536660a1dca946b19'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6f554521afdf7ab4edbfaa9536660a1dca946b19': Use the new AVIOContext destructor. avio: add a destructor for AVIOContext This commit is a noop, see b12e4d3bb8df994f042ff1216fb8de2b967aab9e 78a7af823b7c2a1e3184e6680f2b49bf67101e5c Merged-by: James Almer <jamrial@gmail.com>
| * Use the new AVIOContext destructor.Anton Khirnov2017-02-11
| |
| * avio: add a destructor for AVIOContextAnton Khirnov2017-02-11
| | | | | | | | | | Before this commit, AVIOContext is to be freed with a plain av_free(), which prevents us from adding any deeper structure to it.
* | Merge commit '435cd7bc99671bf561193421a50ac6e9d63c4266'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '435cd7bc99671bf561193421a50ac6e9d63c4266': arm: vp9lpf: Use orrs instead of orr+cmp arm/aarch64: vp9lpf: Calculate !hev directly aarch64: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrolling arm: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrolling aarch64: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filter arm: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filter aarch64: vp9mc: Simplify the extmla macro parameters This commit is a noop, see ac6cb8ae5b1c56c4a3fceb635c60d05e447c4365 bff07715904cc02f04eb5c5e171b431eb00f0c3b 045e33ae3fee74e39b1321dddf727eacb1ecf541 758302e4bc14e93989e7feb1135ec3f807c3310d 148cc0bb890839bc2a9cda514c5e71acc39eb374 f0ecbb13cf1cf706a1350dad657219dc7b3c131e 92ab8374b1051dd632c3ccc326b6cb1d564f293f Merged-by: James Almer <jamrial@gmail.com>
| * arm: vp9lpf: Use orrs instead of orr+cmpMartin Storsjö2017-02-11
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * arm/aarch64: vp9lpf: Calculate !hev directlyMartin Storsjö2017-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we first calculated hev, and then negated it. Since we were able to schedule the negation in the middle of another calculation, we don't see any gain in all cases. Before: Cortex A7 A8 A9 A53 A53/AArch64 vp9_loop_filter_v_4_8_neon: 147.0 129.0 115.8 89.0 88.7 vp9_loop_filter_v_8_8_neon: 242.0 198.5 174.7 140.0 136.7 vp9_loop_filter_v_16_8_neon: 500.0 419.5 382.7 293.0 275.7 vp9_loop_filter_v_16_16_neon: 971.2 825.5 731.5 579.0 453.0 After: vp9_loop_filter_v_4_8_neon: 143.0 127.7 114.8 88.0 87.7 vp9_loop_filter_v_8_8_neon: 241.0 197.2 173.7 140.0 136.7 vp9_loop_filter_v_16_8_neon: 497.0 419.5 379.7 293.0 275.7 vp9_loop_filter_v_16_16_neon: 965.2 818.7 731.4 579.0 452.0 Signed-off-by: Martin Storsjö <martin@martin.st>
| * aarch64: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrollingMartin Storsjö2017-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | This work is sponsored by, and copyright, Google. Before: Cortex A53 vp9_inv_dct_dct_16x16_sub1_add_neon: 235.3 vp9_inv_dct_dct_32x32_sub1_add_neon: 555.1 After: vp9_inv_dct_dct_16x16_sub1_add_neon: 180.2 vp9_inv_dct_dct_32x32_sub1_add_neon: 475.3 Signed-off-by: Martin Storsjö <martin@martin.st>
| * arm: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrollingMartin Storsjö2017-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | This work is sponsored by, and copyright, Google. Before: Cortex A7 A8 A9 A53 vp9_inv_dct_dct_16x16_sub1_add_neon: 273.0 189.5 211.7 235.8 vp9_inv_dct_dct_32x32_sub1_add_neon: 752.0 459.2 862.2 553.9 After: vp9_inv_dct_dct_16x16_sub1_add_neon: 226.5 145.0 225.1 171.8 vp9_inv_dct_dct_32x32_sub1_add_neon: 721.2 415.7 727.6 475.0 Signed-off-by: Martin Storsjö <martin@martin.st>
| * aarch64: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filterMartin Storsjö2017-02-11
| | | | | | | | | | | | No measured speedup on a Cortex A53, but other cores might benefit. Signed-off-by: Martin Storsjö <martin@martin.st>
| * arm: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filterMartin Storsjö2017-02-11
| | | | | | | | | | | | | | | | | | Before: Cortex A7 A8 A9 A53 vp9_put_8tap_smooth_4h_neon: 378.1 273.2 340.7 229.5 After: vp9_put_8tap_smooth_4h_neon: 352.1 222.2 290.5 229.5 Signed-off-by: Martin Storsjö <martin@martin.st>
| * aarch64: vp9mc: Simplify the extmla macro parametersMartin Storsjö2017-02-11
| | | | | | | | | | | | | | | | | | | | | | | | Fold the field lengths into the macro. This makes the macro invocations much more readable, when the lines are shorter. This also makes it easier to use only half the registers within the macro. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '53ea595eec984e3109310e8bb7ff4b5786d91057'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit '53ea595eec984e3109310e8bb7ff4b5786d91057': mov: Rework stsc index validation See e26e6240b6700c5e8c16d0f092f1ad46805a723c. Merged-by: James Almer <jamrial@gmail.com>
| * mov: Rework stsc index validationVittorio Giovara2017-02-10
| | | | | | | | | | In order to avoid potential integer overflow change the comparison and make sure to use the same unsigned type for both elements.
* | Merge commit 'ce6d72d10776b03c6780d4aa676414ce002285d4'James Almer2017-09-27
|\| | | | | | | | | | | | | * commit 'ce6d72d10776b03c6780d4aa676414ce002285d4': imgutils: Document av_image_get_buffer_size() Merged-by: James Almer <jamrial@gmail.com>
| * imgutils: Document av_image_get_buffer_size()Vittorio Giovara2017-02-10
| |
* | Merge commit 'b6093e8c72a80710f086c678ab0730cf30953b5c'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit 'b6093e8c72a80710f086c678ab0730cf30953b5c': hlsenc: Correctly write down all 16 bytes in hex This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * hlsenc: Correctly write down all 16 bytes in hexLuca Barbato2017-02-10
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'bc2589763042dc2384b724b203ec778f35bcebad'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit 'bc2589763042dc2384b724b203ec778f35bcebad': utvideodec: Add a missing include This commit is a noop, see 91ed4e71967f19824237de4c374f038b543c7555 Merged-by: James Almer <jamrial@gmail.com>