From c06bca7fd723570921d5aab699c9cc5e3cec5d23 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 13 Feb 2022 09:11:44 -0500 Subject: [PATCH] Enable more QSV and V4L2M2M codecs --- enable_decoders | 14 ++++++++++++++ enable_encoders | 9 +++++++++ ffmpeg.spec | 5 ++++- ffmpeg_free_sources | 3 +++ sources | 2 +- 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/enable_decoders b/enable_decoders index 805166c..7bc2b8f 100644 --- a/enable_decoders +++ b/enable_decoders @@ -4,6 +4,7 @@ ac3 ansi # trivial apng # animated png ass # trivial +av1_qsv # libaom ayuv # trivial bmp # trivial dirac # dirac @@ -14,6 +15,7 @@ ffwavesynth # pseudo flac # libFLAC gif # libpng gsm # libgsm +h263_v4l2m2m # hardware h264_nvdec # hardware h264_vdpau # hardware h264_vaapi # hardware @@ -22,6 +24,7 @@ h264_qsv # hardware hevc_nvdec # hardware hevc_vdpau # hardware hevc_vaapi # hardware +hevc_v4l2m2m # hardware hevc_qsv # hardware huffyuv # trivial+zlib ilbc # ilbc @@ -40,6 +43,7 @@ libvorbis # libvorbis libvpx_vp8 # libvpx libvpx_vp9 # libvpx mjpeg # mjpegtools +mjpeg_qsv # mjpegtools mp1 # twolame/lame mp1float # twolame/lame mp2 # twolame @@ -47,7 +51,11 @@ mp2float # twolame mp3 # lame mp3float # lame mpeg1video +mpeg1_v4l2m2m mpeg2video +mpeg2_qsv +mpeg2_v4l2m2m +mpeg4_v4l2m2m # hardware opus # libopus pam # trivial pbm # trivial @@ -99,6 +107,8 @@ v210x # trivial v308 # trivial v408 # trivial v410 # trivial +vc1_qsv # hardware +vc1_v4l2m2m # hardware vorbis # libvorbis vp3 # libav vp5 # libav @@ -106,7 +116,11 @@ vp6 # libav vp6a # libav vp6f # libav vp8 # libvpx +vp8_qsv # libvpx +vp8_v4l2m2m # libvpx vp9 # libvpx +vp9_qsv # libvpx +vp9_v4l2m2m # libvpx webp # libwebp webvtt # trivial wrapped_avframe # passthrough diff --git a/enable_encoders b/enable_encoders index d4225f5..4a6b3d5 100644 --- a/enable_encoders +++ b/enable_encoders @@ -9,6 +9,7 @@ ffv1 ffvhuff # trivial+zlib flac # libFLAC gif # libpng +h263_v4l2m2m # hardware h264_amf # hardware h264_nvenc # hardware h264_qsv # hardware @@ -41,10 +42,13 @@ libvpx_vp9 # libvpx libwebp # libwebp libwebp_anim # libwebp mjpeg # mjpegtools +mjpeg_qsv # mjpegtools mp2 # twolame mp2fixed # twolame mpeg1video mpeg2video +mpeg2_qsv +mpeg4_v4l2m2m # hardware opus # opus pam pbm # trivial @@ -90,7 +94,12 @@ v210 # trivial v308 # trivial v408 # trivial v410 # trivial +vc1_qsv # hardware +vc1_v4l2m2m # hardware vorbis # libvorbis +vp8_qsv # libvpx +vp8_v4l2m2m # libvpx +vp9_qsv # libvpx webvtt # trivial wrapped_avframe # passthrough xbm # (X11) diff --git a/ffmpeg.spec b/ffmpeg.spec index c41cdcd..ebf5a77 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -65,7 +65,7 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} Version: 5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ URL: https://ffmpeg.org/ @@ -800,6 +800,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Sun Feb 13 2022 Neal Gompa - 5.0-3 +- Enable more QSV and V4L2M2M codecs + * Sun Feb 13 2022 Neal Gompa - 5.0-2 - Enable support for more hardware codecs diff --git a/ffmpeg_free_sources b/ffmpeg_free_sources index a696839..361bc0d 100644 --- a/ffmpeg_free_sources +++ b/ffmpeg_free_sources @@ -944,6 +944,9 @@ libavcodec/qsvenc.c libavcodec/qsvenc.h libavcodec/qsvenc_h264.c libavcodec/qsvenc_hevc.c +libavcodec/qsvenc_jpeg.c +libavcodec/qsvenc_mpeg2.c +libavcodec/qsvenc_vp9.c libavcodec/rangecoder.c libavcodec/rangecoder.h libavcodec/ratecontrol.c diff --git a/sources b/sources index 6cd6306..71b0847 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ffmpeg-free-5.0.tar.xz) = c3b811472e8f7a7fe8d31eeabb85c42004e58e05f6152d9755a074e39ec7a8bf14ae29978d73b077db64fab208506bdeeadd6c37c75d40b954d8789ab2493438 +SHA512 (ffmpeg-free-5.0.tar.xz) = f6fe84b072041f5dee150d5a4b4d29b747fd60d7ce83fd6f83eaf71bc5d2214e980729281bed8fe2d949cd30d69e50a719d5ca0b3d900b4a559f6598dc5fe8f1 SHA512 (ffmpeg-5.0.tar.xz.asc) = 9238fcdc849895147a26669ac90fec94002af86e81270128f6eb0448d74487d8ba06ee08d10686a7a6e204689716ee744bfffc2a39466940940609cfcd7dfa85 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165