fkastl/ffmpeg-4
SHA256
1
0
Fork 0
forked from jengelh/ffmpeg-4
Code Pull Requests Activity

Accepting request 671835 from home:adrianSuSE:branches:multimedia:libs

Browse Source 
friendly request to enable AV1 support in ffmpeg.
Please note that the needed package is not yet in Factory.


- enable AV1 support on x86_64
  * requires patch 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch
- refreshed all patches

OBS-URL: https://build.opensuse.org/request/show/671835
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=39
This commit is contained in:
Jan Engelhardt 2019-02-05 12:16:42 +00:00 committed by Git OBS Bridge
parent 401e2d934e
commit b9fcf651b1
6 changed files with 613 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

576
0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch Normal file
View File

@ -0,0 +1,576 @@
From 7951dc4c7e8461da1ca003776ebd318d631ee6cb Mon Sep 17 00:00:00 2001
From: Daryl Seah <daryl.seah@intel.com>
Date: Fri, 18 Jan 2019 02:11:38 +0000
Subject: [PATCH] Add ability for ffmpeg to run svt-av1
---
configure | 4 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/libsvt_av1.c | 498 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 504 insertions(+)
create mode 100644 libavcodec/libsvt_av1.c
Index: ffmpeg-4.1/configure
===================================================================
--- ffmpeg-4.1.orig/configure
+++ ffmpeg-4.1/configure
@@ -262,6 +262,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-libsvtav1 enable AV1 encoding via svt [no]
--enable-libtensorflow enable TensorFlow as a DNN module backend
for DNN based filters like sr [no]
--enable-libtesseract enable Tesseract, needed for ocr filter [no]
@@ -1743,6 +1744,7 @@ EXTERNAL_LIBRARY_LIST="
libspeex
libsrt
libssh
+ libsvtav1
libtensorflow
libtesseract
libtheora
@@ -3124,6 +3126,7 @@ libshine_encoder_select="audio_frame_que
libspeex_decoder_deps="libspeex"
libspeex_encoder_deps="libspeex"
libspeex_encoder_select="audio_frame_queue"
+libsvt_av1_encoder_deps="libsvtav1"
libtheora_encoder_deps="libtheora"
libtwolame_encoder_deps="libtwolame"
libvo_amrwbenc_encoder_deps="libvo_amrwbenc"
@@ -6134,6 +6137,7 @@ enabled libsoxr && require lib
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 libsvtav1 && require_pkg_config libsvtav1 SvtAv1Enc EbApi.h eb_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
enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
Index: ffmpeg-4.1/libavcodec/Makefile
===================================================================
--- ffmpeg-4.1.orig/libavcodec/Makefile
+++ ffmpeg-4.1/libavcodec/Makefile
@@ -981,6 +981,7 @@ OBJS-$(CONFIG_LIBOPUS_ENCODER)
OBJS-$(CONFIG_LIBSHINE_ENCODER) += libshine.o
OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
OBJS-$(CONFIG_LIBSPEEX_ENCODER) += libspeexenc.o
+OBJS-$(CONFIG_LIBSVT_AV1_ENCODER) += libsvt_av1.o
OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
OBJS-$(CONFIG_LIBTWOLAME_ENCODER) += libtwolame.o
OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o
Index: ffmpeg-4.1/libavcodec/allcodecs.c
===================================================================
--- ffmpeg-4.1.orig/libavcodec/allcodecs.c
+++ ffmpeg-4.1/libavcodec/allcodecs.c
@@ -697,6 +697,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_av1_encoder;
extern AVCodec ff_libtheora_encoder;
extern AVCodec ff_libtwolame_encoder;
extern AVCodec ff_libvo_amrwbenc_encoder;
Index: ffmpeg-4.1/libavcodec/libsvt_av1.c
===================================================================
--- /dev/null
+++ ffmpeg-4.1/libavcodec/libsvt_av1.c
@@ -0,0 +1,498 @@
+/*
+* Scalable Video Technology for AV1 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 "EbErrorCodes.h"
+#include "EbTime.h"
+#include "EbApi.h"
+
+#include "libavutil/common.h"
+#include "libavutil/frame.h"
+#include "libavutil/opt.h"
+
+#include "internal.h"
+#include "avcodec.h"
+
+typedef struct SvtContext {
+ AVClass *class;
+
+ EbSvtAv1EncConfiguration enc_params;
+ EbComponentType *svt_handle;
+
+ EbBufferHeaderType *in_buf;
+ int raw_size;
+
+ int eos_flag;
+
+ // User options.
+ int vui_info;
+ int hierarchical_level;
+ int la_depth;
+ int enc_mode;
+ int rc_mode;
+ int scd;
+ int qp;
+
+ int forced_idr;
+
+ int aud;
+
+ int tier;
+ int level;
+
+ int base_layer_switch_mode;
+} 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);
+ }
+}
+
+static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
+{
+ const int pack_mode_10bit =
+ (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
+ const size_t luma_size_8bit =
+ config->source_width * config->source_height * (1 << pack_mode_10bit);
+ const size_t luma_size_10bit =
+ (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
+
+ EbSvtEncInput *in_data;
+
+ svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
+
+ // allocate buffer for in and out
+ svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
+ if (!svt_enc->in_buf)
+ goto failed;
+
+ in_data = av_mallocz(sizeof(*in_data));
+ if (!in_data)
+ goto failed;
+ svt_enc->in_buf->p_buffer = (unsigned char *)in_data;
+
+ svt_enc->in_buf->size = sizeof(*svt_enc->in_buf);
+ svt_enc->in_buf->p_app_private = NULL;
+
+ return 0;
+
+failed:
+ free_buffer(svt_enc);
+ return AVERROR(ENOMEM);
+}
+
+static int config_enc_params(EbSvtAv1EncConfiguration *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
+ //
+ // SVT-AV1 support a compressed 10-bit format allowing the
+ // software to achieve a higher speed and channel density levels.
+ // The conversion between the 10-bit yuv420p10le and the compressed
+ // 10-bit format is a lossless operation. But in FFmpeg, we usually
+ // didn't use this format
+ param->compressed_ten_bit_format = 0;
+ ten_bits = 1;
+ }
+
+ // Update param from options
+ param->hierarchical_levels = svt_enc->hierarchical_level - 1;
+ param->enc_mode = svt_enc->enc_mode;
+ param->tier = svt_enc->tier;
+ param->level = svt_enc->level;
+ param->rate_control_mode = svt_enc->rc_mode;
+ param->scene_change_detection = svt_enc->scd;
+ param->base_layer_switch_mode = svt_enc->base_layer_switch_mode;
+ param->qp = svt_enc->qp;
+ param->access_unit_delimiter = svt_enc->aud;
+
+ param->target_bit_rate = avctx->bit_rate;
+ if (avctx->gop_size > 0)
+ param->intra_period_length = 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 * avctx->ticks_per_frame;
+ } else {
+ param->frame_rate_numerator = avctx->time_base.den;
+ param->frame_rate_denominator = avctx->time_base.num * avctx->ticks_per_frame;
+ }
+
+ if (param->rate_control_mode) {
+ param->max_qp_allowed = avctx->qmax;
+ param->min_qp_allowed = avctx->qmin;
+ }
+
+ param->intra_refresh_type =
+ !!(avctx->flags & AV_CODEC_FLAG_CLOSED_GOP) + 1;
+
+ if (svt_enc->vui_info)
+ param->video_usability_info = svt_enc->vui_info;
+
+ if (svt_enc->la_depth != -1)
+ param->look_ahead_distance = svt_enc->la_depth;
+
+ if (ten_bits) {
+ param->encoder_bit_depth = 10;
+ }
+
+ ret = alloc_buffer(param, svt_enc);
+
+ return ret;
+}
+
+static void read_in_data(EbSvtAv1EncConfiguration *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->yStride = frame->linesize[0] >> is16bit;
+ in_data->cbStride = frame->linesize[1] >> is16bit;
+ in_data->crStride = 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 = 0;
+
+ svt_ret = eb_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_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_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;
+ }
+
+ // 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 AV1 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_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) {
+ 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_svt_enc_send_picture(svt_enc->svt_handle, &headerPtrLast);
+ svt_enc->eos_flag = 1;
+ 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_svt_enc_send_picture(svt_enc->svt_handle, headerPtr);
+
+ return 0;
+}
+
+static int eb_receive_packet(AVCodecContext *avctx, AVPacket *pkt)
+{
+ SvtContext *svt_enc = avctx->priv_data;
+ EbBufferHeaderType *headerPtr;
+ EbErrorType svt_ret;
+ int ret;
+
+ if ((ret = ff_alloc_packet2(avctx, pkt, svt_enc->raw_size, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to allocate output packet.\n");
+ return ret;
+ }
+ svt_ret = eb_svt_get_packet(svt_enc->svt_handle, &headerPtr, svt_enc->eos_flag);
+ if (svt_ret == EB_NoErrorEmptyQueue)
+ return AVERROR(EAGAIN);
+
+ memcpy(pkt->data, headerPtr->p_buffer, headerPtr->n_filled_len);
+ pkt->size = headerPtr->n_filled_len;
+ pkt->pts = headerPtr->pts;
+ pkt->dts = headerPtr->dts;
+ if (headerPtr->pic_type == EB_IDR_PICTURE)
+ pkt->flags |= AV_PKT_FLAG_KEY;
+ if (headerPtr->pic_type == EB_NON_REF_PICTURE)
+ pkt->flags |= AV_PKT_FLAG_DISPOSABLE;
+
+ ret = (headerPtr->flags & EB_BUFFERFLAG_EOS) ? AVERROR_EOF : 0;
+
+ eb_svt_release_out_buffer(&headerPtr);
+
+ return ret;
+}
+
+static av_cold int eb_enc_close(AVCodecContext *avctx)
+{
+ SvtContext *svt_enc = avctx->priv_data;
+
+ eb_deinit_encoder(svt_enc->svt_handle);
+ eb_deinit_handle(svt_enc->svt_handle);
+
+ 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[] = {
+ { "vui", "Enable vui info", OFFSET(vui_info),
+ AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE },
+
+ { "aud", "Include AUD", OFFSET(aud),
+ AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
+
+ { "hielevel", "Hierarchical prediction levels setting", OFFSET(hierarchical_level),
+ AV_OPT_TYPE_INT, { .i64 = 4 }, 1, 4, VE , "hielevel"},
+ { "flat", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "hielevel" },
+ { "2level", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "hielevel" },
+ { "3level", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 3 }, INT_MIN, INT_MAX, VE, "hielevel" },
+ { "4level", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 4 }, 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 },
+
+ { "preset", "Encoding preset [1, 1]",
+ OFFSET(enc_mode), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 1, 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" },
+
+ { "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
+
+ { "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" },
+
+ { "qp", "QP value for intra frames", OFFSET(qp),
+ AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE },
+
+ { "sc_detection", "Scene change detection", OFFSET(scd),
+ 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_BOOL, { .i64 = 0 }, -1, 1, VE },
+
+ {NULL},
+};
+
+static const AVClass class = {
+ .class_name = "libsvt_av1",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVCodecDefault eb_enc_defaults[] = {
+ { "b", "7M" },
+ { "flags", "-cgop" },
+ { "qmin", "10" },
+ { "qmax", "48" },
+ { NULL },
+};
+
+AVCodec ff_libsvt_av1_encoder = {
+ .name = "libsvt_av1",
+ .long_name = NULL_IF_CONFIG_SMALL("SVT-AV1(Scalable Video Technology for AV1) encoder"),
+ .priv_data_size = sizeof(SvtContext),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_AV1,
+ .init = eb_enc_init,
+ .send_frame = eb_send_frame,
+ .receive_packet = eb_receive_packet,
+ .close = eb_enc_close,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
+ .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_NONE },
+ .priv_class = &class,
+ .defaults = eb_enc_defaults,
+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
+ .wrapper_name = "libsvt_av1",
+};

7
ffmpeg-4.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Feb 5 09:14:03 UTC 2019 - Adrian Schröter <adrian@suse.de>
- enable AV1 support on x86_64
* requires patch 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch
- refreshed all patches
-------------------------------------------------------------------
Tue Jan 15 20:45:50 UTC 2019 - bjorn.lie@gmail.com

8
ffmpeg-4.spec
View File

@ -118,12 +118,17 @@ Patch1: ffmpeg-libcdio_cdda-pkgconfig.patch
Patch2: ffmpeg-arm6l.diff
Patch3: ffmpeg-new-coder-errors.diff
Patch4: ffmpeg-codec-choice.diff
# from https://github.com/OpenVisualCloud/SVT-AV1/blob/master/ffmpeg_plugin/
Patch5: 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel
%if %{with mysofa}
BuildRequires: libmysofa-devel
%endif
%ifarch x86_64
BuildRequires: SVT-AV1-devel
%endif
BuildRequires: nasm
BuildRequires: pkg-config
BuildRequires: pkgconfig(alsa)
@ -625,6 +630,9 @@ CFLAGS="%optflags" \
--enable-libssh \
%if %{with srt}
--enable-libsrt \
%endif
%ifarch x86_64
--enable-libsvtav1 \
%endif
--enable-libtheora \
--enable-libtwolame \

10
ffmpeg-codec-choice.diff
View File

@ -11,11 +11,11 @@ reduced codec selection list.
libavformat/matroskaenc.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
Index: ffmpeg-4.0.1/libavformat/matroskaenc.c
Index: ffmpeg-4.1/libavformat/matroskaenc.c
===================================================================
--- ffmpeg-4.0.1.orig/libavformat/matroskaenc.c 2018-04-20 12:02:57.000000000 +0200
+++ ffmpeg-4.0.1/libavformat/matroskaenc.c 2018-06-30 00:17:17.773924594 +0200
@@ -2747,16 +2747,24 @@ static const AVClass matroska_class = {
--- ffmpeg-4.1.orig/libavformat/matroskaenc.c
+++ ffmpeg-4.1/libavformat/matroskaenc.c
@@ -2807,16 +2807,24 @@ static const AVClass matroska_class = {
.version = LIBAVUTIL_VERSION_INT,
};
@ -44,7 +44,7 @@ Index: ffmpeg-4.0.1/libavformat/matroskaenc.c
.init = mkv_init,
.write_header = mkv_write_header,
.write_packet = mkv_write_flush_packet,
@@ -2815,8 +2823,7 @@ AVOutputFormat ff_matroska_audio_muxer =
@@ -2876,8 +2884,7 @@ AVOutputFormat ff_matroska_audio_muxer =
.mime_type = "audio/x-matroska",
.extensions = "mka",
.priv_data_size = sizeof(MatroskaMuxContext),

8
ffmpeg-libcdio_cdda-pkgconfig.patch
View File

@ -2,11 +2,11 @@
configure | 2 ++
1 file changed, 2 insertions(+)
Index: ffmpeg-4.0.1/configure
Index: ffmpeg-4.1/configure
===================================================================
--- ffmpeg-4.0.1.orig/configure 2018-06-16 03:12:16.000000000 +0200
+++ ffmpeg-4.0.1/configure 2018-06-30 00:17:17.733924139 +0200
@@ -6243,6 +6243,8 @@ enabled libjack &&
--- ffmpeg-4.1.orig/configure
+++ ffmpeg-4.1/configure
@@ -6351,6 +6351,8 @@ enabled libjack &&
enabled sndio && check_lib sndio sndio.h sio_open -lsndio
if enabled libcdio; then

26
ffmpeg-new-coder-errors.diff
View File

@ -10,11 +10,11 @@ Improve the error messages a bit to say what's really going on
fftools/ffmpeg_opt.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
Index: ffmpeg-4.0.1/fftools/ffmpeg.c
Index: ffmpeg-4.1/fftools/ffmpeg.c
===================================================================
--- ffmpeg-4.0.1.orig/fftools/ffmpeg.c 2018-06-16 03:12:16.000000000 +0200
+++ ffmpeg-4.0.1/fftools/ffmpeg.c 2018-06-30 00:17:17.757924412 +0200
@@ -2883,7 +2883,7 @@ static int init_input_stream(int ist_ind
--- ffmpeg-4.1.orig/fftools/ffmpeg.c
+++ ffmpeg-4.1/fftools/ffmpeg.c
@@ -2902,7 +2902,7 @@ static int init_input_stream(int ist_ind
if (ist->decoding_needed) {
AVCodec *codec = ist->dec;
if (!codec) {
@ -23,11 +23,11 @@ Index: ffmpeg-4.0.1/fftools/ffmpeg.c
avcodec_get_name(ist->dec_ctx->codec_id), ist->file_index, ist->st->index);
return AVERROR(EINVAL);
}
Index: ffmpeg-4.0.1/fftools/ffmpeg_filter.c
Index: ffmpeg-4.1/fftools/ffmpeg_filter.c
===================================================================
--- ffmpeg-4.0.1.orig/fftools/ffmpeg_filter.c 2018-04-20 12:02:55.000000000 +0200
+++ ffmpeg-4.0.1/fftools/ffmpeg_filter.c 2018-06-30 00:17:17.757924412 +0200
@@ -972,7 +972,7 @@ static int configure_input_filter(Filter
--- ffmpeg-4.1.orig/fftools/ffmpeg_filter.c
+++ ffmpeg-4.1/fftools/ffmpeg_filter.c
@@ -973,7 +973,7 @@ static int configure_input_filter(Filter
{
if (!ifilter->ist->dec) {
av_log(NULL, AV_LOG_ERROR,
@ -36,7 +36,7 @@ Index: ffmpeg-4.0.1/fftools/ffmpeg_filter.c
ifilter->ist->file_index, ifilter->ist->st->index);
return AVERROR_DECODER_NOT_FOUND;
}
@@ -1122,7 +1122,7 @@ int configure_filtergraph(FilterGraph *f
@@ -1123,7 +1123,7 @@ int configure_filtergraph(FilterGraph *f
if (!ost->enc) {
/* identical to the same check in ffmpeg.c, needed because
complex filter graphs are initialized earlier */
@ -45,11 +45,11 @@ Index: ffmpeg-4.0.1/fftools/ffmpeg_filter.c
avcodec_get_name(ost->st->codecpar->codec_id), ost->file_index, ost->index);
ret = AVERROR(EINVAL);
goto fail;
Index: ffmpeg-4.0.1/fftools/ffmpeg_opt.c
Index: ffmpeg-4.1/fftools/ffmpeg_opt.c
===================================================================
--- ffmpeg-4.0.1.orig/fftools/ffmpeg_opt.c 2018-04-20 12:02:55.000000000 +0200
+++ ffmpeg-4.0.1/fftools/ffmpeg_opt.c 2018-06-30 00:17:17.757924412 +0200
@@ -1277,7 +1277,7 @@ static int choose_encoder(OptionsContext
--- ffmpeg-4.1.orig/fftools/ffmpeg_opt.c
+++ ffmpeg-4.1/fftools/ffmpeg_opt.c
@@ -1306,7 +1306,7 @@ static int choose_encoder(OptionsContext
if (!ost->enc) {
av_log(NULL, AV_LOG_FATAL, "Automatic encoder selection failed for "
"output stream #%d:%d. Default encoder for format %s (codec %s) is "