Update to version 8.1
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
pkgbase = ffmpeg-full
|
pkgbase = ffmpeg-full
|
||||||
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)
|
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)
|
||||||
pkgver = 8.0.1
|
pkgver = 8.1
|
||||||
pkgrel = 4
|
pkgrel = 1
|
||||||
url = https://ffmpeg.org/
|
url = https://ffmpeg.org/
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = LicenseRef-nonfree-and-unredistributable
|
license = LicenseRef-nonfree-and-unredistributable
|
||||||
@@ -35,7 +35,6 @@ pkgbase = ffmpeg-full
|
|||||||
depends = freetype2
|
depends = freetype2
|
||||||
depends = frei0r-plugins
|
depends = frei0r-plugins
|
||||||
depends = fribidi
|
depends = fribidi
|
||||||
depends = gcc-libs
|
|
||||||
depends = glib2
|
depends = glib2
|
||||||
depends = glibc
|
depends = glibc
|
||||||
depends = glslang
|
depends = glslang
|
||||||
@@ -60,8 +59,10 @@ pkgbase = ffmpeg-full
|
|||||||
depends = libdvdnav
|
depends = libdvdnav
|
||||||
depends = libdvdread
|
depends = libdvdread
|
||||||
depends = libfdk-aac
|
depends = libfdk-aac
|
||||||
|
depends = libgcc
|
||||||
depends = libgcrypt
|
depends = libgcrypt
|
||||||
depends = libgme
|
depends = libgme
|
||||||
|
depends = libgomp
|
||||||
depends = libiec61883
|
depends = libiec61883
|
||||||
depends = libilbc
|
depends = libilbc
|
||||||
depends = libjxl
|
depends = libjxl
|
||||||
@@ -78,6 +79,7 @@ pkgbase = ffmpeg-full
|
|||||||
depends = librsvg
|
depends = librsvg
|
||||||
depends = libsoxr
|
depends = libsoxr
|
||||||
depends = libssh
|
depends = libssh
|
||||||
|
depends = libstdc++
|
||||||
depends = libtheora
|
depends = libtheora
|
||||||
depends = libva
|
depends = libva
|
||||||
depends = libvdpau
|
depends = libvdpau
|
||||||
@@ -91,9 +93,11 @@ pkgbase = ffmpeg-full
|
|||||||
depends = libxv
|
depends = libxv
|
||||||
depends = libwebp
|
depends = libwebp
|
||||||
depends = lilv
|
depends = lilv
|
||||||
|
depends = mpeghdec
|
||||||
depends = ocl-icd
|
depends = ocl-icd
|
||||||
depends = openal
|
depends = openal
|
||||||
depends = openapv
|
depends = openapv
|
||||||
|
depends = opencolorio
|
||||||
depends = opencore-amr
|
depends = opencore-amr
|
||||||
depends = opencv
|
depends = opencv
|
||||||
depends = openh264
|
depends = openh264
|
||||||
@@ -115,6 +119,7 @@ pkgbase = ffmpeg-full
|
|||||||
depends = srt
|
depends = srt
|
||||||
depends = svt-av1
|
depends = svt-av1
|
||||||
depends = svt-hevc
|
depends = svt-hevc
|
||||||
|
depends = svt-jpeg-xs-git
|
||||||
depends = svt-vp9
|
depends = svt-vp9
|
||||||
depends = tesseract
|
depends = tesseract
|
||||||
depends = twolame
|
depends = twolame
|
||||||
@@ -149,38 +154,28 @@ pkgbase = ffmpeg-full
|
|||||||
provides = libswscale.so
|
provides = libswscale.so
|
||||||
provides = libswresample.so
|
provides = libswresample.so
|
||||||
conflicts = ffmpeg
|
conflicts = ffmpeg
|
||||||
source = https://ffmpeg.org/releases/ffmpeg-8.0.1.tar.xz
|
source = https://ffmpeg.org/releases/ffmpeg-8.1.tar.xz
|
||||||
source = https://ffmpeg.org/releases/ffmpeg-8.0.1.tar.xz.asc
|
source = https://ffmpeg.org/releases/ffmpeg-8.1.tar.xz.asc
|
||||||
source = git+https://github.com/lensfun/lensfun.git
|
source = git+https://github.com/lensfun/lensfun.git
|
||||||
source = https://github.com/ggml-org/whisper.cpp/archive/v1.8.3/whisper.cpp-1.8.3.tar.gz
|
source = https://github.com/ggml-org/whisper.cpp/archive/v1.8.3/whisper.cpp-1.8.3.tar.gz
|
||||||
source = 010-ffmpeg-add-svt-hevc.patch
|
source = 010-ffmpeg-add-svt-hevc.patch
|
||||||
source = 020-ffmpeg-add-svt-hevc-docs-g4181c9e.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/4181c9ee0611baefb40b4c0ed10023cfd837d522/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
|
source = 020-ffmpeg-add-svt-hevc-docs-g4181c9e.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/4181c9ee0611baefb40b4c0ed10023cfd837d522/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
|
||||||
source = 030-ffmpeg-add-svt-vp9-g290fb8c.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/290fb8c3662ed76a8887b587a9b8201878ba71ed/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
|
source = 030-ffmpeg-add-svt-vp9.patch
|
||||||
source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
|
source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
|
||||||
source = 050-ffmpeg-fix-cuda-nvcc-with-gcc14.patch
|
source = 050-ffmpeg-fix-cuda-nvcc-with-gcc14.patch
|
||||||
source = 060-ffmpeg-whisper.cpp-fix-pkgconfig.patch
|
source = 060-ffmpeg-whisper.cpp-fix-pkgconfig.patch
|
||||||
source = 080-ffmpeg-cuda13-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f8a300c6739ea2ca648579d7faf3ae9811b9f19a
|
|
||||||
source = 100-ffmpeg-add-opencv4-support.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/c4ce51ee62205c74604767f1b7dab6a036edac7f
|
|
||||||
source = 110-ffmpeg-add-playback-support-to-decklink-sdk14.3-devices.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/0cd75dbfa0fc6c213cf9240b3c03c809070c5209
|
|
||||||
source = 120-ffmpeg-add-decklink-sdk14.3-build-support.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/27e94281d1c880b4cae28738e35c0d6f9a58f06b
|
|
||||||
source = 130-ffmpeg-svt-av1-4.0-fix.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/a5d4c398b411a00ac09d8fe3b66117222323844c
|
|
||||||
source = LICENSE
|
source = LICENSE
|
||||||
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
|
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
|
||||||
sha256sums = 05ee0b03119b45c0bdb4df654b96802e909e0a752f72e4fe3794f487229e5a41
|
sha256sums = b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = SKIP
|
sha256sums = SKIP
|
||||||
sha256sums = 870ba21409cdf66697dc4db15ebdb13bc67037d76c7cc63756c81471d8f1731a
|
sha256sums = 870ba21409cdf66697dc4db15ebdb13bc67037d76c7cc63756c81471d8f1731a
|
||||||
sha256sums = ccdc1cab97d1fe5a454cd57fbd2bb865256092d715fd7f380c30cc3f42891b3c
|
sha256sums = ff6dabc3cbef98d22cc8f081343d5c66b2564b3a898c2dbcc88baa5017d80232
|
||||||
sha256sums = a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81
|
sha256sums = a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81
|
||||||
sha256sums = 1f06dfcb78e43a6c732cbc4f6ae583ae19fb111b56d33c8c860d5b6566c04f99
|
sha256sums = 73e516bd771024f100983d0b7a5d43b49fd1e992c83e6caec445b7338e79e8c2
|
||||||
sha256sums = 5cb2475de410f5696072687af88e91461cdacd1bb636ac14a3b348e3383934f1
|
sha256sums = 95223dda645c15b3daf79cd4d55df5d4ac46207f749973396bb761b743586ed6
|
||||||
sha256sums = 9f3d84b3abe1077b3d6c1a25f36dcddf6419a7fe3217a4edd52aab6f0e4cd838
|
sha256sums = 1bbd783da8483e2cffe99715125dddbd88c81ae36f28eee5ae7df5705c448077
|
||||||
sha256sums = 98b3d28cbd13bb575c602785f6b8cb0b66ea3128ab5a3a82fc1645822320c136
|
sha256sums = 98b3d28cbd13bb575c602785f6b8cb0b66ea3128ab5a3a82fc1645822320c136
|
||||||
sha256sums = 79e3fbc30c86e0db789af78e79dc23227e5f6887531bcd52b2defa8526d1455b
|
|
||||||
sha256sums = f5b448f7e6e567273f74ed6e62ed25d8470f6bc9183c247993f1c03e78b57587
|
|
||||||
sha256sums = d1c4bdbcdd5a852f46639e0cb3dbf0b4a71884487c9fbcdb38139a1e5e96ddaf
|
|
||||||
sha256sums = ee89e0759f5233d390e3a23415e2664aae38bbe89e10d49ecda8a06c26bd21ee
|
|
||||||
sha256sums = 1dbbc1a4cf9834b3902236abc27fefe982da03a14bcaa89fb90c7c8bd10a1664
|
|
||||||
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
|
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
|
||||||
|
|
||||||
pkgname = ffmpeg-full
|
pkgname = ffmpeg-full
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -339,6 +339,7 @@ External library support:
|
@@ -346,6 +346,7 @@ External library support:
|
||||||
--enable-whisper enable whisper filter [no]
|
--enable-whisper enable whisper filter [no]
|
||||||
--disable-xlib disable xlib [autodetect]
|
--disable-xlib disable xlib [autodetect]
|
||||||
--disable-zlib disable zlib [autodetect]
|
--disable-zlib disable zlib [autodetect]
|
||||||
@@ -8,15 +8,15 @@
|
|||||||
|
|
||||||
The following libraries provide various hardware acceleration features:
|
The following libraries provide various hardware acceleration features:
|
||||||
--disable-amf disable AMF video encoding code [autodetect]
|
--disable-amf disable AMF video encoding code [autodetect]
|
||||||
@@ -1979,6 +1980,7 @@ EXTERNAL_LIBRARY_LIST="
|
@@ -2090,6 +2091,7 @@ EXTERNAL_LIBRARY_LIST="
|
||||||
libsrt
|
|
||||||
libssh
|
libssh
|
||||||
libsvtav1
|
libsvtav1
|
||||||
|
libsvtjpegxs
|
||||||
+ libsvthevc
|
+ libsvthevc
|
||||||
libtensorflow
|
libtensorflow
|
||||||
libtesseract
|
libtesseract
|
||||||
libtheora
|
libtheora
|
||||||
@@ -3678,6 +3680,7 @@ vapoursynth_demuxer_deps="vapoursynth"
|
@@ -3845,6 +3847,7 @@ vapoursynth_demuxer_deps="vapoursynth"
|
||||||
videotoolbox_suggest="coreservices"
|
videotoolbox_suggest="coreservices"
|
||||||
videotoolbox_deps="corefoundation coremedia corevideo VTDecompressionSessionDecodeFrame"
|
videotoolbox_deps="corefoundation coremedia corevideo VTDecompressionSessionDecodeFrame"
|
||||||
videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
|
videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
|
||||||
@@ -24,17 +24,17 @@
|
|||||||
|
|
||||||
# demuxers / muxers
|
# demuxers / muxers
|
||||||
ac3_demuxer_select="ac3_parser"
|
ac3_demuxer_select="ac3_parser"
|
||||||
@@ -7154,6 +7157,7 @@ enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/
|
@@ -7376,6 +7379,7 @@ enabled libspeex && require_pkg_config libspeex speex speex/speex.h spe
|
||||||
enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
|
|
||||||
enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
|
enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
|
||||||
enabled libsvtav1 && require_pkg_config libsvtav1 "SvtAv1Enc >= 0.9.0" EbSvtAv1Enc.h svt_av1_enc_init_handle
|
enabled libsvtav1 && require_pkg_config libsvtav1 "SvtAv1Enc >= 0.9.0" EbSvtAv1Enc.h svt_av1_enc_init_handle
|
||||||
|
enabled libsvtjpegxs && require_pkg_config libsvtjpegxs "SvtJpegxs >= 0.10.0" SvtJpegxsEnc.h svt_jpeg_xs_encoder_init
|
||||||
+enabled libsvthevc && require_pkg_config libsvthevc SvtHevcEnc EbApi.h EbInitHandle
|
+enabled libsvthevc && require_pkg_config libsvthevc SvtHevcEnc EbApi.h EbInitHandle
|
||||||
enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow
|
enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow
|
||||||
enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
|
enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
|
||||||
enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
|
enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
|
||||||
--- a/libavcodec/Makefile
|
--- a/libavcodec/Makefile
|
||||||
+++ b/libavcodec/Makefile
|
+++ b/libavcodec/Makefile
|
||||||
@@ -1201,6 +1201,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER) += libwebpenc_common.o libwebpenc_anim
|
@@ -1227,6 +1227,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER) += libwebpenc_common.o libwebpenc_anim
|
||||||
OBJS-$(CONFIG_LIBX262_ENCODER) += libx264.o
|
OBJS-$(CONFIG_LIBX262_ENCODER) += libx264.o
|
||||||
OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o
|
OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o
|
||||||
OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o
|
OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
OBJS-$(CONFIG_LIBXEVD_DECODER) += libxevd.o
|
OBJS-$(CONFIG_LIBXEVD_DECODER) += libxevd.o
|
||||||
--- a/libavcodec/allcodecs.c
|
--- a/libavcodec/allcodecs.c
|
||||||
+++ b/libavcodec/allcodecs.c
|
+++ b/libavcodec/allcodecs.c
|
||||||
@@ -827,6 +827,7 @@ extern const FFCodec ff_libxavs_encoder;
|
@@ -844,6 +844,7 @@ extern const FFCodec ff_libxavs_encoder;
|
||||||
extern const FFCodec ff_libxavs2_encoder;
|
extern const FFCodec ff_libxavs2_encoder;
|
||||||
extern const FFCodec ff_libxvid_encoder;
|
extern const FFCodec ff_libxvid_encoder;
|
||||||
extern const FFCodec ff_libzvbi_teletext_decoder;
|
extern const FFCodec ff_libzvbi_teletext_decoder;
|
||||||
|
|||||||
@@ -0,0 +1,761 @@
|
|||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -299,6 +299,7 @@ External library support:
|
||||||
|
--enable-libvorbis enable Vorbis en/decoding via libvorbis,
|
||||||
|
native implementation exists [no]
|
||||||
|
--enable-libvpx enable VP8 and VP9 de/encoding via libvpx [no]
|
||||||
|
+ --enable-libsvtvp9 enable VP9 encoding via svt [no]
|
||||||
|
--enable-libvvenc enable H.266/VVC encoding via vvenc [no]
|
||||||
|
--enable-libwebp enable WebP encoding via libwebp [no]
|
||||||
|
--enable-libx264 enable H.264 encoding via x264 [no]
|
||||||
|
@@ -2103,6 +2104,7 @@ EXTERNAL_LIBRARY_LIST="
|
||||||
|
libvmaf
|
||||||
|
libvorbis
|
||||||
|
libvpx
|
||||||
|
+ libsvtvp9
|
||||||
|
libvvenc
|
||||||
|
libwebp
|
||||||
|
libxevd
|
||||||
|
@@ -3827,6 +3829,7 @@ libvpx_vp8_decoder_deps="libvpx"
|
||||||
|
libvpx_vp8_encoder_deps="libvpx"
|
||||||
|
libvpx_vp9_decoder_deps="libvpx"
|
||||||
|
libvpx_vp9_encoder_deps="libvpx"
|
||||||
|
+libsvt_vp9_encoder_deps="libsvtvp9"
|
||||||
|
libvvenc_encoder_deps="libvvenc"
|
||||||
|
libwebp_encoder_deps="libwebp"
|
||||||
|
libwebp_anim_encoder_deps="libwebp"
|
||||||
|
@@ -7423,6 +7426,7 @@ enabled libvpx && {
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
+enabled libsvtvp9 && require_pkg_config libsvtvp9 SvtVp9Enc EbSvtVp9Enc.h eb_vp9_svt_init_handle
|
||||||
|
enabled libvvenc && require_pkg_config libvvenc "libvvenc >= 1.6.1" "vvenc/vvenc.h" vvenc_get_version
|
||||||
|
enabled libwebp && {
|
||||||
|
enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
|
||||||
|
--- a/libavcodec/Makefile
|
||||||
|
+++ b/libavcodec/Makefile
|
||||||
|
@@ -1221,6 +1221,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_DECODER) += libvpxdec.o
|
||||||
|
OBJS-$(CONFIG_LIBVPX_VP8_ENCODER) += libvpxenc.o
|
||||||
|
OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o
|
||||||
|
OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o
|
||||||
|
+OBJS-$(CONFIG_LIBSVT_VP9_ENCODER) += libsvt_vp9.o
|
||||||
|
OBJS-$(CONFIG_LIBVVENC_ENCODER) += libvvenc.o
|
||||||
|
OBJS-$(CONFIG_LIBWEBP_ENCODER) += libwebpenc_common.o libwebpenc.o
|
||||||
|
OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER) += libwebpenc_common.o libwebpenc_animencoder.o
|
||||||
|
--- a/libavcodec/allcodecs.c
|
||||||
|
+++ b/libavcodec/allcodecs.c
|
||||||
|
@@ -830,6 +830,7 @@ extern const FFCodec ff_libvpx_vp8_encoder;
|
||||||
|
extern const FFCodec ff_libvpx_vp8_decoder;
|
||||||
|
extern FFCodec ff_libvpx_vp9_encoder;
|
||||||
|
extern const FFCodec ff_libvpx_vp9_decoder;
|
||||||
|
+extern const FFCodec ff_libsvt_vp9_encoder;
|
||||||
|
extern const FFCodec ff_libvvenc_encoder;
|
||||||
|
/* preferred over libwebp */
|
||||||
|
extern const FFCodec ff_libwebp_anim_encoder;
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/libavcodec/libsvt_vp9.c
|
||||||
|
@@ -0,0 +1,701 @@
|
||||||
|
+/*
|
||||||
|
+* Scalable Video Technology for VP9 encoder library plugin
|
||||||
|
+*
|
||||||
|
+* Copyright (c) 2018 Intel Corporation
|
||||||
|
+*
|
||||||
|
+* This file is part of FFmpeg.
|
||||||
|
+*
|
||||||
|
+* FFmpeg is free software; you can redistribute it and/or
|
||||||
|
+* modify it under the terms of the GNU Lesser General Public
|
||||||
|
+* License as published by the Free Software Foundation; either
|
||||||
|
+* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
+*
|
||||||
|
+* FFmpeg is distributed in the hope that it will be useful,
|
||||||
|
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
+* Lesser General Public License for more details.
|
||||||
|
+*
|
||||||
|
+* You should have received a copy of the GNU Lesser General Public
|
||||||
|
+* License along with this program; if not, write to the Free Software
|
||||||
|
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
+*/
|
||||||
|
+
|
||||||
|
+#include <stdint.h>
|
||||||
|
+#include "EbSvtVp9ErrorCodes.h"
|
||||||
|
+#include "EbSvtVp9Enc.h"
|
||||||
|
+
|
||||||
|
+#include "libavutil/common.h"
|
||||||
|
+#include "libavutil/frame.h"
|
||||||
|
+#include "libavutil/mem.h"
|
||||||
|
+#include "libavutil/opt.h"
|
||||||
|
+#include "libavcodec/get_bits.h"
|
||||||
|
+
|
||||||
|
+#include "codec_internal.h"
|
||||||
|
+#include "internal.h"
|
||||||
|
+#include "encode.h"
|
||||||
|
+#include "avcodec.h"
|
||||||
|
+
|
||||||
|
+#define SUPERFRAME_INDEX_MAX_SIZE 128
|
||||||
|
+
|
||||||
|
+#define RECIVED_FRAMES_MAX_SIZE 32
|
||||||
|
+#define MAX_VP9_SUPERFRAME_SIZE 8
|
||||||
|
+
|
||||||
|
+typedef enum eos_status {
|
||||||
|
+ EOS_NOT_REACHED = 0,
|
||||||
|
+ EOS_REACHED,
|
||||||
|
+ EOS_TOTRIGGER
|
||||||
|
+}EOS_STATUS;
|
||||||
|
+
|
||||||
|
+typedef struct SvtReceivedFrameStruct {
|
||||||
|
+ // fields for AVPacket
|
||||||
|
+ AVBufferRef *buf;
|
||||||
|
+ int64_t pts;
|
||||||
|
+ int64_t dts;
|
||||||
|
+ int size;
|
||||||
|
+ int flags;
|
||||||
|
+
|
||||||
|
+ // svt fields:
|
||||||
|
+ int ready_flag; // frame or superframe in data is visible
|
||||||
|
+ int frames_count;
|
||||||
|
+ int frames_sizes[MAX_VP9_SUPERFRAME_SIZE];
|
||||||
|
+} SvtReceivedFrameStruct;
|
||||||
|
+
|
||||||
|
+typedef struct SvtContext {
|
||||||
|
+ AVClass *class;
|
||||||
|
+
|
||||||
|
+ EbSvtVp9EncConfiguration enc_params;
|
||||||
|
+ EbComponentType *svt_handle;
|
||||||
|
+
|
||||||
|
+ EbBufferHeaderType *in_buf;
|
||||||
|
+ int raw_size;
|
||||||
|
+
|
||||||
|
+ AVFrame *frame;
|
||||||
|
+
|
||||||
|
+ AVBufferPool* pool;
|
||||||
|
+
|
||||||
|
+ EOS_STATUS eos_flag;
|
||||||
|
+
|
||||||
|
+ // User options.
|
||||||
|
+ int enc_mode;
|
||||||
|
+ int rc_mode;
|
||||||
|
+ int tune;
|
||||||
|
+ int qp;
|
||||||
|
+
|
||||||
|
+ int target_socket;
|
||||||
|
+
|
||||||
|
+ int forced_idr;
|
||||||
|
+
|
||||||
|
+ int level;
|
||||||
|
+
|
||||||
|
+ int base_layer_switch_mode;
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ int64_t last_ready_dts;
|
||||||
|
+ SvtReceivedFrameStruct received_frames[RECIVED_FRAMES_MAX_SIZE];
|
||||||
|
+ int received_frames_size;
|
||||||
|
+} SvtContext;
|
||||||
|
+
|
||||||
|
+static int error_mapping(EbErrorType svt_ret)
|
||||||
|
+{
|
||||||
|
+ int err;
|
||||||
|
+
|
||||||
|
+ switch (svt_ret) {
|
||||||
|
+ case EB_ErrorInsufficientResources:
|
||||||
|
+ err = AVERROR(ENOMEM);
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case EB_ErrorUndefined:
|
||||||
|
+ case EB_ErrorInvalidComponent:
|
||||||
|
+ case EB_ErrorBadParameter:
|
||||||
|
+ err = AVERROR(EINVAL);
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case EB_ErrorDestroyThreadFailed:
|
||||||
|
+ case EB_ErrorSemaphoreUnresponsive:
|
||||||
|
+ case EB_ErrorDestroySemaphoreFailed:
|
||||||
|
+ case EB_ErrorCreateMutexFailed:
|
||||||
|
+ case EB_ErrorMutexUnresponsive:
|
||||||
|
+ case EB_ErrorDestroyMutexFailed:
|
||||||
|
+ err = AVERROR_EXTERNAL;
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case EB_NoErrorEmptyQueue:
|
||||||
|
+ err = AVERROR(EAGAIN);
|
||||||
|
+
|
||||||
|
+ case EB_ErrorNone:
|
||||||
|
+ err = 0;
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ default:
|
||||||
|
+ err = AVERROR_UNKNOWN;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return err;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void free_buffer(SvtContext *svt_enc)
|
||||||
|
+{
|
||||||
|
+ if (svt_enc->in_buf) {
|
||||||
|
+ EbSvtEncInput *in_data = (EbSvtEncInput *)svt_enc->in_buf->p_buffer;
|
||||||
|
+ av_freep(&in_data);
|
||||||
|
+ av_freep(&svt_enc->in_buf);
|
||||||
|
+ }
|
||||||
|
+ av_buffer_pool_uninit(&svt_enc->pool);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int alloc_buffer(EbSvtVp9EncConfiguration *config, SvtContext *svt_enc)
|
||||||
|
+{
|
||||||
|
+ const size_t luma_size_8bit =
|
||||||
|
+ config->source_width * config->source_height;
|
||||||
|
+ const size_t luma_size_10bit =
|
||||||
|
+ (config->encoder_bit_depth > 8) ? luma_size_8bit : 0;
|
||||||
|
+
|
||||||
|
+ EbSvtEncInput *in_data;
|
||||||
|
+
|
||||||
|
+ svt_enc->raw_size = ((luma_size_8bit + luma_size_10bit) * 3 / 2) * MAX_VP9_SUPERFRAME_SIZE + SUPERFRAME_INDEX_MAX_SIZE;
|
||||||
|
+
|
||||||
|
+ // allocate buffer for in and out
|
||||||
|
+ svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
|
||||||
|
+ if (!svt_enc->in_buf)
|
||||||
|
+ goto failed;
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ svt_enc->in_buf->p_buffer = (unsigned char *)av_mallocz(sizeof(*in_data));
|
||||||
|
+ if (!svt_enc->in_buf->p_buffer)
|
||||||
|
+ goto failed;
|
||||||
|
+
|
||||||
|
+ svt_enc->in_buf->size = sizeof(*svt_enc->in_buf);
|
||||||
|
+ svt_enc->in_buf->p_app_private = NULL;
|
||||||
|
+
|
||||||
|
+ svt_enc->pool = av_buffer_pool_init(svt_enc->raw_size, NULL);
|
||||||
|
+ if (!svt_enc->pool)
|
||||||
|
+ goto failed;
|
||||||
|
+
|
||||||
|
+ svt_enc->received_frames_size = 0;
|
||||||
|
+ svt_enc->last_ready_dts = -1e9;
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+failed:
|
||||||
|
+ free_buffer(svt_enc);
|
||||||
|
+ return AVERROR(ENOMEM);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int config_enc_params(EbSvtVp9EncConfiguration *param,
|
||||||
|
+ AVCodecContext *avctx)
|
||||||
|
+{
|
||||||
|
+ SvtContext *svt_enc = avctx->priv_data;
|
||||||
|
+ int ret;
|
||||||
|
+ int ten_bits = 0;
|
||||||
|
+
|
||||||
|
+ param->source_width = avctx->width;
|
||||||
|
+ param->source_height = avctx->height;
|
||||||
|
+
|
||||||
|
+ if (avctx->pix_fmt == AV_PIX_FMT_YUV420P10LE) {
|
||||||
|
+ av_log(avctx, AV_LOG_DEBUG , "Encoder 10 bits depth input\n");
|
||||||
|
+ // Disable Compressed 10-bit format default
|
||||||
|
+ ten_bits = 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Update param from options
|
||||||
|
+ param->enc_mode = svt_enc->enc_mode;
|
||||||
|
+ param->level = svt_enc->level;
|
||||||
|
+ param->rate_control_mode = svt_enc->rc_mode;
|
||||||
|
+ param->tune = svt_enc->tune;
|
||||||
|
+ param->base_layer_switch_mode = svt_enc->base_layer_switch_mode;
|
||||||
|
+ param->qp = svt_enc->qp;
|
||||||
|
+ param->target_socket = svt_enc->target_socket;
|
||||||
|
+ param->target_bit_rate = avctx->bit_rate;
|
||||||
|
+ if (avctx->gop_size > 0)
|
||||||
|
+ param->intra_period = avctx->gop_size - 1;
|
||||||
|
+
|
||||||
|
+ if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
|
||||||
|
+ param->frame_rate_numerator = avctx->framerate.num;
|
||||||
|
+ param->frame_rate_denominator = avctx->framerate.den;
|
||||||
|
+ } else {
|
||||||
|
+ param->frame_rate_numerator = avctx->time_base.den;
|
||||||
|
+ param->frame_rate_denominator = avctx->time_base.num;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (param->rate_control_mode) {
|
||||||
|
+ param->max_qp_allowed = avctx->qmax;
|
||||||
|
+ param->min_qp_allowed = avctx->qmin;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ten_bits) {
|
||||||
|
+ param->encoder_bit_depth = 10;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ret = alloc_buffer(param, svt_enc);
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void read_in_data(EbSvtVp9EncConfiguration *config,
|
||||||
|
+ const AVFrame *frame,
|
||||||
|
+ EbBufferHeaderType *headerPtr)
|
||||||
|
+{
|
||||||
|
+ uint8_t is16bit = config->encoder_bit_depth > 8;
|
||||||
|
+ uint64_t luma_size =
|
||||||
|
+ (uint64_t)config->source_width * config->source_height<< is16bit;
|
||||||
|
+ EbSvtEncInput *in_data = (EbSvtEncInput *)headerPtr->p_buffer;
|
||||||
|
+
|
||||||
|
+ // support yuv420p and yuv420p010
|
||||||
|
+ in_data->luma = frame->data[0];
|
||||||
|
+ in_data->cb = frame->data[1];
|
||||||
|
+ in_data->cr = frame->data[2];
|
||||||
|
+
|
||||||
|
+ // stride info
|
||||||
|
+ in_data->y_stride = frame->linesize[0] >> is16bit;
|
||||||
|
+ in_data->cb_stride = frame->linesize[1] >> is16bit;
|
||||||
|
+ in_data->cr_stride = frame->linesize[2] >> is16bit;
|
||||||
|
+
|
||||||
|
+ headerPtr->n_filled_len += luma_size * 3/2u;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static av_cold int eb_enc_init(AVCodecContext *avctx)
|
||||||
|
+{
|
||||||
|
+ SvtContext *svt_enc = avctx->priv_data;
|
||||||
|
+ EbErrorType svt_ret;
|
||||||
|
+
|
||||||
|
+ svt_enc->eos_flag = EOS_NOT_REACHED;
|
||||||
|
+
|
||||||
|
+ svt_ret = eb_vp9_svt_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
|
||||||
|
+ if (svt_ret != EB_ErrorNone) {
|
||||||
|
+ av_log(avctx, AV_LOG_ERROR, "Error init encoder handle\n");
|
||||||
|
+ goto failed;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ svt_ret = config_enc_params(&svt_enc->enc_params, avctx);
|
||||||
|
+ if (svt_ret != EB_ErrorNone) {
|
||||||
|
+ av_log(avctx, AV_LOG_ERROR, "Error configure encoder parameters\n");
|
||||||
|
+ goto failed_init_handle;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ svt_ret = eb_vp9_svt_enc_set_parameter(svt_enc->svt_handle, &svt_enc->enc_params);
|
||||||
|
+ if (svt_ret != EB_ErrorNone) {
|
||||||
|
+ av_log(avctx, AV_LOG_ERROR, "Error setting encoder parameters\n");
|
||||||
|
+ goto failed_init_handle;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ svt_ret = eb_vp9_init_encoder(svt_enc->svt_handle);
|
||||||
|
+ if (svt_ret != EB_ErrorNone) {
|
||||||
|
+ av_log(avctx, AV_LOG_ERROR, "Error init encoder\n");
|
||||||
|
+ goto failed_init_handle;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ svt_enc->frame = av_frame_alloc();
|
||||||
|
+ if (!svt_enc->frame)
|
||||||
|
+ return AVERROR(ENOMEM);
|
||||||
|
+
|
||||||
|
+ // if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
|
||||||
|
+ // EbBufferHeaderType* headerPtr;
|
||||||
|
+ // headerPtr->size = sizeof(headerPtr);
|
||||||
|
+ // headerPtr->n_filled_len = 0; /* in/out */
|
||||||
|
+ // headerPtr->p_buffer = av_malloc(10 * 1024 * 1024);
|
||||||
|
+ // headerPtr->n_alloc_len = (10 * 1024 * 1024);
|
||||||
|
+ //
|
||||||
|
+ // if (!headerPtr->p_buffer) {
|
||||||
|
+ // av_log(avctx, AV_LOG_ERROR,
|
||||||
|
+ // "Cannot allocate buffer size %d.\n", headerPtr->n_alloc_len);
|
||||||
|
+ // svt_ret = EB_ErrorInsufficientResources;
|
||||||
|
+ // goto failed_init_enc;
|
||||||
|
+ // }
|
||||||
|
+ //
|
||||||
|
+ // svt_ret = eb_svt_enc_stream_header(svt_enc->svt_handle, &headerPtr);
|
||||||
|
+ // if (svt_ret != EB_ErrorNone) {
|
||||||
|
+ // av_log(avctx, AV_LOG_ERROR, "Error when build stream header.\n");
|
||||||
|
+ // av_freep(&headerPtr->p_buffer);
|
||||||
|
+ // goto failed_init_enc;
|
||||||
|
+ // }
|
||||||
|
+ //
|
||||||
|
+ // avctx->extradata_size = headerPtr->n_filled_len;
|
||||||
|
+ // avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
|
||||||
|
+ // if (!avctx->extradata) {
|
||||||
|
+ // av_log(avctx, AV_LOG_ERROR,
|
||||||
|
+ // "Cannot allocate VP9 header of size %d.\n", avctx->extradata_size);
|
||||||
|
+ // av_freep(&headerPtr->p_buffer);
|
||||||
|
+ // svt_ret = EB_ErrorInsufficientResources;
|
||||||
|
+ // goto failed_init_enc;
|
||||||
|
+ // }
|
||||||
|
+ // memcpy(avctx->extradata, headerPtr->p_buffer, avctx->extradata_size);
|
||||||
|
+ //
|
||||||
|
+ // av_freep(&headerPtr->p_buffer);
|
||||||
|
+ // }
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+//failed_init_enc:
|
||||||
|
+// eb_deinit_encoder(svt_enc->svt_handle);
|
||||||
|
+failed_init_handle:
|
||||||
|
+ eb_vp9_deinit_handle(svt_enc->svt_handle);
|
||||||
|
+failed:
|
||||||
|
+ free_buffer(svt_enc);
|
||||||
|
+ return error_mapping(svt_ret);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int eb_send_frame(AVCodecContext *avctx, const AVFrame *frame)
|
||||||
|
+{
|
||||||
|
+ SvtContext *svt_enc = avctx->priv_data;
|
||||||
|
+ EbBufferHeaderType *headerPtr = svt_enc->in_buf;
|
||||||
|
+
|
||||||
|
+ if (!frame) {
|
||||||
|
+ if (svt_enc->eos_flag == EOS_REACHED)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ EbBufferHeaderType headerPtrLast;
|
||||||
|
+ headerPtrLast.n_alloc_len = 0;
|
||||||
|
+ headerPtrLast.n_filled_len = 0;
|
||||||
|
+ headerPtrLast.n_tick_count = 0;
|
||||||
|
+ headerPtrLast.p_app_private = NULL;
|
||||||
|
+ headerPtrLast.p_buffer = NULL;
|
||||||
|
+ headerPtrLast.flags = EB_BUFFERFLAG_EOS;
|
||||||
|
+
|
||||||
|
+ eb_vp9_svt_enc_send_picture(svt_enc->svt_handle, &headerPtrLast);
|
||||||
|
+ svt_enc->eos_flag = EOS_REACHED;
|
||||||
|
+ av_log(avctx, AV_LOG_DEBUG, "Finish sending frames!!!\n");
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ read_in_data(&svt_enc->enc_params, frame, headerPtr);
|
||||||
|
+
|
||||||
|
+ headerPtr->flags = 0;
|
||||||
|
+ headerPtr->p_app_private = NULL;
|
||||||
|
+ headerPtr->pts = frame->pts;
|
||||||
|
+ switch (frame->pict_type) {
|
||||||
|
+ case AV_PICTURE_TYPE_I:
|
||||||
|
+ headerPtr->pic_type = svt_enc->forced_idr > 0 ? EB_IDR_PICTURE : EB_I_PICTURE;
|
||||||
|
+ break;
|
||||||
|
+ case AV_PICTURE_TYPE_P:
|
||||||
|
+ headerPtr->pic_type = EB_P_PICTURE;
|
||||||
|
+ break;
|
||||||
|
+ case AV_PICTURE_TYPE_B:
|
||||||
|
+ headerPtr->pic_type = EB_B_PICTURE;
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ headerPtr->pic_type = EB_INVALID_PICTURE;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ eb_vp9_svt_enc_send_picture(svt_enc->svt_handle, headerPtr);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int is_frame_visible(uint8_t const* ptr, int size) {
|
||||||
|
+ GetBitContext gb;
|
||||||
|
+ int ret, visible, profile;
|
||||||
|
+ if ((ret = init_get_bits8(&gb, ptr, size)) < 0) {
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // frame marker
|
||||||
|
+ get_bits(&gb, 2);
|
||||||
|
+ profile = get_bits1(&gb);
|
||||||
|
+ profile |= get_bits1(&gb) << 1;
|
||||||
|
+
|
||||||
|
+ // reserved_zero
|
||||||
|
+ if (profile == 3) profile += get_bits1(&gb); // reserved_zero
|
||||||
|
+
|
||||||
|
+ // read show_existing_frame
|
||||||
|
+ if (get_bits1(&gb)) {
|
||||||
|
+ // show_existing_frame == 1
|
||||||
|
+ visible = 1;
|
||||||
|
+ } else {
|
||||||
|
+ // show_existing_frame == 0
|
||||||
|
+ // keyframe (frame_type actually)
|
||||||
|
+ get_bits1(&gb);
|
||||||
|
+ // read show_frame
|
||||||
|
+ visible = get_bits1(&gb) ? 2 : 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return visible;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int get_received_frame(SvtContext *svt_enc, AVPacket *pkt) {
|
||||||
|
+ SvtReceivedFrameStruct* rfs = &svt_enc->received_frames[0];
|
||||||
|
+
|
||||||
|
+ if (svt_enc->received_frames_size == 0 || !rfs->ready_flag) {
|
||||||
|
+ return AVERROR(EAGAIN);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ pkt->buf = rfs->buf;
|
||||||
|
+ pkt->data = rfs->buf->data;
|
||||||
|
+ pkt->dts = rfs->dts;
|
||||||
|
+ pkt->pts = rfs->pts;
|
||||||
|
+ pkt->flags = rfs->flags;
|
||||||
|
+ pkt->size = rfs->size;
|
||||||
|
+
|
||||||
|
+ --svt_enc->received_frames_size;
|
||||||
|
+ for (int i = 0; i < svt_enc->received_frames_size; ++i) {
|
||||||
|
+ svt_enc->received_frames[i] = svt_enc->received_frames[i + 1];
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int put_received_frame(AVCodecContext *avctx, uint8_t* data, int size, int keyframe, int64_t dts, int64_t pts) {
|
||||||
|
+ SvtContext *svt_enc = avctx->priv_data;
|
||||||
|
+ SvtReceivedFrameStruct* rfs;
|
||||||
|
+
|
||||||
|
+ if (svt_enc->received_frames_size == 0 || svt_enc->received_frames[svt_enc->received_frames_size - 1].ready_flag) {
|
||||||
|
+ ++svt_enc->received_frames_size;
|
||||||
|
+ if (svt_enc->received_frames_size > RECIVED_FRAMES_MAX_SIZE) {
|
||||||
|
+ av_log(avctx, AV_LOG_ERROR, "Fail: svt_enc->received_frames_size > RECIVED_FRAMES_MAX_SIZE \n");
|
||||||
|
+ return AVERROR_BUG;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ rfs = &svt_enc->received_frames[svt_enc->received_frames_size - 1];
|
||||||
|
+
|
||||||
|
+ rfs->buf = av_buffer_pool_get(svt_enc->pool);
|
||||||
|
+ if (!rfs->buf) {
|
||||||
|
+ av_log(avctx, AV_LOG_ERROR, "Failed to allocate output packet.\n");
|
||||||
|
+ return AVERROR(ENOMEM);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ rfs->size = 0;
|
||||||
|
+ rfs->flags = 0;
|
||||||
|
+ rfs->ready_flag = 0;
|
||||||
|
+ rfs->frames_count = 0;
|
||||||
|
+ } else {
|
||||||
|
+ rfs = &svt_enc->received_frames[svt_enc->received_frames_size - 1];
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ rfs->pts = pts;
|
||||||
|
+ rfs->dts = dts;
|
||||||
|
+ rfs->flags = (keyframe ? AV_PKT_FLAG_KEY : 0);
|
||||||
|
+
|
||||||
|
+ ++rfs->frames_count;
|
||||||
|
+ if (rfs->frames_count > MAX_VP9_SUPERFRAME_SIZE) {
|
||||||
|
+ av_log(avctx, AV_LOG_ERROR, "Fail: rfs->frames_count > MAX_VP9_SUPERFRAME_SIZE \n");
|
||||||
|
+ return AVERROR_BUG;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ rfs->frames_sizes[rfs->frames_count - 1] = size;
|
||||||
|
+
|
||||||
|
+ memcpy(rfs->buf->data + rfs->size, data, size);
|
||||||
|
+ rfs->size += size;
|
||||||
|
+
|
||||||
|
+ int visible = is_frame_visible(data, size);
|
||||||
|
+ if (visible < 0) {
|
||||||
|
+ av_log(avctx, AV_LOG_ERROR, "Fail: is_frame_visible \n");
|
||||||
|
+ return visible;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ rfs->ready_flag = visible;
|
||||||
|
+
|
||||||
|
+ if (rfs->ready_flag) {
|
||||||
|
+ if (rfs->dts <= svt_enc->last_ready_dts) {
|
||||||
|
+ rfs->dts = svt_enc->last_ready_dts + 1;
|
||||||
|
+ }
|
||||||
|
+ svt_enc->last_ready_dts = rfs->dts;
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // add superframe_index if needed
|
||||||
|
+ if (rfs->ready_flag && rfs->frames_count > 1) {
|
||||||
|
+ // superframe_header:
|
||||||
|
+ // 110 - superframe_marker
|
||||||
|
+ // 11 = 3 = bytes_per_framesize_minus_1 - use 4-bytes size
|
||||||
|
+ // xxx = frames_in_superframe_minus_1
|
||||||
|
+ uint8_t header = 0b11011000;
|
||||||
|
+ header |= (rfs->frames_count - 1) & 0b111;
|
||||||
|
+
|
||||||
|
+ uint8_t* ptr = rfs->buf->data + rfs->size;
|
||||||
|
+
|
||||||
|
+ ptr[0] = header;
|
||||||
|
+ ++ptr;
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < rfs->frames_count; ++i) {
|
||||||
|
+ ptr[0] = (rfs->frames_sizes[i] >> 0) & 0xff;
|
||||||
|
+ ptr[1] = (rfs->frames_sizes[i] >> 8) & 0xff;
|
||||||
|
+ ptr[2] = (rfs->frames_sizes[i] >> 16) & 0xff;
|
||||||
|
+ ptr[3] = (rfs->frames_sizes[i] >> 24) & 0xff;
|
||||||
|
+
|
||||||
|
+ ptr += 4;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ptr[0] = header;
|
||||||
|
+ ++ptr;
|
||||||
|
+
|
||||||
|
+ rfs->size = ptr - rfs->buf->data;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int eb_receive_packet(AVCodecContext *avctx, AVPacket *pkt)
|
||||||
|
+{
|
||||||
|
+ SvtContext *svt_enc = avctx->priv_data;
|
||||||
|
+ EbBufferHeaderType *headerPtr;
|
||||||
|
+ EbErrorType svt_ret;
|
||||||
|
+ AVBufferRef *ref;
|
||||||
|
+ int ret = 0;
|
||||||
|
+
|
||||||
|
+ if (get_received_frame(svt_enc, pkt) == 0) {
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (EOS_TOTRIGGER == svt_enc->eos_flag) {
|
||||||
|
+ pkt = NULL;
|
||||||
|
+ return AVERROR_EOF;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ AVFrame *frame = svt_enc->frame;
|
||||||
|
+ ret = ff_encode_get_frame(avctx, frame);
|
||||||
|
+ if (ret < 0 && ret != AVERROR_EOF) {
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+ if (ret == AVERROR_EOF)
|
||||||
|
+ frame = NULL;
|
||||||
|
+
|
||||||
|
+ ret = eb_send_frame(avctx, frame);
|
||||||
|
+ if (ret < 0)
|
||||||
|
+ return ret;
|
||||||
|
+ av_frame_unref(svt_enc->frame);
|
||||||
|
+
|
||||||
|
+ for (;;) {
|
||||||
|
+ svt_ret = eb_vp9_svt_get_packet(svt_enc->svt_handle, &headerPtr, svt_enc->eos_flag);
|
||||||
|
+ if (svt_ret == EB_NoErrorEmptyQueue) {
|
||||||
|
+ return AVERROR(EAGAIN);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (EB_BUFFERFLAG_EOS & headerPtr->flags)
|
||||||
|
+ svt_enc->eos_flag = EOS_TOTRIGGER;
|
||||||
|
+
|
||||||
|
+ ret = 0;
|
||||||
|
+
|
||||||
|
+ // ignore headerPtr->dts on purpose
|
||||||
|
+
|
||||||
|
+ if (headerPtr->flags & EB_BUFFERFLAG_SHOW_EXT) {
|
||||||
|
+ ret = put_received_frame(avctx, headerPtr->p_buffer, headerPtr->n_filled_len - 4, 0, headerPtr->pts - 3, headerPtr->pts - 3);
|
||||||
|
+ if (ret != 0) goto end;
|
||||||
|
+ ret = put_received_frame(avctx, headerPtr->p_buffer + headerPtr->n_filled_len - 4, 1, 0, headerPtr->pts - 2, headerPtr->pts - 2);
|
||||||
|
+ if (ret != 0) goto end;
|
||||||
|
+ ret = put_received_frame(avctx, headerPtr->p_buffer + headerPtr->n_filled_len - 3, 1, 0, headerPtr->pts - 1, headerPtr->pts - 1);
|
||||||
|
+ if (ret != 0) goto end;
|
||||||
|
+ ret = put_received_frame(avctx, headerPtr->p_buffer + headerPtr->n_filled_len - 2, 1, 0, headerPtr->pts + 0, headerPtr->pts + 0);
|
||||||
|
+ if (ret != 0) goto end;
|
||||||
|
+ ret = put_received_frame(avctx, headerPtr->p_buffer + headerPtr->n_filled_len - 1, 1, 0, headerPtr->pts + 1, headerPtr->pts + 1);
|
||||||
|
+ if (ret != 0) goto end;
|
||||||
|
+ } else {
|
||||||
|
+ ret = put_received_frame(avctx, headerPtr->p_buffer, headerPtr->n_filled_len, headerPtr->pic_type == EB_IDR_PICTURE, headerPtr->pts, headerPtr->pts);
|
||||||
|
+ if (ret != 0) goto end;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ret = get_received_frame(svt_enc, pkt);
|
||||||
|
+
|
||||||
|
+ end:
|
||||||
|
+ eb_vp9_svt_release_out_buffer(&headerPtr);
|
||||||
|
+
|
||||||
|
+ if (ret == AVERROR(EAGAIN)) {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static av_cold int eb_enc_close(AVCodecContext *avctx)
|
||||||
|
+{
|
||||||
|
+ SvtContext *svt_enc = avctx->priv_data;
|
||||||
|
+
|
||||||
|
+ eb_vp9_deinit_encoder(svt_enc->svt_handle);
|
||||||
|
+ eb_vp9_deinit_handle(svt_enc->svt_handle);
|
||||||
|
+
|
||||||
|
+ av_frame_free(&svt_enc->frame);
|
||||||
|
+
|
||||||
|
+ free_buffer(svt_enc);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+#define OFFSET(x) offsetof(SvtContext, x)
|
||||||
|
+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
|
||||||
|
+static const AVOption options[] = {
|
||||||
|
+ { "preset", "Encoding preset [1, 1]",
|
||||||
|
+ OFFSET(enc_mode), AV_OPT_TYPE_INT, { .i64 = 9 }, 0, 9, VE },
|
||||||
|
+
|
||||||
|
+ { "level", "Set level (level_idc)", OFFSET(level),
|
||||||
|
+ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0xff, VE, "level" },
|
||||||
|
+
|
||||||
|
+#define LEVEL(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, \
|
||||||
|
+ { .i64 = value }, 0, 0, VE, "level"
|
||||||
|
+ { LEVEL("1", 10) },
|
||||||
|
+ { LEVEL("2", 20) },
|
||||||
|
+ { LEVEL("2.1", 21) },
|
||||||
|
+ { LEVEL("3", 30) },
|
||||||
|
+ { LEVEL("3.1", 31) },
|
||||||
|
+ { LEVEL("4", 40) },
|
||||||
|
+ { LEVEL("4.1", 41) },
|
||||||
|
+ { LEVEL("5", 50) },
|
||||||
|
+ { LEVEL("5.1", 51) },
|
||||||
|
+ { LEVEL("5.2", 52) },
|
||||||
|
+ { LEVEL("6", 60) },
|
||||||
|
+ { LEVEL("6.1", 61) },
|
||||||
|
+ { LEVEL("6.2", 62) },
|
||||||
|
+#undef LEVEL
|
||||||
|
+
|
||||||
|
+ { "tune", "Tune mode", OFFSET(tune),
|
||||||
|
+ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE , "tune"},
|
||||||
|
+ { "vq", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "tune" },
|
||||||
|
+ { "ssim", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "tune" },
|
||||||
|
+ { "vmaf", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "tune" },
|
||||||
|
+
|
||||||
|
+ { "rc", "Bit rate control mode", OFFSET(rc_mode),
|
||||||
|
+ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE , "rc"},
|
||||||
|
+ { "cqp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "rc" },
|
||||||
|
+ { "vbr", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "rc" },
|
||||||
|
+ { "cbr", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "rc" },
|
||||||
|
+
|
||||||
|
+ { "qp", "QP value for intra frames", OFFSET(qp),
|
||||||
|
+ AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE },
|
||||||
|
+
|
||||||
|
+ { "socket", "Target CPU socket to use. -1 use all available", OFFSET(target_socket),
|
||||||
|
+ AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE },
|
||||||
|
+
|
||||||
|
+ { "bl_mode", "Random Access Prediction Structure type setting", OFFSET(base_layer_switch_mode),
|
||||||
|
+ AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
||||||
|
+
|
||||||
|
+ { "forced-idr", "If forcing keyframes, force them as IDR frames.", OFFSET(forced_idr),
|
||||||
|
+ AV_OPT_TYPE_BOOL, { .i64 = 0 }, -1, 1, VE },
|
||||||
|
+
|
||||||
|
+ {NULL},
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static const AVClass class = {
|
||||||
|
+ .class_name = "libsvt_vp9",
|
||||||
|
+ .item_name = av_default_item_name,
|
||||||
|
+ .option = options,
|
||||||
|
+ .version = LIBAVUTIL_VERSION_INT,
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+static const FFCodecDefault eb_enc_defaults[] = {
|
||||||
|
+ { "b", "7M" },
|
||||||
|
+ { "flags", "-cgop" },
|
||||||
|
+ { "qmin", "10" },
|
||||||
|
+ { "qmax", "48" },
|
||||||
|
+ { NULL },
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+const FFCodec ff_libsvt_vp9_encoder = {
|
||||||
|
+ .p.name = "libsvt_vp9",
|
||||||
|
+ .p.long_name = NULL_IF_CONFIG_SMALL("SVT-VP9(Scalable Video Technology for VP9) encoder"),
|
||||||
|
+ .priv_data_size = sizeof(SvtContext),
|
||||||
|
+ .p.type = AVMEDIA_TYPE_VIDEO,
|
||||||
|
+ .p.id = AV_CODEC_ID_VP9,
|
||||||
|
+ .init = eb_enc_init,
|
||||||
|
+ FF_CODEC_RECEIVE_PACKET_CB(eb_receive_packet),
|
||||||
|
+ .close = eb_enc_close,
|
||||||
|
+ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS,
|
||||||
|
+ .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
|
||||||
|
+ FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP,
|
||||||
|
+ .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P,
|
||||||
|
+ AV_PIX_FMT_NONE },
|
||||||
|
+ .p.priv_class = &class,
|
||||||
|
+ .defaults = eb_enc_defaults,
|
||||||
|
+ .p.wrapper_name = "libsvt_vp9",
|
||||||
|
+};
|
||||||
|
--
|
||||||
|
2.50.1
|
||||||
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/libavformat/avformat.h
|
--- a/libavformat/avformat.h
|
||||||
+++ b/libavformat/avformat.h
|
+++ b/libavformat/avformat.h
|
||||||
@@ -1179,6 +1179,10 @@ typedef struct AVStreamGroup {
|
@@ -1178,6 +1178,10 @@ typedef struct AVStreamGroup {
|
||||||
|
|
||||||
struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
|
struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
|
||||||
|
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
/**
|
/**
|
||||||
--- a/libavformat/utils.c
|
--- a/libavformat/utils.c
|
||||||
+++ b/libavformat/utils.c
|
+++ b/libavformat/utils.c
|
||||||
@@ -47,6 +47,13 @@
|
@@ -51,6 +51,13 @@
|
||||||
* various utility functions for use within FFmpeg
|
* various utility functions for use within FFmpeg
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -6898,7 +6898,7 @@ if [ -z "$nvccflags" ]; then
|
@@ -7112,7 +7112,7 @@ if [ -z "$nvccflags" ]; then
|
||||||
nvccflags=$nvccflags_default
|
nvccflags=$nvccflags_default
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -2,10 +2,9 @@
|
|||||||
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
|
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
|
||||||
|
|
||||||
pkgname=ffmpeg-full
|
pkgname=ffmpeg-full
|
||||||
pkgver=8.0.1
|
pkgver=8.1
|
||||||
pkgrel=4
|
pkgrel=1
|
||||||
_svt_hevc_ver='4181c9ee0611baefb40b4c0ed10023cfd837d522'
|
_svt_hevc_ver='4181c9ee0611baefb40b4c0ed10023cfd837d522'
|
||||||
_svt_vp9_ver='290fb8c3662ed76a8887b587a9b8201878ba71ed'
|
|
||||||
_whispercpp_ver='1.8.3'
|
_whispercpp_ver='1.8.3'
|
||||||
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)'
|
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)'
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
@@ -28,7 +27,6 @@ depends=(
|
|||||||
'freetype2'
|
'freetype2'
|
||||||
'frei0r-plugins' # loaded on-demand by dlopen()
|
'frei0r-plugins' # loaded on-demand by dlopen()
|
||||||
'fribidi'
|
'fribidi'
|
||||||
'gcc-libs'
|
|
||||||
'glib2'
|
'glib2'
|
||||||
'glibc'
|
'glibc'
|
||||||
'glslang'
|
'glslang'
|
||||||
@@ -53,8 +51,10 @@ depends=(
|
|||||||
'libdvdnav'
|
'libdvdnav'
|
||||||
'libdvdread'
|
'libdvdread'
|
||||||
'libfdk-aac'
|
'libfdk-aac'
|
||||||
|
'libgcc'
|
||||||
'libgcrypt'
|
'libgcrypt'
|
||||||
'libgme'
|
'libgme'
|
||||||
|
'libgomp'
|
||||||
'libiec61883'
|
'libiec61883'
|
||||||
'libilbc'
|
'libilbc'
|
||||||
'libjxl'
|
'libjxl'
|
||||||
@@ -71,6 +71,7 @@ depends=(
|
|||||||
'librsvg'
|
'librsvg'
|
||||||
'libsoxr'
|
'libsoxr'
|
||||||
'libssh'
|
'libssh'
|
||||||
|
'libstdc++'
|
||||||
'libtheora'
|
'libtheora'
|
||||||
'libva'
|
'libva'
|
||||||
'libvdpau'
|
'libvdpau'
|
||||||
@@ -84,9 +85,11 @@ depends=(
|
|||||||
'libxv'
|
'libxv'
|
||||||
'libwebp'
|
'libwebp'
|
||||||
'lilv'
|
'lilv'
|
||||||
|
'mpeghdec'
|
||||||
'ocl-icd'
|
'ocl-icd'
|
||||||
'openal'
|
'openal'
|
||||||
'openapv'
|
'openapv'
|
||||||
|
'opencolorio'
|
||||||
'opencore-amr'
|
'opencore-amr'
|
||||||
'opencv'
|
'opencv'
|
||||||
'openh264'
|
'openh264'
|
||||||
@@ -108,6 +111,7 @@ depends=(
|
|||||||
'srt'
|
'srt'
|
||||||
'svt-av1'
|
'svt-av1'
|
||||||
'svt-hevc'
|
'svt-hevc'
|
||||||
|
'svt-jpeg-xs-git'
|
||||||
'svt-vp9'
|
'svt-vp9'
|
||||||
'tesseract'
|
'tesseract'
|
||||||
'twolame'
|
'twolame'
|
||||||
@@ -164,31 +168,21 @@ source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
|
|||||||
"https://github.com/ggml-org/whisper.cpp/archive/v${_whispercpp_ver}/whisper.cpp-${_whispercpp_ver}.tar.gz"
|
"https://github.com/ggml-org/whisper.cpp/archive/v${_whispercpp_ver}/whisper.cpp-${_whispercpp_ver}.tar.gz"
|
||||||
'010-ffmpeg-add-svt-hevc.patch'
|
'010-ffmpeg-add-svt-hevc.patch'
|
||||||
"020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
|
"020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
|
||||||
"030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch"
|
'030-ffmpeg-add-svt-vp9.patch'
|
||||||
'040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch'
|
'040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch'
|
||||||
'050-ffmpeg-fix-cuda-nvcc-with-gcc14.patch'
|
'050-ffmpeg-fix-cuda-nvcc-with-gcc14.patch'
|
||||||
'060-ffmpeg-whisper.cpp-fix-pkgconfig.patch'
|
'060-ffmpeg-whisper.cpp-fix-pkgconfig.patch'
|
||||||
'080-ffmpeg-cuda13-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f8a300c6739ea2ca648579d7faf3ae9811b9f19a'
|
|
||||||
'100-ffmpeg-add-opencv4-support.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/c4ce51ee62205c74604767f1b7dab6a036edac7f'
|
|
||||||
'110-ffmpeg-add-playback-support-to-decklink-sdk14.3-devices.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/0cd75dbfa0fc6c213cf9240b3c03c809070c5209'
|
|
||||||
'120-ffmpeg-add-decklink-sdk14.3-build-support.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/27e94281d1c880b4cae28738e35c0d6f9a58f06b'
|
|
||||||
'130-ffmpeg-svt-av1-4.0-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/a5d4c398b411a00ac09d8fe3b66117222323844c'
|
|
||||||
'LICENSE')
|
'LICENSE')
|
||||||
sha256sums=('05ee0b03119b45c0bdb4df654b96802e909e0a752f72e4fe3794f487229e5a41'
|
sha256sums=('b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'870ba21409cdf66697dc4db15ebdb13bc67037d76c7cc63756c81471d8f1731a'
|
'870ba21409cdf66697dc4db15ebdb13bc67037d76c7cc63756c81471d8f1731a'
|
||||||
'ccdc1cab97d1fe5a454cd57fbd2bb865256092d715fd7f380c30cc3f42891b3c'
|
'ff6dabc3cbef98d22cc8f081343d5c66b2564b3a898c2dbcc88baa5017d80232'
|
||||||
'a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81'
|
'a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81'
|
||||||
'1f06dfcb78e43a6c732cbc4f6ae583ae19fb111b56d33c8c860d5b6566c04f99'
|
'73e516bd771024f100983d0b7a5d43b49fd1e992c83e6caec445b7338e79e8c2'
|
||||||
'5cb2475de410f5696072687af88e91461cdacd1bb636ac14a3b348e3383934f1'
|
'95223dda645c15b3daf79cd4d55df5d4ac46207f749973396bb761b743586ed6'
|
||||||
'9f3d84b3abe1077b3d6c1a25f36dcddf6419a7fe3217a4edd52aab6f0e4cd838'
|
'1bbd783da8483e2cffe99715125dddbd88c81ae36f28eee5ae7df5705c448077'
|
||||||
'98b3d28cbd13bb575c602785f6b8cb0b66ea3128ab5a3a82fc1645822320c136'
|
'98b3d28cbd13bb575c602785f6b8cb0b66ea3128ab5a3a82fc1645822320c136'
|
||||||
'79e3fbc30c86e0db789af78e79dc23227e5f6887531bcd52b2defa8526d1455b'
|
|
||||||
'f5b448f7e6e567273f74ed6e62ed25d8470f6bc9183c247993f1c03e78b57587'
|
|
||||||
'd1c4bdbcdd5a852f46639e0cb3dbf0b4a71884487c9fbcdb38139a1e5e96ddaf'
|
|
||||||
'ee89e0759f5233d390e3a23415e2664aae38bbe89e10d49ecda8a06c26bd21ee'
|
|
||||||
'1dbbc1a4cf9834b3902236abc27fefe982da03a14bcaa89fb90c7c8bd10a1664'
|
|
||||||
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
|
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
|
||||||
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
|
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
|
||||||
|
|
||||||
@@ -196,15 +190,10 @@ prepare() {
|
|||||||
rm -f "ffmpeg-${pkgver}/libavcodec"/libsvt_{hevc,vp9}.c
|
rm -f "ffmpeg-${pkgver}/libavcodec"/libsvt_{hevc,vp9}.c
|
||||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/010-ffmpeg-add-svt-hevc.patch"
|
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/010-ffmpeg-add-svt-hevc.patch"
|
||||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"
|
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"
|
||||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
|
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/030-ffmpeg-add-svt-vp9.patch"
|
||||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"
|
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"
|
||||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/050-ffmpeg-fix-cuda-nvcc-with-gcc14.patch"
|
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/050-ffmpeg-fix-cuda-nvcc-with-gcc14.patch"
|
||||||
patch -d "whisper.cpp-${_whispercpp_ver}" -Np1 -i "${srcdir}/060-ffmpeg-whisper.cpp-fix-pkgconfig.patch"
|
patch -d "whisper.cpp-${_whispercpp_ver}" -Np1 -i "${srcdir}/060-ffmpeg-whisper.cpp-fix-pkgconfig.patch"
|
||||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/080-ffmpeg-cuda13-fix.patch"
|
|
||||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/100-ffmpeg-add-opencv4-support.patch"
|
|
||||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/110-ffmpeg-add-playback-support-to-decklink-sdk14.3-devices.patch"
|
|
||||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/120-ffmpeg-add-decklink-sdk14.3-build-support.patch"
|
|
||||||
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/130-ffmpeg-svt-av1-4.0-fix.patch"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
@@ -267,6 +256,7 @@ build() {
|
|||||||
--enable-alsa \
|
--enable-alsa \
|
||||||
--enable-avisynth \
|
--enable-avisynth \
|
||||||
--enable-bzlib \
|
--enable-bzlib \
|
||||||
|
--enable-cairo \
|
||||||
--enable-chromaprint \
|
--enable-chromaprint \
|
||||||
--enable-frei0r \
|
--enable-frei0r \
|
||||||
--enable-gcrypt \
|
--enable-gcrypt \
|
||||||
@@ -310,7 +300,9 @@ build() {
|
|||||||
--enable-liblensfun \
|
--enable-liblensfun \
|
||||||
--enable-libmodplug \
|
--enable-libmodplug \
|
||||||
--enable-libmp3lame \
|
--enable-libmp3lame \
|
||||||
|
--enable-libmpeghdec \
|
||||||
--enable-liboapv \
|
--enable-liboapv \
|
||||||
|
--enable-libopencolorio \
|
||||||
--enable-libopencore-amrnb \
|
--enable-libopencore-amrnb \
|
||||||
--enable-libopencore-amrwb \
|
--enable-libopencore-amrwb \
|
||||||
--enable-libopencv \
|
--enable-libopencv \
|
||||||
@@ -339,6 +331,7 @@ build() {
|
|||||||
--enable-libssh \
|
--enable-libssh \
|
||||||
--enable-libsvtav1 \
|
--enable-libsvtav1 \
|
||||||
--enable-libsvthevc \
|
--enable-libsvthevc \
|
||||||
|
--enable-libsvtjpegxs \
|
||||||
--enable-libsvtvp9 \
|
--enable-libsvtvp9 \
|
||||||
--disable-libtensorflow \
|
--disable-libtensorflow \
|
||||||
--enable-libtesseract \
|
--enable-libtesseract \
|
||||||
|
|||||||
Reference in New Issue
Block a user