[FFmpeg-cvslog] kvazaar: Add libkvazaar HEVC encoder
Arttu Ylä-Outinen
git at videolan.org
Tue Oct 27 13:51:27 CET 2015
ffmpeg | branch: master | Arttu Ylä-Outinen <arttu.yla-outinen at tut.fi> | Tue Aug 25 11:33:19 2015 +0300| [233d2fa0443197df12b4f7823d591dad964149b3] | committer: Luca Barbato
kvazaar: Add libkvazaar HEVC encoder
Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen at tut.fi>
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=233d2fa0443197df12b4f7823d591dad964149b3
---
Changelog | 1 +
configure | 4 +
doc/encoders.texi | 21 ++++
doc/general.texi | 10 +-
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/libkvazaar.c | 300 +++++++++++++++++++++++++++++++++++++++++++++++
libavcodec/version.h | 2 +-
8 files changed, 338 insertions(+), 2 deletions(-)
diff --git a/Changelog b/Changelog
index 4e3b38c..5627826 100644
--- a/Changelog
+++ b/Changelog
@@ -45,6 +45,7 @@ version <next>:
- DXV decoding
- Screenpresso SPV1 decoding
- zero-copy Intel QSV transcoding in avconv
+- libkvazaar HEVC encoder
version 11:
diff --git a/configure b/configure
index 40bf725..f2f852e 100755
--- a/configure
+++ b/configure
@@ -191,6 +191,7 @@ External library support:
--enable-libfreetype enable libfreetype [no]
--enable-libgsm enable GSM de/encoding via libgsm [no]
--enable-libilbc enable iLBC de/encoding via libilbc [no]
+ --enable-libkvazaar enable HEVC encoding via libkvazaar [no]
--enable-libmfx enable HW acceleration through libmfx
--enable-libmp3lame enable MP3 encoding via libmp3lame [no]
--enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no]
@@ -1186,6 +1187,7 @@ EXTERNAL_LIBRARY_LIST="
libfreetype
libgsm
libilbc
+ libkvazaar
libmfx
libmp3lame
libopencore_amrnb
@@ -2133,6 +2135,7 @@ libgsm_ms_decoder_deps="libgsm"
libgsm_ms_encoder_deps="libgsm"
libilbc_decoder_deps="libilbc"
libilbc_encoder_deps="libilbc"
+libkvazaar_encoder_deps="libkvazaar"
libmp3lame_encoder_deps="libmp3lame"
libmp3lame_encoder_select="audio_frame_queue"
libopencore_amrnb_decoder_deps="libopencore_amrnb"
@@ -4420,6 +4423,7 @@ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
check_lib "${gsm_hdr}" gsm_create -lgsm && break;
done || die "ERROR: libgsm not found"; }
enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
+enabled libkvazaar && require_pkg_config "kvazaar >= 0.7.1" kvazaar.h kvz_api_get
enabled libmfx && require_pkg_config libmfx "mfx/mfxvideo.h" MFXInit
enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
diff --git a/doc/encoders.texi b/doc/encoders.texi
index 779a469..3b6f7df 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -813,4 +813,25 @@ Setting a higher @option{bits_per_mb} limit will improve the speed.
For the fastest encoding speed set the @option{qscale} parameter (4 is the
recommended value) and do not set a size constraint.
+ at section libkvazaar
+
+Kvazaar H.265/HEVC encoder.
+
+Requires the presence of the libkvazaar headers and library during
+configuration. You need to explicitly configure the build with
+ at option{--enable-libkvazaar}.
+
+ at subsection Options
+
+ at table @option
+
+ at item b
+Set target video bitrate in bit/s and enable rate control.
+
+ at item kvazaar-params
+Set kvazaar parameters as a list of @var{name}=@var{value} pairs separated
+by commas (,). See kvazaar documentation for a list of options.
+
+ at end table
+
@c man end VIDEO ENCODERS
diff --git a/doc/general.texi b/doc/general.texi
index 6e43269..bddc075 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -131,6 +131,14 @@ x265 is under the GNU Public License Version 2 or later
details), you must upgrade Libav's license to GPL in order to use it.
@end float
+ at section kvazaar
+
+Libav can make use of the kvazaar library for HEVC encoding.
+
+Go to @url{https://github.com/ultravideo/kvazaar} and follow the
+instructions for installing the library. Then pass
+ at code{--enable-libkvazaar} to configure to enable it.
+
@section libilbc
iLBC is a narrowband speech codec that has been made freely available
@@ -630,7 +638,7 @@ following image formats are supported:
@item H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 @tab E @tab X
@tab encoding supported through external library libx264 and OpenH264
@item HEVC @tab X @tab X
- @tab encoding supported through the external library libx265
+ @tab encoding supported through external library libx265 and libkvazaar
@item HNM version 4 @tab @tab X
@item HuffYUV @tab X @tab X
@item HuffYUV FFmpeg variant @tab X @tab X
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3e57a0d..7542c07 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -655,6 +655,7 @@ OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsmdec.o
OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsmenc.o
OBJS-$(CONFIG_LIBILBC_DECODER) += libilbc.o
OBJS-$(CONFIG_LIBILBC_ENCODER) += libilbc.o
+OBJS-$(CONFIG_LIBKVAZAAR_ENCODER) += libkvazaar.o
OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o mpegaudiodecheader.o
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 46febd5..c0fca74 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -491,6 +491,7 @@ void avcodec_register_all(void)
REGISTER_ENCODER(LIBOPENH264, libopenh264);
REGISTER_ENCODER(H264_NVENC, h264_nvenc);
REGISTER_ENCODER(H264_QSV, h264_qsv);
+ REGISTER_ENCODER(LIBKVAZAAR, libkvazaar);
REGISTER_ENCODER(HEVC_NVENC, hevc_nvenc);
REGISTER_ENCODER(HEVC_QSV, hevc_qsv);
REGISTER_ENCODER(MPEG2_QSV, mpeg2_qsv);
diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c
new file mode 100644
index 0000000..89b024a
--- /dev/null
+++ b/libavcodec/libkvazaar.c
@@ -0,0 +1,300 @@
+/*
+ * libkvazaar encoder
+ *
+ * Copyright (c) 2015 Tampere University of Technology
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <kvazaar.h>
+#include <string.h>
+
+#include "libavutil/dict.h"
+#include "libavutil/error.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/opt.h"
+
+#include "avcodec.h"
+#include "internal.h"
+
+typedef struct LibkvazaarContext {
+ const AVClass *class;
+
+ const kvz_api *api;
+ kvz_encoder *encoder;
+ kvz_config *config;
+
+ char *kvz_params;
+} LibkvazaarContext;
+
+static av_cold int libkvazaar_init(AVCodecContext *avctx)
+{
+ LibkvazaarContext *const ctx = avctx->priv_data;
+ const kvz_api *const api = ctx->api = kvz_api_get(8);
+ kvz_config *cfg = NULL;
+ kvz_encoder *enc = NULL;
+
+ if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Set -strict experimental to use this encoder.\n");
+ return AVERROR_EXPERIMENTAL;
+ }
+
+ /* Kvazaar requires width and height to be multiples of eight. */
+ if (avctx->width % 8 || avctx->height % 8) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Video dimensions are not a multiple of 8 (%dx%d).\n",
+ avctx->width, avctx->height);
+ return AVERROR(ENOSYS);
+ }
+
+ ctx->config = cfg = api->config_alloc();
+ if (!cfg) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Could not allocate kvazaar config structure.\n");
+ return AVERROR(ENOMEM);
+ }
+
+ if (!api->config_init(cfg)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Could not initialize kvazaar config structure.\n");
+ return AVERROR_BUG;
+ }
+
+ cfg->width = avctx->width;
+ cfg->height = avctx->height;
+
+ cfg->framerate =
+ avctx->time_base.den / (double)(avctx->time_base.num * avctx->ticks_per_frame);
+ cfg->target_bitrate = avctx->bit_rate;
+ cfg->vui.sar_width = avctx->sample_aspect_ratio.num;
+ cfg->vui.sar_height = avctx->sample_aspect_ratio.den;
+
+ if (ctx->kvz_params) {
+ AVDictionary *dict = NULL;
+ if (!av_dict_parse_string(&dict, ctx->kvz_params, "=", ",", 0)) {
+ AVDictionaryEntry *entry = NULL;
+ while ((entry = av_dict_get(dict, "", entry, AV_DICT_IGNORE_SUFFIX))) {
+ if (!api->config_parse(cfg, entry->key, entry->value)) {
+ av_log(avctx, AV_LOG_WARNING, "Invalid option: %s=%s.\n",
+ entry->key, entry->value);
+ }
+ }
+ av_dict_free(&dict);
+ }
+ }
+
+ ctx->encoder = enc = api->encoder_open(cfg);
+ if (!enc) {
+ av_log(avctx, AV_LOG_ERROR, "Could not open kvazaar encoder.\n");
+ return AVERROR_BUG;
+ }
+
+ if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
+ kvz_data_chunk *data_out = NULL;
+ kvz_data_chunk *chunk = NULL;
+ uint32_t len_out;
+ uint8_t *p;
+
+ if (!api->encoder_headers(enc, &data_out, &len_out))
+ return AVERROR(ENOMEM);
+
+ avctx->extradata = p = av_mallocz(len_out + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!p) {
+ ctx->api->chunk_free(data_out);
+ return AVERROR(ENOMEM);
+ }
+
+ avctx->extradata_size = len_out;
+
+ for (chunk = data_out; chunk != NULL; chunk = chunk->next) {
+ memcpy(p, chunk->data, chunk->len);
+ p += chunk->len;
+ }
+
+ ctx->api->chunk_free(data_out);
+ }
+
+ return 0;
+}
+
+static av_cold int libkvazaar_close(AVCodecContext *avctx)
+{
+ LibkvazaarContext *ctx = avctx->priv_data;
+
+ if (ctx->api) {
+ ctx->api->encoder_close(ctx->encoder);
+ ctx->api->config_destroy(ctx->config);
+ }
+
+ if (avctx->extradata)
+ av_freep(&avctx->extradata);
+
+ return 0;
+}
+
+static int libkvazaar_encode(AVCodecContext *avctx,
+ AVPacket *avpkt,
+ const AVFrame *frame,
+ int *got_packet_ptr)
+{
+ LibkvazaarContext *ctx = avctx->priv_data;
+ kvz_picture *input_pic = NULL;
+ kvz_picture *recon_pic = NULL;
+ kvz_frame_info frame_info;
+ kvz_data_chunk *data_out = NULL;
+ uint32_t len_out = 0;
+ int retval = 0;
+
+ if (frame) {
+ if (frame->width != ctx->config->width ||
+ frame->height != ctx->config->height) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Changing video dimensions during encoding is not supported. "
+ "(changed from %dx%d to %dx%d)\n",
+ ctx->config->width, ctx->config->height,
+ frame->width, frame->height);
+ retval = AVERROR_INVALIDDATA;
+ goto done;
+ }
+
+ if (frame->format != avctx->pix_fmt) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Changing pixel format during encoding is not supported. "
+ "(changed from %s to %s)\n",
+ av_get_pix_fmt_name(avctx->pix_fmt),
+ av_get_pix_fmt_name(frame->format));
+ retval = AVERROR_INVALIDDATA;
+ goto done;
+ }
+
+ // Allocate input picture for kvazaar.
+ input_pic = ctx->api->picture_alloc(frame->width, frame->height);
+ if (!input_pic) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to allocate picture.\n");
+ retval = AVERROR(ENOMEM);
+ goto done;
+ }
+
+ // Copy pixels from frame to input_pic.
+ {
+ int dst_linesizes[4] = {
+ frame->width,
+ frame->width / 2,
+ frame->width / 2,
+ 0
+ };
+ av_image_copy(input_pic->data, dst_linesizes,
+ frame->data, frame->linesize,
+ frame->format, frame->width, frame->height);
+ }
+
+ input_pic->pts = frame->pts;
+ }
+
+ retval = ctx->api->encoder_encode(ctx->encoder,
+ input_pic,
+ &data_out, &len_out,
+ &recon_pic, NULL,
+ &frame_info);
+ if (!retval) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to encode frame.\n");
+ retval = AVERROR_INVALIDDATA;
+ goto done;
+ }
+
+ if (data_out) {
+ kvz_data_chunk *chunk = NULL;
+ uint64_t written = 0;
+
+ retval = ff_alloc_packet(avpkt, len_out);
+ if (retval < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to allocate output packet.\n");
+ goto done;
+ }
+
+ for (chunk = data_out; chunk != NULL; chunk = chunk->next) {
+ memcpy(avpkt->data + written, chunk->data, chunk->len);
+ written += chunk->len;
+ }
+
+ avpkt->pts = recon_pic->pts;
+ avpkt->dts = recon_pic->dts;
+ avpkt->flags = 0;
+ // IRAP VCL NAL unit types span the range
+ // [BLA_W_LP (16), RSV_IRAP_VCL23 (23)].
+ if (frame_info.nal_unit_type >= KVZ_NAL_BLA_W_LP &&
+ frame_info.nal_unit_type <= KVZ_NAL_RSV_IRAP_VCL23) {
+ avpkt->flags |= AV_PKT_FLAG_KEY;
+ }
+
+ *got_packet_ptr = 1;
+ }
+
+done:
+ ctx->api->picture_free(input_pic);
+ ctx->api->picture_free(recon_pic);
+ ctx->api->chunk_free(data_out);
+ return retval;
+}
+
+static const enum AVPixelFormat pix_fmts[] = {
+ AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_NONE
+};
+
+#define OFFSET(x) offsetof(LibkvazaarContext, x)
+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+ { "kvazaar-params", "Set kvazaar parameters as a comma-separated list of key=value pairs.",
+ OFFSET(kvz_params), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE },
+
+ { NULL },
+};
+
+static const AVClass class = {
+ .class_name = "libkvazaar",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVCodecDefault defaults[] = {
+ { "b", "0" },
+ { NULL },
+};
+
+AVCodec ff_libkvazaar_encoder = {
+ .name = "libkvazaar",
+ .long_name = NULL_IF_CONFIG_SMALL("libkvazaar H.265 / HEVC"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_HEVC,
+ .capabilities = AV_CODEC_CAP_DELAY,
+ .pix_fmts = pix_fmts,
+
+ .priv_class = &class,
+ .priv_data_size = sizeof(LibkvazaarContext),
+ .defaults = defaults,
+
+ .init = libkvazaar_init,
+ .encode2 = libkvazaar_encode,
+ .close = libkvazaar_close,
+
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
+};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 21f5fbf..ddf549a 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 5
+#define LIBAVCODEC_VERSION_MINOR 6
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
More information about the ffmpeg-cvslog
mailing list