[FFmpeg-cvslog] vaapi_encode: Add VP8 support
Mark Thompson
git at videolan.org
Wed Feb 8 23:01:16 EET 2017
ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Tue Nov 29 20:38:29 2016 +0000| [d1acab8293054151157910eb081d5edcc7496e13] | committer: Mark Thompson
vaapi_encode: Add VP8 support
Fixes ticket #6116.
(cherry picked from commit ca62236a89f47bd871eaf69d8d9e837c93c55a6c)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1acab8293054151157910eb081d5edcc7496e13
---
Changelog | 2 +-
configure | 3 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/vaapi_encode_vp8.c | 268 ++++++++++++++++++++++++++++++++++++++++++
libavcodec/version.h | 2 +-
6 files changed, 275 insertions(+), 2 deletions(-)
diff --git a/Changelog b/Changelog
index 5979b9c..0a416eb 100644
--- a/Changelog
+++ b/Changelog
@@ -108,7 +108,7 @@ version 3.1:
- libutvideo wrapper removed
- YUY2 Lossless Codec decoder
- VideoToolbox H.264 encoder
-- VAAPI-accelerated MPEG-2 encoding
+- VAAPI-accelerated MPEG-2 and VP8 encoding
version 3.0:
diff --git a/configure b/configure
index 7046a30..72b86bc 100755
--- a/configure
+++ b/configure
@@ -2779,6 +2779,8 @@ vc1_cuvid_decoder_deps="cuda cuvid"
vc1_cuvid_decoder_select="vc1_cuvid_hwaccel"
vp8_cuvid_decoder_deps="cuda cuvid"
vp8_cuvid_decoder_select="vp8_cuvid_hwaccel"
+vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8"
+vp8_vaapi_encoder_select="vaapi_encode"
vp9_cuvid_decoder_deps="cuda cuvid"
vp9_cuvid_decoder_select="vp9_cuvid_hwaccel"
@@ -5656,6 +5658,7 @@ check_type "va/va.h va/va_enc_h264.h" "VAEncPictureParameterBufferH264"
check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC"
check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"
check_type "va/va.h va/va_enc_mpeg2.h" "VAEncPictureParameterBufferMPEG2"
+check_type "va/va.h va/va_enc_vp8.h" "VAEncPictureParameterBufferVP8"
check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 757f941..c4e1086 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -602,6 +602,7 @@ OBJS-$(CONFIG_VP7_DECODER) += vp8.o vp56rac.o
OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp56rac.o
OBJS-$(CONFIG_VP8_CUVID_DECODER) += cuvid.o
OBJS-$(CONFIG_VP8_MEDIACODEC_DECODER) += mediacodecdec.o
+OBJS-$(CONFIG_VP8_VAAPI_ENCODER) += vaapi_encode_vp8.o
OBJS-$(CONFIG_VP9_DECODER) += vp9.o vp9dsp.o vp56rac.o vp9dsp_8bpp.o \
vp9dsp_10bpp.o vp9dsp_12bpp.o
OBJS-$(CONFIG_VP9_CUVID_DECODER) += cuvid.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 79e21f9..4d9a983 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -667,6 +667,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(VC1_CUVID, vc1_cuvid);
REGISTER_DECODER(VP8_CUVID, vp8_cuvid);
REGISTER_DECODER(VP8_MEDIACODEC, vp8_mediacodec);
+ REGISTER_ENCODER(VP8_VAAPI, vp8_vaapi);
REGISTER_DECODER(VP9_CUVID, vp9_cuvid);
REGISTER_DECODER(VP9_MEDIACODEC, vp9_mediacodec);
diff --git a/libavcodec/vaapi_encode_vp8.c b/libavcodec/vaapi_encode_vp8.c
new file mode 100644
index 0000000..4a1c85e
--- /dev/null
+++ b/libavcodec/vaapi_encode_vp8.c
@@ -0,0 +1,268 @@
+/*
+ * 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <va/va.h>
+#include <va/va_enc_vp8.h>
+
+#include "libavutil/avassert.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixfmt.h"
+
+#include "avcodec.h"
+#include "internal.h"
+#include "vaapi_encode.h"
+
+
+typedef struct VAAPIEncodeVP8Context {
+ int q_index_i;
+ int q_index_p;
+} VAAPIEncodeVP8Context;
+
+typedef struct VAAPIEncodeVP8Options {
+ int loop_filter_level;
+ int loop_filter_sharpness;
+} VAAPIEncodeVP8Options;
+
+
+#define vseq_var(name) vseq->name, name
+#define vseq_field(name) vseq->seq_fields.bits.name, name
+#define vpic_var(name) vpic->name, name
+#define vpic_field(name) vpic->pic_fields.bits.name, name
+
+
+static int vaapi_encode_vp8_init_sequence_params(AVCodecContext *avctx)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAEncSequenceParameterBufferVP8 *vseq = ctx->codec_sequence_params;
+
+ vseq->frame_width = avctx->width;
+ vseq->frame_height = avctx->height;
+
+ vseq->frame_width_scale = 0;
+ vseq->frame_height_scale = 0;
+
+ vseq->error_resilient = 0;
+ vseq->kf_auto = 0;
+
+ if (!(ctx->va_rc_mode & VA_RC_CQP)) {
+ vseq->bits_per_second = avctx->bit_rate;
+ vseq->intra_period = avctx->gop_size;
+ }
+
+ return 0;
+}
+
+static int vaapi_encode_vp8_init_picture_params(AVCodecContext *avctx,
+ VAAPIEncodePicture *pic)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAEncPictureParameterBufferVP8 *vpic = pic->codec_picture_params;
+ VAAPIEncodeVP8Options *opt = ctx->codec_options;
+ int i;
+
+ vpic->reconstructed_frame = pic->recon_surface;
+
+ vpic->coded_buf = pic->output_buffer;
+
+ switch (pic->type) {
+ case PICTURE_TYPE_IDR:
+ case PICTURE_TYPE_I:
+ av_assert0(pic->nb_refs == 0);
+ vpic->ref_flags.bits.force_kf = 1;
+ vpic->ref_last_frame =
+ vpic->ref_gf_frame =
+ vpic->ref_arf_frame =
+ VA_INVALID_SURFACE;
+ break;
+ case PICTURE_TYPE_P:
+ av_assert0(pic->nb_refs == 1);
+ vpic->ref_flags.bits.no_ref_last = 0;
+ vpic->ref_flags.bits.no_ref_gf = 1;
+ vpic->ref_flags.bits.no_ref_arf = 1;
+ vpic->ref_last_frame =
+ vpic->ref_gf_frame =
+ vpic->ref_arf_frame =
+ pic->refs[0]->recon_surface;
+ break;
+ default:
+ av_assert0(0 && "invalid picture type");
+ }
+
+ vpic->pic_flags.bits.frame_type = (pic->type != PICTURE_TYPE_IDR);
+ vpic->pic_flags.bits.show_frame = 1;
+
+ vpic->pic_flags.bits.refresh_last = 1;
+ vpic->pic_flags.bits.refresh_golden_frame = 1;
+ vpic->pic_flags.bits.refresh_alternate_frame = 1;
+
+ vpic->pic_flags.bits.version = 0;
+ vpic->pic_flags.bits.loop_filter_type = 0;
+ for (i = 0; i < 4; i++)
+ vpic->loop_filter_level[i] = opt->loop_filter_level;
+ vpic->sharpness_level = opt->loop_filter_sharpness;
+
+ vpic->clamp_qindex_low = 0;
+ vpic->clamp_qindex_high = 127;
+
+ return 0;
+}
+
+static int vaapi_encode_vp8_write_quant_table(AVCodecContext *avctx,
+ VAAPIEncodePicture *pic,
+ int index, int *type,
+ char *data, size_t *data_len)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAAPIEncodeVP8Context *priv = ctx->priv_data;
+ VAQMatrixBufferVP8 quant;
+ int i, q;
+
+ if (index > 0)
+ return AVERROR_EOF;
+
+ if (*data_len < sizeof(quant))
+ return AVERROR(EINVAL);
+ *type = VAQMatrixBufferType;
+ *data_len = sizeof(quant);
+
+ if (pic->type == PICTURE_TYPE_P)
+ q = priv->q_index_p;
+ else
+ q = priv->q_index_i;
+
+ for (i = 0; i < 4; i++)
+ quant.quantization_index[i] = q;
+ for (i = 0; i < 5; i++)
+ quant.quantization_index_delta[i] = 0;
+
+ memcpy(data, &quant, sizeof(quant));
+ return 0;
+}
+
+static av_cold int vaapi_encode_vp8_configure(AVCodecContext *avctx)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAAPIEncodeVP8Context *priv = ctx->priv_data;
+
+ priv->q_index_p = av_clip(avctx->global_quality, 0, 127);
+ if (avctx->i_quant_factor > 0.0)
+ priv->q_index_i = av_clip((avctx->global_quality *
+ avctx->i_quant_factor +
+ avctx->i_quant_offset) + 0.5,
+ 0, 127);
+ else
+ priv->q_index_i = priv->q_index_p;
+
+ return 0;
+}
+
+static const VAAPIEncodeType vaapi_encode_type_vp8 = {
+ .configure = &vaapi_encode_vp8_configure,
+
+ .priv_data_size = sizeof(VAAPIEncodeVP8Context),
+
+ .sequence_params_size = sizeof(VAEncSequenceParameterBufferVP8),
+ .init_sequence_params = &vaapi_encode_vp8_init_sequence_params,
+
+ .picture_params_size = sizeof(VAEncPictureParameterBufferVP8),
+ .init_picture_params = &vaapi_encode_vp8_init_picture_params,
+
+ .write_extra_buffer = &vaapi_encode_vp8_write_quant_table,
+};
+
+static av_cold int vaapi_encode_vp8_init(AVCodecContext *avctx)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+
+ if (avctx->max_b_frames > 0) {
+ av_log(avctx, AV_LOG_ERROR, "B-frames are not supported.\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ ctx->codec = &vaapi_encode_type_vp8;
+
+ ctx->va_profile = VAProfileVP8Version0_3;
+ ctx->va_entrypoint = VAEntrypointEncSlice;
+ ctx->va_rt_format = VA_RT_FORMAT_YUV420;
+
+ if (avctx->flags & AV_CODEC_FLAG_QSCALE) {
+ ctx->va_rc_mode = VA_RC_CQP;
+ } else if (avctx->bit_rate > 0) {
+ if (avctx->rc_max_rate == avctx->bit_rate)
+ ctx->va_rc_mode = VA_RC_CBR;
+ else
+ ctx->va_rc_mode = VA_RC_VBR;
+ } else {
+ ctx->va_rc_mode = VA_RC_CQP;
+ }
+
+ // Packed headers are not currently supported.
+ ctx->va_packed_headers = 0;
+
+ ctx->surface_width = FFALIGN(avctx->width, 16);
+ ctx->surface_height = FFALIGN(avctx->height, 16);
+
+ return ff_vaapi_encode_init(avctx);
+}
+
+#define OFFSET(x) (offsetof(VAAPIEncodeContext, codec_options_data) + \
+ offsetof(VAAPIEncodeVP8Options, x))
+#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM)
+static const AVOption vaapi_encode_vp8_options[] = {
+ { "loop_filter_level", "Loop filter level",
+ OFFSET(loop_filter_level), AV_OPT_TYPE_INT, { .i64 = 16 }, 0, 63, FLAGS },
+ { "loop_filter_sharpness", "Loop filter sharpness",
+ OFFSET(loop_filter_sharpness), AV_OPT_TYPE_INT, { .i64 = 4 }, 0, 15, FLAGS },
+ { NULL },
+};
+
+static const AVCodecDefault vaapi_encode_vp8_defaults[] = {
+ { "b", "0" },
+ { "bf", "0" },
+ { "g", "120" },
+ { "global_quality", "40" },
+ { NULL },
+};
+
+static const AVClass vaapi_encode_vp8_class = {
+ .class_name = "vp8_vaapi",
+ .item_name = av_default_item_name,
+ .option = vaapi_encode_vp8_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVCodec ff_vp8_vaapi_encoder = {
+ .name = "vp8_vaapi",
+ .long_name = NULL_IF_CONFIG_SMALL("VP8 (VAAPI)"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_VP8,
+ .priv_data_size = (sizeof(VAAPIEncodeContext) +
+ sizeof(VAAPIEncodeVP8Options)),
+ .init = &vaapi_encode_vp8_init,
+ .encode2 = &ff_vaapi_encode2,
+ .close = &ff_vaapi_encode_close,
+ .priv_class = &vaapi_encode_vp8_class,
+ .capabilities = AV_CODEC_CAP_DELAY,
+ .defaults = vaapi_encode_vp8_defaults,
+ .pix_fmts = (const enum AVPixelFormat[]) {
+ AV_PIX_FMT_VAAPI,
+ AV_PIX_FMT_NONE,
+ },
+};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 82a89f9..a48cd5b 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 76
+#define LIBAVCODEC_VERSION_MINOR 77
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
More information about the ffmpeg-cvslog
mailing list