---
configure | 1 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/hevc.h | 3 +
libavcodec/qsv.c | 14 +++
libavcodec/qsv_internal.h | 4 +
libavcodec/qsvenc.c | 22 +++--
libavcodec/qsvenc_hevc.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 273 insertions(+), 9 deletions(-)
create mode 100644 libavcodec/qsvenc_hevc.c
diff --git a/configure b/configure
index f9e46b4..a3aa62a 100755
--- a/configure
+++ b/configure
@@ -1841,6 +1841,7 @@ h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser
qsvdec h264_qsv_hwacce
h264_qsv_encoder_deps="libmfx"
h264_qsv_encoder_select="qsvenc"
hevc_decoder_select="bswapdsp cabac golomb videodsp"
+hevc_qsv_encoder_select="qsvenc"
huffyuv_decoder_select="bswapdsp huffyuvdsp"
huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp"
iac_decoder_select="imc_decoder"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c751729..a560469 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -231,6 +231,7 @@ OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o
OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o
hevc_sei.o \
hevc_cabac.o hevc_refs.o hevcpred.o
\
hevcdsp.o hevc_filter.o hevc_parse.o
+OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o
hevc_parse.o
OBJS-$(CONFIG_HNM4_VIDEO_DECODER) += hnm4video.o
OBJS-$(CONFIG_HQX_DECODER) += hqx.o hqxvlc.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o huffyuvdec.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 223c994..f0496b9 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -473,6 +473,7 @@ void avcodec_register_all(void)
* above is available */
REGISTER_ENCODER(LIBOPENH264, libopenh264);
REGISTER_ENCODER(H264_QSV, h264_qsv);
+ REGISTER_ENCODER(HEVC_QSV, hevc_qsv);
REGISTER_ENCODER(MPEG2_QSV, mpeg2_qsv);
/* parsers */
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 8b06e1f..60377c2 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -1008,6 +1008,9 @@ void ff_hevc_pred_init(HEVCPredContext *hpc, int
bit_depth);
int ff_hevc_extract_rbsp(const uint8_t *src, int length,
HEVCNAL *nal);
+int ff_hevc_encode_nal_vps(HEVCVPS *vps, unsigned int id,
+ uint8_t *buf, int buf_size);
+
extern const uint8_t ff_hevc_qpel_extra_before[4];
extern const uint8_t ff_hevc_qpel_extra_after[4];
extern const uint8_t ff_hevc_qpel_extra[4];
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index f563100..482b908 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -32,6 +32,10 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id)
switch (codec_id) {
case AV_CODEC_ID_H264:
return MFX_CODEC_AVC;
+#if QSV_VERSION_ATLEAST(1, 8)
+ case AV_CODEC_ID_HEVC:
+ return MFX_CODEC_HEVC;
+#endif
case AV_CODEC_ID_MPEG1VIDEO:
case AV_CODEC_ID_MPEG2VIDEO:
return MFX_CODEC_MPEG2;
@@ -113,5 +117,15 @@ int ff_qsv_init_internal_session(AVCodecContext *avctx,
mfxSession *session)
"Initialized an internal MFX session using %s implementation\n",
desc);
+#if QSV_VERSION_ATLEAST(1, 8)
+ if (avctx->codec_id == AV_CODEC_ID_HEVC) {
+ ret = MFXVideoUSER_Load(*session, &MFX_PLUGINID_HEVCE_SW, 1);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_WARNING,
+ "Could not load the HEVC encoding plugin, encoding will
likely fail\n");
+ }
+ }
+#endif
+
return 0;
}
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
index d13848a..4b6d9c4 100644
--- a/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@ -30,6 +30,10 @@
#define ASYNC_DEPTH_DEFAULT 4 // internal parallelism
+#define QSV_VERSION_ATLEAST(MAJOR, MINOR) \
+ (MFX_VERSION_MAJOR > (MAJOR) || \
+ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
+
typedef struct QSVFrame {
AVFrame *frame;
mfxFrameSurface1 *surface;
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 690d5aa..a724611 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -124,15 +124,19 @@ static int init_video_param(AVCodecContext *avctx,
QSVEncContext *q)
break;
}
- q->extco.Header.BufferId = MFX_EXTBUFF_CODING_OPTION;
- q->extco.Header.BufferSz = sizeof(q->extco);
- q->extco.CAVLC = avctx->coder_type == FF_CODER_TYPE_VLC ?
- MFX_CODINGOPTION_ON :
MFX_CODINGOPTION_UNKNOWN;
-
- q->extparam[0] = (mfxExtBuffer *)&q->extco;
-
- q->param.ExtParam = q->extparam;
- q->param.NumExtParam = FF_ARRAY_ELEMS(q->extparam);
+ // the HEVC encoder plugin currently fails if coding options
+ // are provided
+ if (avctx->codec_id != AV_CODEC_ID_HEVC) {
+ q->extco.Header.BufferId = MFX_EXTBUFF_CODING_OPTION;
+ q->extco.Header.BufferSz = sizeof(q->extco);
+ q->extco.CAVLC = avctx->coder_type == FF_CODER_TYPE_VLC
?
+ MFX_CODINGOPTION_ON :
MFX_CODINGOPTION_UNKNOWN;
+
+ q->extparam[0] = (mfxExtBuffer *)&q->extco;
+
+ q->param.ExtParam = q->extparam;
+ q->param.NumExtParam = FF_ARRAY_ELEMS(q->extparam);
+ }
return 0;
}
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
new file mode 100644
index 0000000..9934472
--- /dev/null
+++ b/libavcodec/qsvenc_hevc.c
@@ -0,0 +1,236 @@
+/*
+ * Intel MediaSDK QSV based H.264 enccoder
+ *
+ * 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 <stdint.h>
+#include <sys/types.h>
+
+#include <mfx/mfxvideo.h>
+
+#include "libavutil/common.h"
+#include "libavutil/opt.h"
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "get_bits.h"
+#include "hevc.h"
+#include "internal.h"
+#include "qsv.h"
+#include "qsv_internal.h"
+#include "qsvenc.h"
+
+typedef struct QSVHEVCEncContext {
+ AVClass *class;
+ QSVEncContext qsv;
+} QSVHEVCEncContext;
+
+static int generate_fake_vps(QSVEncContext *q, AVCodecContext *avctx)
+{
+ GetByteContext gbc;
+ PutByteContext pbc;
+
+ GetBitContext gb;
+ HEVCNAL sps_nal = { NULL };
+ HEVCSPS sps = { 0 };
+ HEVCVPS vps = { 0 };
+ uint8_t vps_buf[128], vps_rbsp_buf[128];
+ uint8_t *new_extradata;
+ unsigned int sps_id;
+ int ret, i, type, vps_size;
+
+ if (!avctx->extradata_size) {
+ av_log(avctx, AV_LOG_ERROR, "No extradata returned from libmfx\n");
+ return AVERROR_UNKNOWN;
+ }
+
+ /* parse the SPS */
+ ret = ff_hevc_extract_rbsp(avctx->extradata + 4, avctx->extradata_size -
4, &sps_nal);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error unescaping the SPS buffer\n");
+ return ret;
+ }
+
+ ret = init_get_bits8(&gb, sps_nal.data, sps_nal.size);
+ if (ret < 0) {
+ av_freep(&sps_nal.rbsp_buffer);
+ return ret;
+ }
+
+ get_bits(&gb, 1);
+ type = get_bits(&gb, 6);
+ if (type != NAL_SPS) {
+ av_log(avctx, AV_LOG_ERROR, "Unexpected NAL type in the extradata:
%d\n",
+ type);
+ av_freep(&sps_nal.rbsp_buffer);
+ return AVERROR_INVALIDDATA;
+ }
+ get_bits(&gb, 9);
+
+ ret = ff_hevc_parse_sps(&sps, &gb, &sps_id, 0, NULL, avctx);
+ av_freep(&sps_nal.rbsp_buffer);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error parsing the SPS\n");
+ return ret;
+ }
+
+ /* generate the VPS */
+ vps.vps_max_layers = 1;
+ vps.vps_max_sub_layers = sps.max_sub_layers;
+ memcpy(&vps.ptl, &sps.ptl, sizeof(vps.ptl));
+ vps.vps_sub_layer_ordering_info_present_flag = 1;
+ for (i = 0; i < MAX_SUB_LAYERS; i++) {
+ vps.vps_max_dec_pic_buffering[i] =
sps.temporal_layer[i].max_dec_pic_buffering;
+ vps.vps_num_reorder_pics[i] =
sps.temporal_layer[i].num_reorder_pics;
+ vps.vps_max_latency_increase[i] =
sps.temporal_layer[i].max_latency_increase;
+ }
+
+ vps.vps_num_layer_sets = 1;
+ vps.vps_timing_info_present_flag =
sps.vui.vui_timing_info_present_flag;
+ vps.vps_num_units_in_tick = sps.vui.vui_num_units_in_tick;
+ vps.vps_time_scale = sps.vui.vui_time_scale;
+ vps.vps_poc_proportional_to_timing_flag =
sps.vui.vui_poc_proportional_to_timing_flag;
+ vps.vps_num_ticks_poc_diff_one =
sps.vui.vui_num_ticks_poc_diff_one_minus1 + 1;
+
+ /* generate the encoded RBSP form of the VPS */
+ ret = ff_hevc_encode_nal_vps(&vps, sps.vps_id, vps_rbsp_buf,
sizeof(vps_rbsp_buf));
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error writing the VPS\n");
+ return ret;
+ }
+
+ /* escape and add the startcode */
+ bytestream2_init(&gbc, vps_rbsp_buf, ret);
+ bytestream2_init_writer(&pbc, vps_buf, sizeof(vps_buf));
+
+ bytestream2_put_be32(&pbc, 1); // startcode
+ bytestream2_put_byte(&pbc, NAL_VPS << 1); // NAL
+ bytestream2_put_byte(&pbc, 1); // header
+
+ while (bytestream2_get_bytes_left(&gbc)) {
+ uint32_t b = bytestream2_peek_be24(&gbc);
+ if (b <= 3) {
+ bytestream2_put_be24(&pbc, 3);
+ bytestream2_skip(&gbc, 2);
+ } else
+ bytestream2_put_byte(&pbc, bytestream2_get_byte(&gbc));
+ }
+
+ vps_size = bytestream2_tell_p(&pbc);
+ new_extradata = av_mallocz(vps_size + avctx->extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!new_extradata)
+ return AVERROR(ENOMEM);
+ memcpy(new_extradata, vps_buf, vps_size);
+ memcpy(new_extradata + vps_size, avctx->extradata, avctx->extradata_size);
+
+ av_freep(&avctx->extradata);
+ avctx->extradata = new_extradata;
+ avctx->extradata_size += vps_size;
+
+ return 0;
+}
+
+static av_cold int qsv_enc_init(AVCodecContext *avctx)
+{
+ QSVHEVCEncContext *q = avctx->priv_data;
+ int ret;
+
+ ret = ff_qsv_enc_init(avctx, &q->qsv);
+ if (ret < 0)
+ return ret;
+
+ ret = generate_fake_vps(&q->qsv, avctx);
+ if (ret < 0) {
+ ff_qsv_enc_close(avctx, &q->qsv);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int qsv_enc_frame(AVCodecContext *avctx, AVPacket *pkt,
+ const AVFrame *frame, int *got_packet)
+{
+ QSVHEVCEncContext *q = avctx->priv_data;
+
+ return ff_qsv_encode(avctx, &q->qsv, pkt, frame, got_packet);
+}
+
+static av_cold int qsv_enc_close(AVCodecContext *avctx)
+{
+ QSVHEVCEncContext *q = avctx->priv_data;
+
+ return ff_qsv_enc_close(avctx, &q->qsv);
+}
+
+#define OFFSET(x) offsetof(QSVHEVCEncContext, x)
+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
+static const AVOption options[] = {
+ { "async_depth", "Maximum processing parallelism",
OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0,
INT_MAX, VE },
+ { "avbr_accuracy", "Accuracy of the AVBR ratecontrol",
OFFSET(qsv.avbr_accuracy), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
+ { "avbr_convergence", "Convergence of the AVBR ratecontrol",
OFFSET(qsv.avbr_convergence), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
+
+ { "profile", NULL, OFFSET(qsv.profile), AV_OPT_TYPE_INT, { .i64 =
MFX_PROFILE_UNKNOWN }, 0, INT_MAX, VE, "profile" },
+ { "unknown", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_UNKNOWN
}, INT_MIN, INT_MAX, VE, "profile" },
+ { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAIN
}, INT_MIN, INT_MAX, VE, "profile" },
+ { "main10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAIN10
}, INT_MIN, INT_MAX, VE, "profile" },
+ { "mainsp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAINSP
}, INT_MIN, INT_MAX, VE, "profile" },
+
+ { "preset", NULL, OFFSET(qsv.preset), AV_OPT_TYPE_INT, { .i64 =
MFX_TARGETUSAGE_BALANCED }, 0, 7, VE, "preset" },
+ { "fast", NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
MFX_TARGETUSAGE_BEST_SPEED }, INT_MIN, INT_MAX, VE, "preset" },
+ { "medium", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_BALANCED
}, INT_MIN, INT_MAX, VE, "preset" },
+ { "slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
MFX_TARGETUSAGE_BEST_QUALITY }, INT_MIN, INT_MAX, VE, "preset" },
+
+ { NULL },
+};
+
+static const AVClass class = {
+ .class_name = "hevc_qsv encoder",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVCodecDefault qsv_enc_defaults[] = {
+ { "b", "1M" },
+ { "refs", "0" },
+ // same as the x264 default
+ { "g", "250" },
+ { "bf", "3" },
+
+ { "flags", "+cgop" },
+ { NULL },
+};
+
+AVCodec ff_hevc_qsv_encoder = {
+ .name = "hevc_qsv",
+ .long_name = NULL_IF_CONFIG_SMALL("HEVC (Intel Quick Sync Video
acceleration)"),
+ .priv_data_size = sizeof(QSVHEVCEncContext),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_HEVC,
+ .init = qsv_enc_init,
+ .encode2 = qsv_enc_frame,
+ .close = qsv_enc_close,
+ .capabilities = CODEC_CAP_DELAY,
+ .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12,
+ AV_PIX_FMT_QSV,
+ AV_PIX_FMT_NONE },
+ .priv_class = &class,
+ .defaults = qsv_enc_defaults,
+};
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
