ffmpeg: update to 7.1 #9569
ffmpeg: update to 7.1 #9569
Conversation
|
@HiassofT I've done some smoke testing with Amlogic and that seems to be fine too. I'd prefer to keep Amlogic using the githash of the HEAD for JC's branch though. |
HiassofT
force-pushed
the
le13-ffmpeg-7.1
branch
from
d76d19e to
5ae2b54
Compare
|
I meant you can use his |
|
Thanks for the hint, I missed that I accidentially switched Aml to plain 7.1 ffmpeg. I've now switched it to jc's branch and dropped the patches in the Amlogic project dir - hope it's fine now. |
|
@HiassofT I pushed updates for @jernejsk pls test. |
|
Build and run tested on Generic |
|
I've now also added not-yet-merged xbmc/xbmc#25467 which is required for latest ffmpeg v4l2-request patches. Has been tested on RPi also xbmc/xbmc#25467 (comment), so it should be safe to add it to common kodi patches. |
|
@knaerzche thanks a lot, I did a very quick test on RPi5 and HEVC still worked fine with the kodi patch |
HiassofT
force-pushed
the
le13-ffmpeg-7.1
branch
from
a33da97 to
5d3f7da
Compare
|
I've added a small cleanup and switched the libreelec patch branch to use FFMPEG_VERSION, like used for the v4l2 patches, so we don't have to modify that manually in the future. No functional change, just branch rename. |
|
@HiassofT do you have upstream or bug link for RK3288 VPU mmu issue? |
|
@zhangn1985 sorry, I'm not familiar with RK, but @knaerzche may be able to provide more information |
You can be sure we really tried very hard to be able to make the new code working on all platforms - however there is a yet to be found, probable subtile, bug in hantro driver which strikes only on 32-bit platforms and we are "behind the scenes" in contact with the maintainers of this driver anyway. However it works fine with iommu disabled and it actually makes no difference from users POV. (All (most) of this information can be found in the commit message where iommu is disabled, btw.) |
|
tested on my rockchip board (rk3328) with h264 and hvec streams and everything seems to work. |
|
tested on AW H6 and works great, including HW deinterlacing |
|
Feel free to merge if you are happy, we can fix RPi HW deinterlace in a separate PR - no big deal and no reason to delay the ffmpeg bump |
|
I'm not familiar with mpv needs. I only check Kodi compatibility. As far as kernel needs go, I believe 6.6 should suffice, but I forgot which kernel version got latest fixes. |
Drop crystalhd, dct, fft, mdct, and rdft options which were removed from configure. Signed-off-by: Matthias Reichl <[email protected]>
Also switch libreelec patch branch to use FFMPEG_VERSION, like used for the v4l2 patches. Signed-off-by: Matthias Reichl <[email protected]>
Patch created using revisions b08d796..74d85ef from branch libreelec-misc-n7.1 of https://github.com/LibreELEC/FFmpeg
…abel-format-to-wo.patch This is already included in upstream Signed-off-by: Matthias Reichl <[email protected]>
Also set PATCH_CREATE_DIFF="yes" as otherwise git apply fails to apply the patch. Signed-off-by: Matthias Reichl <[email protected]>
Patch created using revisions b08d796..5f39f6c from branch test/7.1/main of https://github.com/jc-kynesim/rpi-ffmpeg
Signed-off-by: Matthias Reichl <[email protected]>
Signed-off-by: Matthias Reichl <[email protected]>
Patch created using revisions b08d796..0e747a2 from branch v4l2-drmprime-n7.1 of https://github.com/jernejsk/FFmpeg
Patch created using revisions b08d796..904a851 from branch v4l2-request-n7.1 of https://github.com/jernejsk/FFmpeg
Patch created using revisions b08d796..accf519 from branch vf-deinterlace-v4l2m2m-n7.1 of https://github.com/jernejsk/FFmpeg
Due to bug in either hantro, iommu or general dma management drivers for ARMv7 buffers are not correctly flushed when being re-used. To work around that, disable VPU iommu and increase cma memory size to be sufficient for 4K H.264 decoding. Signed-off-by: Alex Bee <[email protected]>
HiassofT
force-pushed
the
le13-ffmpeg-7.1
branch
from
5d3f7da to
9e49fb0
Compare
|
@knaerzche I've dropped the local PR25467 patch as it's now in kodi (kodi PR is updated to current HEAD) |
Initial testing on RPi4 and RPi5 looks mostly fine, only HW deinterlace doesn't work yet.
Other platforms are completely untested and need updated patches
Merge this together with #9570