summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-09-08 13:26:38 +0000
committerDaniel Bermond2020-09-08 13:32:16 +0000
commitbd252d99089862a9c74d43a88837d243c52de38e (patch)
tree5fe31759e669b5ae82227fb7689045f377f637dd
parentf06e41fe331dab95b4be5e361d629f059ee0d40e (diff)
downloadaur-bd252d99089862a9c74d43a88837d243c52de38e.tar.gz
Temporarily disable glslang. Fix svt-hevc doc patch.
Upstream ffmpeg now requires[1] a glslang version that is not yet on the official repositories. glslang-git from the AUR can be used, but the package needs a lot of improvements (see comments on the package page). Temporarily disable it until we have a supported glslang version on the official repositories or until glslang-git is improved. The patch for svt-hevc doc currently fails to apply becasue there was a split on upstream file doc/general.texi[2]. Now it's splitted into doc/general_contents.texi. A local modification of the patch does the job. Upstream svt-hevc updated[3] their patch to work with the current ffmpeg git master, so we do not need the custom patch anymore. Now using the svt-hevc patch directly from upstream. Also on this commit: refresh the vmaf and cuda11 patches. References ---------- [1] https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=98ea1a662ee172961feaa374fe8d26078838d250 [2] https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=6accb7718aa4c9f5ca8f3280a1ed4e09587a627f [3] https://github.com/OpenVisualCloud/SVT-HEVC/commit/ead6fdf7c9ff84511b42fc1658c1654b84d83e4b
-rw-r--r--.SRCINFO13
-rw-r--r--010-ffmpeg-fix-vmaf-model-path.patch2
-rw-r--r--015-ffmpeg-cuda11-fix.patch2
-rw-r--r--020-ffmpeg-add-svt-hevc.patch616
-rw-r--r--PKGBUILD23
5 files changed, 20 insertions, 636 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a35e596b8b7..34f299268bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-full-git
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)
- pkgver = 4.4.r98732.g9f702fc8f4
+ pkgver = 4.4.r99044.gd1f3d721df
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -37,7 +37,6 @@ pkgbase = ffmpeg-full-git
depends = fontconfig
depends = freetype2
depends = fribidi
- depends = glslang
depends = libgme
depends = gsm
depends = libiec61883
@@ -132,14 +131,14 @@ pkgbase = ffmpeg-full-git
source = git+https://git.ffmpeg.org/ffmpeg.git
source = 010-ffmpeg-fix-vmaf-model-path.patch
source = 015-ffmpeg-cuda11-fix.patch
- source = 020-ffmpeg-add-svt-hevc.patch
- source = 030-ffmpeg-add-svt-hevc-docs-1.5.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.5.0/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
+ source = 020-ffmpeg-add-svt-hevc-gead6fdf.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/ead6fdf7c9ff84511b42fc1658c1654b84d83e4b/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
+ source = 030-ffmpeg-add-svt-hevc-docs-gead6fdf.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/ead6fdf7c9ff84511b42fc1658c1654b84d83e4b/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
source = 040-ffmpeg-add-svt-vp9-0.2.2.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/v0.2.2/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
source = LICENSE
sha256sums = SKIP
- sha256sums = b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02
- sha256sums = 12cb889fd2ddd03ecc0f5fa2e345c7787ff4b28c4d284a5c694c71d5a590763c
- sha256sums = fecb280e4ebb4ad8a3ec0385f6f32fcf90656fea989a6182abcc4104f266bde4
+ sha256sums = 52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50
+ sha256sums = 87292cf51f47e4408b0b7b0ee8387d18cf7ea7d352832d5d97c413456eb34b38
+ sha256sums = 05ec4d3323dc80ef6c1d4d6d50d339accd51d22b12a735b7a6605f10feb09cec
sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
sha256sums = b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
diff --git a/010-ffmpeg-fix-vmaf-model-path.patch b/010-ffmpeg-fix-vmaf-model-path.patch
index 1e92c02e559..547b3fe8c0d 100644
--- a/010-ffmpeg-fix-vmaf-model-path.patch
+++ b/010-ffmpeg-fix-vmaf-model-path.patch
@@ -7,5 +7,5 @@
- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
+ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
{"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
- {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"log_fmt", "Set the format of the log (csv, json or xml).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
{"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
diff --git a/015-ffmpeg-cuda11-fix.patch b/015-ffmpeg-cuda11-fix.patch
index 8a103332375..b0bde34d114 100644
--- a/015-ffmpeg-cuda11-fix.patch
+++ b/015-ffmpeg-cuda11-fix.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -4320,10 +4320,10 @@ fi
+@@ -4328,10 +4331,10 @@ fi
if enabled cuda_nvcc; then
nvcc_default="nvcc"
diff --git a/020-ffmpeg-add-svt-hevc.patch b/020-ffmpeg-add-svt-hevc.patch
deleted file mode 100644
index 26216494d9e..00000000000
--- a/020-ffmpeg-add-svt-hevc.patch
+++ /dev/null
@@ -1,616 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -269,6 +269,7 @@ External library support:
- --enable-libspeex enable Speex de/encoding via libspeex [no]
- --enable-libsrt enable Haivision SRT protocol via libsrt [no]
- --enable-libssh enable SFTP protocol via libssh [no]
-+ --enable-libsvthevc enable HEVC encoding via svt [no]
- --enable-libsvtav1 enable AV1 encoding via SVT [no]
- --enable-libtensorflow enable TensorFlow as a DNN module backend
- for DNN based filters like sr [no]
-@@ -1806,6 +1807,7 @@ EXTERNAL_LIBRARY_LIST="
- libspeex
- libsrt
- libssh
-+ libsvthevc
- libsvtav1
- libtensorflow
- libtesseract
-@@ -3245,6 +3247,7 @@ libshine_encoder_select="audio_frame_queue"
- libspeex_decoder_deps="libspeex"
- libspeex_encoder_deps="libspeex"
- libspeex_encoder_select="audio_frame_queue"
-+libsvt_hevc_encoder_deps="libsvthevc"
- libsvtav1_encoder_deps="libsvtav1"
- libtheora_encoder_deps="libtheora"
- libtwolame_encoder_deps="libtwolame"
-@@ -6401,6 +6404,7 @@ enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
- enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init
- 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 libsvthevc && require_pkg_config libsvthevc SvtHevcEnc EbApi.h EbInitHandle
- enabled libsvtav1 && require_pkg_config libsvtav1 "SvtAv1Enc >= 0.8.4" EbSvtAv1Enc.h svt_av1_enc_init_handle
- enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow
- enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -1027,6 +1027,7 @@ OBJS-$(CONFIG_LIBRAV1E_ENCODER) += librav1e.o
- OBJS-$(CONFIG_LIBSHINE_ENCODER) += libshine.o
- OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
- OBJS-$(CONFIG_LIBSPEEX_ENCODER) += libspeexenc.o
-+OBJS-$(CONFIG_LIBSVT_HEVC_ENCODER) += libsvt_hevc.o
- OBJS-$(CONFIG_LIBSVTAV1_ENCODER) += libsvtav1.o
- OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
- OBJS-$(CONFIG_LIBTWOLAME_ENCODER) += libtwolame.o
---- a/libavcodec/allcodecs.c
-+++ b/libavcodec/allcodecs.c
-@@ -728,6 +728,7 @@ extern AVCodec ff_librsvg_decoder;
- extern AVCodec ff_libshine_encoder;
- extern AVCodec ff_libspeex_encoder;
- extern AVCodec ff_libspeex_decoder;
-+extern AVCodec ff_libsvt_hevc_encoder;
- extern AVCodec ff_libsvtav1_encoder;
- extern AVCodec ff_libtheora_encoder;
- extern AVCodec ff_libtwolame_encoder;
---- /dev/null
-+++ b/libavcodec/libsvt_hevc.c
-@@ -0,0 +1,559 @@
-+/*
-+* Scalable Video Technology for HEVC encoder library plugin
-+*
-+* Copyright (c) 2019 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 "EbApi.h"
-+
-+#include "libavutil/common.h"
-+#include "libavutil/frame.h"
-+#include "libavutil/opt.h"
-+
-+#include "internal.h"
-+#include "avcodec.h"
-+
-+typedef enum eos_status {
-+ EOS_NOT_REACHED = 0,
-+ EOS_SENT,
-+ EOS_RECEIVED
-+}EOS_STATUS;
-+
-+typedef struct SvtContext {
-+ AVClass *class;
-+
-+ EB_H265_ENC_CONFIGURATION enc_params;
-+ EB_COMPONENTTYPE *svt_handle;
-+ EB_BUFFERHEADERTYPE in_buf;
-+ uint8_t *in_data;
-+ EOS_STATUS eos_flag;
-+
-+ // User options.
-+ int profile;
-+ int hierarchical_level;
-+ int enc_mode;
-+ int tier;
-+ int level;
-+ int rc_mode;
-+ int scd;
-+ int tune;
-+ int base_layer_switch_mode;
-+ int qp;
-+ int aud;
-+ int asm_type;
-+ int forced_idr;
-+ int la_depth;
-+ int thread_count;
-+ int high_dynamic_range;
-+ int unrestricted_motion_vector;
-+ int tile_row_count;
-+ int tile_col_count;
-+ int tile_slice_mode;
-+} SvtContext;
-+
-+static int error_mapping(EB_ERRORTYPE svt_ret)
-+{
-+ switch (svt_ret) {
-+ case EB_ErrorInsufficientResources:
-+ return AVERROR(ENOMEM);
-+
-+ case EB_ErrorUndefined:
-+ case EB_ErrorInvalidComponent:
-+ case EB_ErrorBadParameter:
-+ return AVERROR(EINVAL);
-+
-+ case EB_ErrorDestroyThreadFailed:
-+ case EB_ErrorSemaphoreUnresponsive:
-+ case EB_ErrorDestroySemaphoreFailed:
-+ case EB_ErrorCreateMutexFailed:
-+ case EB_ErrorMutexUnresponsive:
-+ case EB_ErrorDestroyMutexFailed:
-+ return AVERROR_EXTERNAL;
-+
-+ case EB_NoErrorEmptyQueue:
-+ return AVERROR(EAGAIN);
-+
-+ case EB_ErrorNone:
-+ return 0;
-+
-+ default:
-+ return AVERROR_UNKNOWN;
-+ }
-+}
-+
-+static void free_buffer(SvtContext *svt_enc)
-+{
-+ if (svt_enc && svt_enc->in_data) {
-+ av_freep(&svt_enc->in_data);
-+ svt_enc->in_data = NULL;
-+ }
-+}
-+
-+static EB_ERRORTYPE alloc_buffer(SvtContext *svt_enc)
-+{
-+ EB_BUFFERHEADERTYPE *in_buf = &svt_enc->in_buf;
-+ EB_H265_ENC_INPUT *in_data = NULL;
-+
-+ memset(in_buf, 0, sizeof(*in_buf));
-+ in_buf->nSize = sizeof(*in_buf);
-+ in_buf->sliceType = EB_INVALID_PICTURE;
-+
-+ in_data = (EB_H265_ENC_INPUT *)av_mallocz(sizeof(*in_data));
-+ if (in_data) {
-+ svt_enc->in_data = in_buf->pBuffer = (uint8_t *)in_data;
-+ return EB_ErrorNone;
-+ } else {
-+ return EB_ErrorInsufficientResources;
-+ }
-+}
-+
-+static int config_enc_params(EB_H265_ENC_CONFIGURATION *param,
-+ AVCodecContext *avctx)
-+{
-+ SvtContext *svt_enc = avctx->priv_data;
-+
-+ param->sourceWidth = avctx->width;
-+ param->sourceHeight = avctx->height;
-+
-+ if ((avctx->pix_fmt == AV_PIX_FMT_YUV420P10) ||
-+ (avctx->pix_fmt == AV_PIX_FMT_YUV422P10) ||
-+ (avctx->pix_fmt == AV_PIX_FMT_YUV444P10)) {
-+ av_log(avctx, AV_LOG_DEBUG, "Set 10 bits depth input\n");
-+ param->encoderBitDepth = 10;
-+ } else {
-+ av_log(avctx, AV_LOG_DEBUG, "Set 8 bits depth input\n");
-+ param->encoderBitDepth = 8;
-+ }
-+
-+ if ((avctx->pix_fmt == AV_PIX_FMT_YUV420P) ||
-+ (avctx->pix_fmt == AV_PIX_FMT_YUV420P10))
-+ param->encoderColorFormat = EB_YUV420;
-+ else if ((avctx->pix_fmt == AV_PIX_FMT_YUV422P) ||
-+ (avctx->pix_fmt == AV_PIX_FMT_YUV422P10))
-+ param->encoderColorFormat = EB_YUV422;
-+ else
-+ param->encoderColorFormat = EB_YUV444;
-+
-+ param->profile = svt_enc->profile;
-+
-+ if (FF_PROFILE_HEVC_MAIN_STILL_PICTURE == param->profile) {
-+ av_log(avctx, AV_LOG_ERROR, "Main Still Picture Profile not supported\n");
-+ return EB_ErrorBadParameter;
-+ }
-+
-+ if ((param->encoderColorFormat >= EB_YUV422) &&
-+ (param->profile != FF_PROFILE_HEVC_REXT)) {
-+ av_log(avctx, AV_LOG_WARNING, "Rext Profile forced for 422 or 444\n");
-+ param->profile = FF_PROFILE_HEVC_REXT;
-+ }
-+
-+ if ((FF_PROFILE_HEVC_MAIN == param->profile) &&
-+ (param->encoderBitDepth > 8)) {
-+ av_log(avctx, AV_LOG_WARNING, "Main10 Profile forced for 10 bits\n");
-+ param->profile = FF_PROFILE_HEVC_MAIN_10;
-+ }
-+
-+ param->targetBitRate = avctx->bit_rate;
-+ param->vbvMaxrate = avctx->rc_max_rate;
-+ param->vbvBufsize = avctx->rc_buffer_size;
-+
-+ if (avctx->gop_size > 0)
-+ param->intraPeriodLength = avctx->gop_size - 1;
-+
-+ if ((avctx->framerate.num > 0) && (avctx->framerate.den > 0)) {
-+ param->frameRateNumerator = avctx->framerate.num;
-+ param->frameRateDenominator =
-+ avctx->framerate.den * avctx->ticks_per_frame;
-+ } else {
-+ param->frameRateNumerator = avctx->time_base.den;
-+ param->frameRateDenominator =
-+ avctx->time_base.num * avctx->ticks_per_frame;
-+ }
-+
-+ param->hierarchicalLevels = svt_enc->hierarchical_level;
-+ param->encMode = svt_enc->enc_mode;
-+ param->tier = svt_enc->tier;
-+ param->level = svt_enc->level;
-+ param->rateControlMode = svt_enc->rc_mode;
-+ param->sceneChangeDetection = svt_enc->scd;
-+ param->tune = svt_enc->tune;
-+ param->baseLayerSwitchMode = svt_enc->base_layer_switch_mode;
-+ param->qp = svt_enc->qp;
-+ param->accessUnitDelimiter = svt_enc->aud;
-+ param->asmType = svt_enc->asm_type;
-+ param->intraRefreshType = svt_enc->forced_idr;
-+ param->highDynamicRangeInput = svt_enc->high_dynamic_range;
-+ if (param->rateControlMode) {
-+ param->maxQpAllowed = avctx->qmax;
-+ param->minQpAllowed = avctx->qmin;
-+ }
-+
-+ if (svt_enc->la_depth != -1)
-+ param->lookAheadDistance = svt_enc->la_depth;
-+
-+ if ((svt_enc->thread_count > 0) &&
-+ (svt_enc->thread_count < (EB_THREAD_COUNT_MIN_CORE * EB_THREAD_COUNT_FACTOR))) {
-+ param->threadCount = EB_THREAD_COUNT_MIN_CORE * EB_THREAD_COUNT_FACTOR;
-+ av_log(avctx, AV_LOG_WARNING, "Thread count is set too small, forced to %"PRId32"\n",
-+ param->threadCount);
-+ } else if (svt_enc->thread_count % EB_THREAD_COUNT_MIN_CORE) {
-+ param->threadCount = (svt_enc->thread_count + EB_THREAD_COUNT_MIN_CORE - 1)
-+ / EB_THREAD_COUNT_MIN_CORE * EB_THREAD_COUNT_MIN_CORE;
-+ av_log(avctx, AV_LOG_DEBUG, "Thread count is rounded to %"PRId32"\n",
-+ param->threadCount);
-+ } else {
-+ param->threadCount = svt_enc->thread_count;
-+ }
-+
-+ if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER)
-+ param->codeVpsSpsPps = 0;
-+ else
-+ param->codeVpsSpsPps = 1;
-+
-+ param->codeEosNal = 1;
-+
-+ if (svt_enc->unrestricted_motion_vector == 0 || svt_enc->unrestricted_motion_vector == 1) {
-+ param->unrestrictedMotionVector = svt_enc->unrestricted_motion_vector;
-+ } else {
-+ av_log(avctx, AV_LOG_ERROR, "Unrestricted Motion Vector should be set 0 or 1\n");
-+ return EB_ErrorBadParameter;
-+ }
-+
-+ if(svt_enc->tile_row_count >= 1 && svt_enc->tile_row_count <= 16) {
-+ param->tileRowCount = svt_enc->tile_row_count;
-+ } else {
-+ av_log(avctx, AV_LOG_ERROR, "Tile Row Count should between 1-16\n");
-+ return EB_ErrorBadParameter;
-+ }
-+
-+ if(svt_enc->tile_col_count >= 1 && svt_enc->tile_col_count <= 16) {
-+ param->tileColumnCount = svt_enc->tile_col_count;
-+ } else {
-+ av_log(avctx, AV_LOG_ERROR, "Tile Column Count should between 1-16\n");
-+ return EB_ErrorBadParameter;
-+ }
-+
-+ if(svt_enc->tile_slice_mode == 0 || svt_enc->tile_slice_mode == 1) {
-+ param->tileSliceMode = svt_enc->tile_slice_mode;
-+ } else {
-+ av_log(avctx, AV_LOG_ERROR, "Tile Slice Mode should be set 0 or 1\n");
-+ return EB_ErrorBadParameter;
-+ }
-+ return EB_ErrorNone;
-+}
-+
-+static void read_in_data(EB_H265_ENC_CONFIGURATION *config,
-+ const AVFrame *frame,
-+ EB_BUFFERHEADERTYPE *header_ptr)
-+{
-+ uint8_t is16bit;
-+ uint64_t frame_size;
-+ EB_H265_ENC_INPUT *in_data = (EB_H265_ENC_INPUT *)header_ptr->pBuffer;
-+
-+ is16bit = config->encoderBitDepth > 8;
-+ frame_size = (uint64_t)(config->sourceWidth * config->sourceHeight) << is16bit;
-+
-+ in_data->luma = frame->data[0];
-+ in_data->cb = frame->data[1];
-+ in_data->cr = frame->data[2];
-+
-+ in_data->yStride = frame->linesize[0] >> is16bit;
-+ in_data->cbStride = frame->linesize[1] >> is16bit;
-+ in_data->crStride = frame->linesize[2] >> is16bit;
-+
-+ if (config->encoderColorFormat == EB_YUV420)
-+ frame_size *= 3/2u;
-+ else if (config->encoderColorFormat == EB_YUV422)
-+ frame_size *= 2u;
-+ else
-+ frame_size *= 3u;
-+
-+ header_ptr->nFilledLen += frame_size;
-+}
-+
-+static av_cold int eb_enc_init(AVCodecContext *avctx)
-+{
-+ SvtContext *svt_enc = avctx->priv_data;
-+ EB_ERRORTYPE svt_ret;
-+
-+ svt_enc->eos_flag = EOS_NOT_REACHED;
-+
-+ svt_ret = EbInitHandle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
-+ if (svt_ret != EB_ErrorNone) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to init handle\n");
-+ return error_mapping(svt_ret);
-+ }
-+
-+ svt_ret = config_enc_params(&svt_enc->enc_params, avctx);
-+ if (svt_ret != EB_ErrorNone) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to config parameters\n");
-+ goto failed_init_handle;
-+ }
-+
-+ svt_ret = EbH265EncSetParameter(svt_enc->svt_handle, &svt_enc->enc_params);
-+ if (svt_ret != EB_ErrorNone) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to set parameters\n");
-+ goto failed_init_handle;
-+ }
-+
-+ svt_ret = EbInitEncoder(svt_enc->svt_handle);
-+ if (svt_ret != EB_ErrorNone) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to init encoder\n");
-+ goto failed_init_handle;
-+ }
-+
-+ if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
-+ EB_BUFFERHEADERTYPE *header_ptr = NULL;
-+
-+ svt_ret = EbH265EncStreamHeader(svt_enc->svt_handle, &header_ptr);
-+ if (svt_ret != EB_ErrorNone) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to build stream header\n");
-+ goto failed_init_encoder;
-+ }
-+
-+ avctx->extradata_size = header_ptr->nFilledLen;
-+ avctx->extradata = av_malloc(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-+ if (!avctx->extradata) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to allocate extradata\n");
-+ svt_ret = EB_ErrorInsufficientResources;
-+ goto failed_init_encoder;
-+ }
-+ memcpy(avctx->extradata, header_ptr->pBuffer, avctx->extradata_size);
-+ memset(avctx->extradata+avctx->extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-+ }
-+
-+ svt_ret = alloc_buffer(svt_enc);
-+ if (svt_ret != EB_ErrorNone) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to alloc data buffer\n");
-+ goto failed_init_encoder;
-+ }
-+ return 0;
-+
-+failed_init_encoder:
-+ EbDeinitEncoder(svt_enc->svt_handle);
-+failed_init_handle:
-+ EbDeinitHandle(svt_enc->svt_handle);
-+ svt_enc->svt_handle = NULL;
-+ svt_enc = NULL;
-+ return error_mapping(svt_ret);
-+}
-+
-+static int eb_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
-+ const AVFrame *frame, int *got_packet)
-+{
-+ SvtContext *svt_enc = avctx->priv_data;
-+ EB_BUFFERHEADERTYPE *header_ptr = &svt_enc->in_buf;
-+ EB_ERRORTYPE svt_ret;
-+ int av_ret;
-+
-+ if (EOS_RECEIVED == svt_enc->eos_flag) {
-+ *got_packet = 0;
-+ return 0;
-+ }
-+
-+ if (!frame) {
-+ if (!svt_enc->eos_flag) {
-+ svt_enc->eos_flag = EOS_SENT;
-+
-+ header_ptr->nAllocLen = 0;
-+ header_ptr->nFilledLen = 0;
-+ header_ptr->nTickCount = 0;
-+ header_ptr->nFlags = EB_BUFFERFLAG_EOS;
-+ header_ptr->pBuffer = NULL;
-+
-+ EbH265EncSendPicture(svt_enc->svt_handle, header_ptr);
-+
-+ av_log(avctx, AV_LOG_DEBUG, "Sent EOS\n");
-+ }
-+ } else {
-+ read_in_data(&svt_enc->enc_params, frame, header_ptr);
-+ header_ptr->pts = frame->pts;
-+
-+ EbH265EncSendPicture(svt_enc->svt_handle, header_ptr);
-+
-+ av_log(avctx, AV_LOG_DEBUG, "Sent PTS %"PRId64"\n", header_ptr->pts);
-+ }
-+
-+ header_ptr = NULL;
-+ svt_ret = EbH265GetPacket(svt_enc->svt_handle, &header_ptr, svt_enc->eos_flag);
-+
-+ if (svt_ret == EB_NoErrorEmptyQueue) {
-+ *got_packet = 0;
-+ av_log(avctx, AV_LOG_DEBUG, "Received none\n");
-+ return 0;
-+ } else if (svt_ret == EB_ErrorMax) {
-+ *got_packet = 0;
-+ av_log(avctx, AV_LOG_ERROR, "Received NULL packet with error code 0x%X\n", header_ptr->nFlags);
-+ return AVERROR_INVALIDDATA;
-+ }
-+
-+ av_log(avctx, AV_LOG_DEBUG, "Received PTS %"PRId64" packet\n", header_ptr->pts);
-+
-+ av_ret = ff_alloc_packet2(avctx, pkt, header_ptr->nFilledLen, 0);
-+ if (av_ret) {
-+ av_log(avctx, AV_LOG_ERROR, "Failed to allocate a packet\n");
-+ EbH265ReleaseOutBuffer(&header_ptr);
-+ return av_ret;
-+ }
-+
-+ memcpy(pkt->data, header_ptr->pBuffer, header_ptr->nFilledLen);
-+ pkt->size = header_ptr->nFilledLen;
-+ pkt->pts = header_ptr->pts;
-+ pkt->dts = header_ptr->dts;
-+
-+ if ((header_ptr->sliceType == EB_IDR_PICTURE) ||
-+ (header_ptr->sliceType == EB_I_PICTURE))
-+ pkt->flags |= AV_PKT_FLAG_KEY;
-+ if (header_ptr->sliceType == EB_NON_REF_PICTURE)
-+ pkt->flags |= AV_PKT_FLAG_DISPOSABLE;
-+
-+ EbH265ReleaseOutBuffer(&header_ptr);
-+
-+ *got_packet = 1;
-+
-+ if (EB_BUFFERFLAG_EOS == header_ptr->nFlags)
-+ svt_enc->eos_flag = EOS_RECEIVED;
-+
-+ return 0;
-+}
-+
-+static av_cold int eb_enc_close(AVCodecContext *avctx)
-+{
-+ SvtContext *svt_enc = avctx->priv_data;
-+
-+ if (svt_enc) {
-+ free_buffer(svt_enc);
-+
-+ if (svt_enc->svt_handle) {
-+ EbDeinitEncoder(svt_enc->svt_handle);
-+ EbDeinitHandle(svt_enc->svt_handle);
-+ svt_enc->svt_handle = NULL;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+#define OFFSET(x) offsetof(SvtContext, x)
-+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
-+static const AVOption options[] = {
-+ { "asm_type", "Assembly instruction set type [0: C Only, 1: Auto]", OFFSET(asm_type),
-+ AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE },
-+
-+ { "aud", "Include Access Unit Delimiter", OFFSET(aud),
-+ AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 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_INT, { .i64 = -1 }, -1, INT_MAX, VE },
-+
-+ { "hielevel", "Hierarchical prediction levels setting", OFFSET(hierarchical_level),
-+ AV_OPT_TYPE_INT, { .i64 = 3 }, 0, 3, VE , "hielevel"},
-+ { "flat", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "hielevel" },
-+ { "1 level", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "hielevel" },
-+ { "2 level", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "hielevel" },
-+ { "3 level", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 3 }, INT_MIN, INT_MAX, VE, "hielevel" },
-+
-+ { "la_depth", "Look ahead distance [0, 256]", OFFSET(la_depth),
-+ AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 256, VE },
-+
-+ { "level", "Set level (level_idc)", OFFSET(level),
-+ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0xff, VE, "level" },
-+
-+ { "preset", "Encoding preset [0, 12]",
-+ OFFSET(enc_mode), AV_OPT_TYPE_INT, { .i64 = 7 }, 0, 12, VE },
-+
-+ { "profile", "Profile setting, Main Still Picture Profile not supported", OFFSET(profile),
-+ AV_OPT_TYPE_INT, { .i64 = FF_PROFILE_HEVC_MAIN }, FF_PROFILE_HEVC_MAIN, FF_PROFILE_HEVC_REXT, VE, "profile"},
-+
-+ { "qp", "QP value for intra frames", OFFSET(qp),
-+ AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE },
-+
-+ { "rc", "Bit rate control mode", OFFSET(rc_mode),
-+ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, 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" },
-+
-+ { "sc_detection", "Scene change detection", OFFSET(scd),
-+ AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE },
-+
-+ { "thread_count", "Number of threads [0: Auto, 96: Min]", OFFSET(thread_count),
-+ AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, VE },
-+
-+ { "tier", "Set tier (general_tier_flag)", OFFSET(tier),
-+ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, "tier" },
-+ { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, VE, "tier" },
-+ { "high", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, VE, "tier" },
-+
-+ { "tune", "Quality tuning mode", OFFSET(tune), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 2, VE, "tune" },
-+ { "sq", "Visually optimized mode", 0,
-+ AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "tune" },
-+ { "oq", "PSNR / SSIM optimized mode", 0,
-+ AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "tune" },
-+ { "vmaf", "VMAF optimized mode", 0,
-+ AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "tune" },
-+ { "hdr", "High dynamic range input (HDR10)", OFFSET(high_dynamic_range), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 1, VE, "hdr" },
-+ { "umv", "Enables or disables unrestricted motion vectors", OFFSET(unrestricted_motion_vector),
-+ AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE },
-+ { "tile_row_cnt", "tile count in the row", OFFSET(tile_row_count), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 16, VE },
-+ { "tile_col_cnt", "tile count in the column", OFFSET(tile_col_count), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 16, VE },
-+ { "tile_slice_mode", "per slice per tile, only valid for multi-tile", OFFSET(tile_slice_mode),
-+ AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
-+ {NULL},
-+};
-+
-+static const AVClass class = {
-+ .class_name = "libsvt_hevc",
-+ .item_name = av_default_item_name,
-+ .option = options,
-+ .version = LIBAVUTIL_VERSION_INT,
-+};
-+
-+static const AVCodecDefault eb_enc_defaults[] = {
-+ { "b", "7M" },
-+ { "qmin", "10" },
-+ { "qmax", "48" },
-+ { "g", "-2" },
-+ { NULL },
-+};
-+
-+AVCodec ff_libsvt_hevc_encoder = {
-+ .name = "libsvt_hevc",
-+ .long_name = NULL_IF_CONFIG_SMALL("SVT-HEVC(Scalable Video Technology for HEVC) encoder"),
-+ .priv_data_size = sizeof(SvtContext),
-+ .type = AVMEDIA_TYPE_VIDEO,
-+ .id = AV_CODEC_ID_HEVC,
-+ .init = eb_enc_init,
-+ .encode2 = eb_encode_frame,
-+ .close = eb_enc_close,
-+ .capabilities = AV_CODEC_CAP_DELAY,
-+ .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P,
-+ AV_PIX_FMT_YUV420P10,
-+ AV_PIX_FMT_YUV422P,
-+ AV_PIX_FMT_YUV422P10,
-+ AV_PIX_FMT_YUV444P,
-+ AV_PIX_FMT_YUV444P10,
-+ AV_PIX_FMT_NONE },
-+ .priv_class = &class,
-+ .defaults = eb_enc_defaults,
-+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
-+ .wrapper_name = "libsvt_hevc",
-+};
diff --git a/PKGBUILD b/PKGBUILD
index bfca54bfcad..a07f598eded 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
-_svt_hevc_ver='1.5.0'
+_svt_hevc_ver='ead6fdf7c9ff84511b42fc1658c1654b84d83e4b'
_svt_vp9_ver='0.2.2'
pkgname=ffmpeg-full-git
-pkgver=4.4.r98732.g9f702fc8f4
+pkgver=4.4.r99044.gd1f3d721df
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)'
arch=('x86_64')
@@ -15,7 +15,7 @@ depends=(
'alsa-lib' 'avisynthplus' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls'
'ladspa' 'libass' 'aom' 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt'
'libcdio-paranoia' 'codec2' 'dav1d' 'libdc1394' 'libavc1394' 'libfdk-aac'
- 'fontconfig' 'freetype2' 'fribidi' 'glslang' 'libgme' 'gsm' 'libiec61883'
+ 'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm' 'libiec61883'
'libilbc' 'jack' 'kvazaar' 'lensfun' 'libmodplug' 'lame' 'opencore-amr'
'openjpeg2' 'opus' 'pulseaudio' 'librabbitmq-c' 'rav1e' 'librsvg' 'rubberband'
'rtmpdump' 'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'svt-hevc' 'svt-av1'
@@ -43,24 +43,25 @@ conflicts=('ffmpeg')
source=('git+https://git.ffmpeg.org/ffmpeg.git'
'010-ffmpeg-fix-vmaf-model-path.patch'
'015-ffmpeg-cuda11-fix.patch'
- '020-ffmpeg-add-svt-hevc.patch'
- "030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
+ "020-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
+ "030-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"
"040-ffmpeg-add-svt-vp9-${_svt_vp9_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/v${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch"
'LICENSE')
sha256sums=('SKIP'
- 'b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02'
- '12cb889fd2ddd03ecc0f5fa2e345c7787ff4b28c4d284a5c694c71d5a590763c'
- 'fecb280e4ebb4ad8a3ec0385f6f32fcf90656fea989a6182abcc4104f266bde4'
+ '52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50'
+ '87292cf51f47e4408b0b7b0ee8387d18cf7ea7d352832d5d97c413456eb34b38'
+ '05ec4d3323dc80ef6c1d4d6d50d339accd51d22b12a735b7a6605f10feb09cec'
'1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
'b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
prepare() {
rm -f ffmpeg/libavcodec/libsvt_{hevc,vp9}.c
+ sed -i 's/general.texi/general_contents.texi/g' "030-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-fix-vmaf-model-path.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/015-ffmpeg-cuda11-fix.patch"
- patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc.patch"
- patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
+ patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
+ patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-svt-vp9-${_svt_vp9_ver}.patch"
}
@@ -120,7 +121,7 @@ build() {
--enable-fontconfig \
--enable-libfreetype \
--enable-libfribidi \
- --enable-libglslang \
+ --disable-libglslang \
--enable-libgme \
--enable-libgsm \
--enable-libiec61883 \