aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorArttu Ylä-Outinen <arttu.yla-outinen@tut.fi>2015-08-25 11:33:19 +0300
committerLuca Barbato <lu_zero@gentoo.org>2015-10-23 11:59:27 +0200
commit233d2fa0443197df12b4f7823d591dad964149b3 (patch)
tree74fac4095afe7ca64e0f2bc7178084c54aef6463 /libavcodec
parent18f9308e6a96bbeb034ee5213a6d41e0b6c2ae74 (diff)
downloadffmpeg-233d2fa0443197df12b4f7823d591dad964149b3.tar.gz
kvazaar: Add libkvazaar HEVC encoder
Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile1
-rw-r--r--libavcodec/allcodecs.c1
-rw-r--r--libavcodec/libkvazaar.c300
-rw-r--r--libavcodec/version.h2
4 files changed, 303 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3e57a0d6c0..7542c07d07 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 46febd5b18..c0fca74b70 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 0000000000..89b024a379
--- /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 21f5fbf2ae..ddf549abf9 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, \