[vlc-devel] [PATCH] Adds Support for Intel's QuickSync Video encoder
Rafaël Carré
funman at videolan.org
Fri May 10 04:33:44 CEST 2013
Hello,
Le 08/05/2013 22:04, Julien 'Lta' BALLET a écrit :
> Hi,
>
> The first patch adds a new encoder for h264 and mpeg2 based on Intel
> 'QuickSync Video' technology. This allows for hardware acceleration of
> encoding for these two formats. Use of this new feature of intel's
> processors requires to use their 'Media SDK'. An opensource 'dispatcher' is
> provided by Intel to select between software and hardware mode, and to
> avoid linking with their proprietary library. An autotooled/cmaked version
> can be found here : https://github.com/lu-zero/mfx_dispatch. The Cmake
> version is required as for now, since the configure code the patch adds
> uses the pkg-config file, which is only generated by cmake.
>
> I gotta warn you, there's a small spinlock in the encode loop which cannot
> be removed unless you wanna loose frames (and maybe create a passage to
> another dimension full of ponies), but it's only triggered once every 2-5s.
That seems to be a busy loop rather than a spinlock (not sure what is
happening on the other side of the code).
> This encoder requires NV12 as its input, this is why i also provide a
> second patch including a naive i420 to nv12 video_chroma filter, in order
> to avoid to use swscale for a simple chroma conversion.
What's wrong with swscale?
> I'm pretty sure there are many folks out there who can turn this naive C
> implementation into a fast & furious MMX/SSE4/WTF implementation, and i
> hope at some point, one of them will bravely rise and patch it.
I would have said maybe swscale does it already, but it is absolutely
impossible to tell because swscale code can not be read.
> Many thanks in advance to the lovely one who'll take the time to review the
> patches.
np, thanks for the patch <3
> Regards,
> Julien 'Lta' BALLET.
>
> PS: I'll offer a beer to the guy who commits the patches, whenever they
> pass the review.
>
>
> 0001-Adds-Intel-QuickSync-Video-encoder.patch
>
>
> From ae3580e7f119e720a3bcc98b1aac8676c9b75a6c Mon Sep 17 00:00:00 2001
> From: Julien 'Lta' BALLET <contact at lta.io>
> Date: Wed, 8 May 2013 21:26:29 +0200
> Subject: [PATCH 1/2] Adds Intel QuickSync Video encoder
>
> ---
> configure.ac | 5 +
> modules/codec/Modules.am | 1 +
> modules/codec/qsv.c | 730 +++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 736 insertions(+)
> create mode 100644 modules/codec/qsv.c
>
> diff --git a/configure.ac b/configure.ac
> index 567b01a..dd3f4b9 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2837,6 +2837,11 @@ if test "${enable_x264}" != "no"; then
> fi
>
> dnl
> +dnl Intel QuickSync (aka MediaSDK) H264/MPEG2 encoder
> +dnl
> +PKG_ENABLE_MODULES_VLC([QUICKSYNC], [qsv], libmfx, [Intel QuickSync H.264/MPEG2 encoder], [auto])
<lawyer mode>
Shouldn't it be H.264/H.262 or MPEG4-Part10/MPEG2 ?
</lawyer>
I guess both codecs are best known under the names you chose though.. :)
> +
> +dnl
> dnl libfluidsynth (MIDI synthetizer) plugin
> dnl
> PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth >= 1.1.2], [MIDI synthetiser with libfluidsynth], [auto])
> diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
> index 1fb65df..5ed02fb 100644
> --- a/modules/codec/Modules.am
> +++ b/modules/codec/Modules.am
> @@ -58,6 +58,7 @@ SOURCES_ddummy = ddummy.c
> SOURCES_edummy = edummy.c
> SOURCES_fdkaac = fdkaac.c
> SOURCES_scte27 = scte27.c
> +SOURCES_qsv = qsv.c
>
> libvlc_LTLIBRARIES += \
> liba52_plugin.la \
> diff --git a/modules/codec/qsv.c b/modules/codec/qsv.c
> new file mode 100644
> index 0000000..40ddd66
> --- /dev/null
> +++ b/modules/codec/qsv.c
> @@ -0,0 +1,730 @@
> +/*****************************************************************************
> + * qsv.h: h264/mpeg2 video encoder using Intel Media SDK
qsv.c
> + *****************************************************************************
> + * Copyright (C) 2013 VideoLabs
> + * $Id$
> + *
> + * Authors: Julien 'Lta' BALLET <contact at lta.io>
> + *
> + * This program 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.
> + *
> + * This program 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.
> + *****************************************************************************/
> +
> +/*****************************************************************************
> + * Preamble
> + *****************************************************************************/
> +#ifdef HAVE_CONFIG_H
> +# include "config.h"
> +#endif
> +
> +#include <vlc_common.h>
> +#include <vlc_plugin.h>
> +#include <vlc_picture.h>
> +#include <vlc_codec.h>
> +
> +#include <mfx/mfxvideo.h>
> +
> +#define SOUT_CFG_PREFIX "sout-qsv-"
> +
> +#define QSV_SYNCPOINT_WAIT (4*42)
> +#define QSV_SPINLOCK_TIME (20000)
> +#define QSV_BITRATE_DEFAULT (842)
Those deserve a comment.
> +#define QSV_ALIGN32(value) (((value + 31) >> 5) << 5) // round up to a multiple of 32
> +#define QSV_ALIGN16(value) (((value + 15) >> 4) << 4) // round up to a multiple of 16
#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
Perhaps this can be useful ?
Any way, & 15 / & 31 should be better than 2 shifts.
And the ALIGN32 is used only once so I guess a macro is not needed.
> +/*****************************************************************************
> + * Modules descriptor
> + *****************************************************************************/
> +static int Open(vlc_object_t *);
> +static void Close(vlc_object_t *);
> +
> +#define SW_IMPL_TEXT N_("Enable software mode")
> +#define SW_IMPL_LONGTEXT N_("Allow the use of the Intel Media SDK software " \
> + "implementation of the codecs if no QuickSync Video hardware " \
> + "acceleration is present on the system.")
> +
> +#define PROFILE_TEXT N_("Codec Profile")
> +#define PROFILE_LONGTEXT N_( \
> + "Specify the codec profile explicitly. If you don't, the codec will " \
> + "determine the correct profile from other sources, such as resolution " \
> + "and bitrate. E.g. 'high'")
> +
> +#define LEVEL_TEXT N_("Codec Level")
> +#define LEVEL_LONGTEXT N_( \
> + "Specify the codec level explicitly. If you don't, the codec will " \
> + "determine the correct profile from other sources, such as resolution " \
> + "and bitrate. E.g. '4.2' for h264 or 'low' for mpeg2")
> +
> +#define GOP_SIZE_TEXT N_("Group of Picture size")
> +#define GOP_SIZE_LONGTEXT N_( \
> + "Number of pictures within the current GOP (Group of Pictures); if " \
> + "GopPicSize=0, then the GOP size is unspecified. If GopPicSize=1, " \
> + "only I-frames are used.")
> +
> +#define GOP_REF_DIST_TEXT N_("Group of Picture Reference Distance")
> +#define GOP_REF_DIST_LONGTEXT N_( \
> + "Distance between I- or P- key frames; if it is zero, the GOP " \
> + "structure is unspecified. Note: If GopRefDist = 1, there are no B- " \
> + "frames used. ")
> +
> +#define TARGET_USAGE_TEXT N_("Target Usage")
> +#define TARGET_USAGE_LONGTEXT N_("The target usage allow to choose between " \
> + "different trade-offs between quality and speed. Allowed values are : " \
> + "'speed', 'balanced' and 'quality'.")
> +
> +#define IDR_INTERVAL_TEXT N_("IDR interval")
> +#define IDR_INTERVAL_LONGTEXT N_( \
> + "For H.264, IdrInterval specifies IDR-frame interval in terms of I- " \
> + "frames; if IdrInterval=0, then every I-frame is an IDR-frame. If " \
> + "IdrInterval=1, then every other I-frame is an IDR-frame, etc. " \
> + "For MPEG2, IdrInterval defines sequence header interval in terms " \
> + "of I-frames. If IdrInterval=N, SDK inserts the sequence header " \
> + "before every Nth I-frame. If IdrInterval=0 (default), SDK inserts " \
> + "the sequence header once at the beginning of the stream. ")
> +
> +#define RATE_CONTROL_TEXT N_("Rate Control Method")
> +#define RATE_CONTROL_LONGTEXT N_( \
> + "The rate control method to use when encoding. Can be one of " \
> + "'crb', 'vbr', 'qp', 'avbr'. 'qp' mode isn't supported for mpeg2")
> +
> +#define QP_TEXT N_("Quantization parameter")
> +#define QP_LONGTEXT N_("Quantization parameter for all types of frames. " \
> + "This parameters sets qpi, qpp and qpp. It has less precedence than " \
> + "the forementionned parameters. Used only if rc_method is 'qp'.")
> +
> +#define QPI_TEXT N_("Quantization parameter for I-frames")
> +#define QPI_LONGTEXT N_("Quantization parameter for I-frames. This parameter " \
> + "overrides any qp set globally. Used only if rc_method is 'qp'.")
> +
> +#define QPP_TEXT N_("Quantization parameter for P-frames")
> +#define QPP_LONGTEXT N_("Quantization parameter for P-frames. This parameter " \
> + "overrides any qp set globally. Used only if rc_method is 'qp'.")
> +
> +#define QPB_TEXT N_("Quantization parameter for B-frames")
> +#define QPB_LONGTEXT N_("Quantization parameter for B-frames. This parameter " \
> + "overrides any qp set globally. Used only if rc_method is 'qp'.")
> +
> +#define MAX_BITRATE_TEXT N_("Maximum Bitrate")
> +#define MAX_BITRATE_LONGTEXT N_("Defines the maximum bitrate in Kpbs " \
> + "(1000 bits/s) for VBR rate control method. If not set, this parameter" \
> + ". is computed from other sources such as bitrate, profile, level, etc.")
> +
> +#define ACCURACY_TEXT N_("Accuracy of RateControl")
> +#define ACCURACY_LONGTEXT N_("Tolerance in percentage of the 'avbr' " \
> + " (Average Variable BitRate) method. (e.g. 10 with a bitrate of 800 " \
> + " kpbs means the encoder tries not to go above 880 kpbs and under " \
> + " 730 kpbs. The targeted accuracy is only reached after a certained " \
> + " convergence period. See the convergence parameter")
> +
> +#define CONVERGENCE_TEXT N_("Convergence time of 'avbr' RateControl")
> +#define CONVERGENCE_LONGTEXT N_("Number of 100 frames before the " \
> + "'avbr' rate control method reaches the requested bitrate with " \
> + "the requested accuracy. See the accuracy parameter. ")
> +
> +#define NUM_SLICE_TEXT N_("Number of slices per frame")
> +#define NUM_SLICE_LONGTEXT N_("Number of slices in each video frame; "\
> + "each slice contains one or more macro-block rows. If numslice is " \
> + "not set, the encoder may choose any slice partitioning allowed " \
> + "by the codec standard.")
> +
> +#define NUM_REF_FRAME_TEXT N_("Number of reference frames")
> +#define NUM_REF_FRAME_LONGTEXT N_("Number of reference frames")
> +
> +#define ASYNC_DEPTH_TEXT N_("Number of parallel operations")
> +#define ASYNC_DEPTH_LONGTEXT N_("Defines the number of parallel " \
> + "encoding operations before we synchronise the result. Higher " \
> + " may result on better throughput depending on hardware. " \
> + "MPEG2 needs at least 1 here.")
> +
> +static const int const profile_h264_list[] =
> + { 0, MFX_PROFILE_AVC_BASELINE, MFX_PROFILE_AVC_MAIN,
> + MFX_PROFILE_AVC_EXTENDED, MFX_PROFILE_AVC_HIGH };
> +static const char *const profile_h264_text[] =
> + { "unspecified", "baseline", "main", "extended", "high" };
This could be a char [][12] or char [][9] if you reduce "unspecified"
length.
> +
> +static const int const profile_mpeg2_list[] =
> + { 0, MFX_PROFILE_MPEG2_SIMPLE, MFX_PROFILE_MPEG2_MAIN,
> + MFX_PROFILE_MPEG2_HIGH };
> +static const char *const profile_mpeg2_text[] =
> + { "unspecified", "simple", "main", "high" };
> +
> +static const int const level_h264_list[] =
> + { 0, 10, 9, 12, 13, 20, 21, 22, 30, 31, 32, 40, 41, 42, 50, 51, 52};
> +static const char *const level_h264_text[] =
> + { "unspecified", "1", "1.1b", "1.2", "1.3", "2", "2.1", "2.2", "3", "3.1",
> + "3.2", "4", "4.1", "4.2", "5", "5.1", "5.2" };
This could be a char [][12] or char [][5] if you reduce "unspecified" length
> +
> +static const int const level_mpeg2_list[] =
> + { 0, MFX_LEVEL_MPEG2_LOW, MFX_LEVEL_MPEG2_MAIN,
> + MFX_LEVEL_MPEG2_HIGH, MFX_LEVEL_MPEG2_HIGH1440 };
> +static const char *const level_mpeg2_text[] =
> + { "unspecified", "low", "main", "high", "high1440" };
> +
> +static const int const target_usage_list[] =
> + { 0, MFX_TARGETUSAGE_BEST_QUALITY, MFX_TARGETUSAGE_BALANCED,
> + MFX_TARGETUSAGE_BEST_SPEED };
> +static const char *const target_usage_text[] =
> + { "unspecified", "quality", "balanced", "speed" };
> +
> +static const int const rc_method_list[] =
> + { MFX_RATECONTROL_CBR, MFX_RATECONTROL_VBR,
> + MFX_RATECONTROL_CQP, MFX_RATECONTROL_AVBR};
> +static const char *const rc_method_text[] =
> + { "cbr", "vbr", "qp", "avbr" };
char [][5] would take 4 * 5 = 20 bytes instead of 4 * 4 + 4 + 4 + 3 + 5
= 32 on 32 bits or 8 * 4 + 4 + 4 + 3 + 5 = 48 on 64bits.
It is not very important and can be done later if you wish but I guessed
I would let you know.
> +
> +vlc_module_begin ()
> + set_category(CAT_INPUT)
> + set_subcategory(SUBCAT_INPUT_VCODEC)
> + set_description(N_("Intel QuickSync Video encoder H264/MPEG2"))
> + set_shortname("qsv")
> + set_capability("encoder", 0)
Is the encoder admitedly worse than x264 ?
> + set_callbacks(Open, Close)
> +
> + add_bool(SOUT_CFG_PREFIX "software", false, SW_IMPL_TEXT, SW_IMPL_LONGTEXT, true)
> +
> + add_string(SOUT_CFG_PREFIX "h264-profile", "unspecified" , PROFILE_TEXT, PROFILE_LONGTEXT, false)
> + change_string_list(profile_h264_text, profile_h264_text)
> +
> + add_string(SOUT_CFG_PREFIX "h264-level", "unspecified", LEVEL_TEXT, LEVEL_LONGTEXT, false)
> + change_string_list(level_h264_text, level_h264_text)
> +
> + add_string(SOUT_CFG_PREFIX "mpeg2-profile", "unspecified", PROFILE_TEXT, PROFILE_LONGTEXT, false)
> + change_string_list(profile_mpeg2_text, profile_mpeg2_text)
> +
> + add_string(SOUT_CFG_PREFIX "mpeg2-level", "unspecified", LEVEL_TEXT, LEVEL_LONGTEXT, false)
> + change_string_list(level_mpeg2_text, level_mpeg2_text)
> +
> + add_integer(SOUT_CFG_PREFIX "gop-size", 32, GOP_SIZE_TEXT, GOP_SIZE_LONGTEXT, true)
> + add_integer(SOUT_CFG_PREFIX "gop-refdist", 4, GOP_REF_DIST_TEXT, GOP_REF_DIST_LONGTEXT, true)
> + add_integer(SOUT_CFG_PREFIX "idr-interval", 0, IDR_INTERVAL_TEXT, IDR_INTERVAL_LONGTEXT, true)
> +
> + add_string(SOUT_CFG_PREFIX "target-usage", "balanced", TARGET_USAGE_TEXT, TARGET_USAGE_LONGTEXT, false)
> + change_string_list(target_usage_text, target_usage_text)
> +
> + add_string(SOUT_CFG_PREFIX "rc-method", "cbr", RATE_CONTROL_TEXT, RATE_CONTROL_LONGTEXT, true)
> + change_string_list(rc_method_text, rc_method_text)
> +
> + add_integer(SOUT_CFG_PREFIX "qp", 0, QP_TEXT, QP_LONGTEXT, true)
> + change_integer_range(0, 51)
> + add_integer(SOUT_CFG_PREFIX "qpi", 0, QPI_TEXT, QPI_LONGTEXT, true)
> + change_integer_range(0, 51)
> + add_integer(SOUT_CFG_PREFIX "qpp", 0, QPP_TEXT, QPP_LONGTEXT, true)
> + change_integer_range(0, 51)
> + add_integer(SOUT_CFG_PREFIX "qpb", 0, QPB_TEXT, QPB_LONGTEXT, true)
> + change_integer_range(0, 51)
> +
> + add_integer(SOUT_CFG_PREFIX "bitrate-max", 0, MAX_BITRATE_TEXT, MAX_BITRATE_LONGTEXT, true)
> +
> + add_integer(SOUT_CFG_PREFIX "accuracy", 0, ACCURACY_TEXT, ACCURACY_LONGTEXT, true)
> + change_integer_range(0, 100)
> +
> + add_integer(SOUT_CFG_PREFIX "convergence", 0, CONVERGENCE_TEXT, CONVERGENCE_LONGTEXT, true)
> +
> + add_integer(SOUT_CFG_PREFIX "num-slice", 0, NUM_SLICE_TEXT, NUM_SLICE_LONGTEXT, true)
> + add_integer(SOUT_CFG_PREFIX "num-ref-frame", 0, NUM_REF_FRAME_TEXT, NUM_REF_FRAME_LONGTEXT, true)
> +
> + add_integer(SOUT_CFG_PREFIX "async-depth", 2, ASYNC_DEPTH_TEXT, ASYNC_DEPTH_LONGTEXT, true)
> + change_integer_range(1, 32)
> +
> +vlc_module_end ()
> +
> +/*****************************************************************************
> + * Local prototypes
> + *****************************************************************************/
> +static const char *const sout_options[] = {
> + "software", "h264-profile", "h264-level", "mpeg2-profile", "mpeg2-level",
> + "gop-size", "gop-refdist", "target-usage", "rc-method", "qp", "qpi", "qpp",
> + "qpb", "bitrate-max", "accuracy", "convergence", "num-slice",
> + "num-ref-frame", "async-depth",
> + NULL
> +};
> +
> +// Frame pool for QuickSync video encoder with Intel Media SDK's format frames.
> +typedef struct qsv_frame_pool_t
> +{
> + mfxFrameInfo fmt; // IntelMediaSDK format info.
> + unsigned int size; // The number of frame in the pool
> + mfxFrameSurface1 *frames; // An allocated array of 'size' frames
> +} qsv_frame_pool_t;
Depending on the size of each members they could be reordered to
minimize padding.
> +typedef struct async_task_t
> +{
> + mfxSyncPoint syncp; // Async Task Sync Point.
> + mfxBitstream bs; // Intel's bitstream structure.
> + block_t *block; // VLC's block structure to be returned by Encode
> +} async_task_t;
> +
> +struct encoder_sys_t
> +{
> + mfxSession session; // Intel Media SDK Session;
> + mfxIMPL impl; // Actual implementation (hw/sw);
> + mfxVideoParam params; // Encoding parameters
> + qsv_frame_pool_t frames; // IntelMediaSDK's frame pool
> + uint64_t async_depth; // Number of parallel encoding operations.
> + uint64_t first_task; // The next sync point to be synchronized.
> + async_task_t *tasks; // The async encoding tasks
> + mtime_t last_dts; // The next sync point to be synchronized.
> +};
> +
> +static block_t *Encode(encoder_t *, picture_t *);
> +
> +
> +static inline mtime_t qsv_timestamp_to_mtime(uint64_t mfx_ts)
> +{
> + return mfx_ts / INT64_C(9) * INT64_C(100);
Are overflow and unsigned -> signed conversion handled?
> +}
> +
> +static inline uint64_t qsv_mtime_to_timestamp(mtime_t vlc_ts)
> +{
> + return vlc_ts / UINT64_C(100) * UINT64_C(9);
> +}
> +
> +/*
> + * Create a new frame pool with 'size' frames in it. Pools cannot be resized.
> + */
> +static int qsv_frame_pool_Init(qsv_frame_pool_t *pool,
> + mfxFrameAllocRequest *request,
> + uint64_t async_depth)
> +{
> + size_t size = request->NumFrameSuggested + async_depth;
> +
> + if (unlikely(!pool || !request))
> + return VLC_EGENERIC;
condition can never be true
> + pool->frames = calloc(size, sizeof(mfxFrameSurface1));
> + if (unlikely(!pool->frames))
> + return VLC_ENOMEM;
> +
> + pool->size = size;
> + memcpy(&pool->fmt, &request->Info, sizeof(request->Info));
> +
> + for (size_t i = 0; i < size; i++) {
> + memcpy(&(pool->frames + i)->Info, &request->Info, sizeof(request->Info));
&pool->frames[i] ?
> + (pool->frames + i)->Data.Pitch = QSV_ALIGN32(request->Info.Width);
> + }
> +
> + return VLC_SUCCESS;
> +}
> +
> +/*
> + * Destroys a pool frame. Only call this function after a MFXClose
> + * call since we doesn't check for Locked frames.
> + */
> +static void qsv_frame_pool_Destroy(qsv_frame_pool_t *pool)
> +{
> + picture_t *pic;
> +
> + if (unlikely(!pool || !pool->size))
> + return;
!pool can never be true
> + for (size_t i = 0; i < pool->size; i++) {
> + pic = (picture_t *) (pool->frames + i)->Data.MemId;
> + if (pic)
> + picture_Release(pic);
> + }
> +
> + free(pool->frames);
> +}
> +
> +/*
> + * Finds an unlocked frame, releases the associated picture if
> + * necessary associates the new picture with it and return the frame.
> + * Returns 0 if there's an error.
> + */
> +static mfxFrameSurface1 *qsv_frame_pool_Get(qsv_frame_pool_t *pool,
> + picture_t *pic)
> +{
> + mfxFrameSurface1 *frame;
> + picture_t *old_pic;
> +
> + if (unlikely(!pool || !pic))
> + return NULL;
can never be true
> +
> + for (size_t i = 0; i < pool->size; i++) {
> + frame = pool->frames + i;
> + if (!frame->Data.Locked) {
if (frame->Data.Locked)
continue;
old_pic = .....
> + old_pic = (picture_t *)frame->Data.MemId;
> + if (old_pic)
> + picture_Release(old_pic);
> +
> + frame->Data.MemId = pic;
> + frame->Data.Y = pic->p[0].p_pixels;
> + frame->Data.U = pic->p[1].p_pixels;
> + frame->Data.V = pic->p[1].p_pixels + 1;
> + frame->Data.TimeStamp = qsv_mtime_to_timestamp(pic->date);
> +
> + // Specify picture structure at runtime.
> + if (pic->b_progressive)
> + frame->Info.PicStruct = MFX_PICSTRUCT_PROGRESSIVE;
> + else if (pic->b_top_field_first)
> + frame->Info.PicStruct = MFX_PICSTRUCT_FIELD_TFF;
> + else
> + frame->Info.PicStruct = MFX_PICSTRUCT_FIELD_BFF;
> +
> + picture_Hold(pic);
> +
> + return frame;
> + }
> + }
> +
> + return NULL;
> +}
> +
> +static uint64_t qsv_params_get_value(const char *const *text,
> + const int const *list,
> + size_t size, char *sel)
> +{
> + for (size_t i = 0; i < size; i++)
> + if (!strcmp(sel, text[i]))
> + return list[i];
> +
> + // The default value is always the first item in the array. So if not found, use it.
> + return 0;
> +}
> +
> +static int Open(vlc_object_t *this)
> +{
> + encoder_t *enc = (encoder_t *)this;
> + encoder_sys_t *sys;
> + bool allow_software;
> +
> + mfxStatus sts = MFX_ERR_NONE;
> + mfxFrameAllocRequest alloc_request;
> + mfxExtCodingOptionSPSPPS headers;
> + mfxExtBuffer *extended_params[1] = {(mfxExtBuffer *)&headers};
> +
> + uint8_t *p_extra;
> + size_t i_extra;
> + uint8_t nals[128];
> +
> + if (enc->fmt_out.i_codec != VLC_CODEC_H264 &&
> + enc->fmt_out.i_codec != VLC_CODEC_MPGV && !enc->b_force)
Why b_force ?
> + return VLC_EGENERIC;
> +
> + if (!enc->fmt_in.video.i_height || !enc->fmt_in.video.i_width ||
> + !enc->fmt_in.video.i_frame_rate || !enc->fmt_in.video.i_frame_rate_base) {
> + msg_Err(enc, "Framerate and picture dimensions must be non-zero");
> + return VLC_EGENERIC;
> + }
> +
> + /* Allocate the memory needed to store the decoder's structure */
> + sys = calloc(1, sizeof(encoder_sys_t));
> +
> + if (unlikely(!sys))
> + return VLC_ENOMEM;
> +
> + /* Initialize dispatcher, it will loads the actual SW/HW Implementation */
> + sts = MFXInit(MFX_IMPL_AUTO, 0, &sys->session);
> +
> + if (sts != MFX_ERR_NONE) {
> + msg_Dbg(enc, "Unable to find an Intel Media SDK implementation.");
> + free(sys);
> + return VLC_EGENERIC;
> + }
> +
> + config_ChainParse(enc, SOUT_CFG_PREFIX, sout_options, enc->p_cfg);
> +
> + /* Checking if we are on software and are allowing it */
> + MFXQueryIMPL(sys->session, &sys->impl);
> + allow_software = var_InheritBool(enc, SOUT_CFG_PREFIX "software");
do you need the allow_software variable ?
> + if (!allow_software && (sys->impl & MFX_IMPL_SOFTWARE)) {
> + msg_Warn(enc, "No hardware implementation found and software mode disabled");
I think that should be an error, no ?
> + goto error;
enc->p_sys is not assigned yet here
> + }
> +
> + if (sys->impl & MFX_IMPL_HARDWARE)
> + msg_Info(enc, "Using Intel QuickSync Video hardware implementation");
> + else
> + msg_Info(enc, "Using Intel QuickSync Video software implementation");
Why msg_Info ?
> +
> + /* Vlc module configuration */
> + enc->p_sys = sys;
> + enc->fmt_in.i_codec = VLC_CODEC_NV12; // Intel Media SDK requirement
> + enc->fmt_in.video.i_bits_per_pixel = 12;
> + enc->fmt_out.i_cat = VIDEO_ES;
> + enc->fmt_out.p_extra = 0;
NULL, but I guess es_format_Init should be used instead.
> +
> + /* Input picture format description */
> + sys->params.mfx.FrameInfo.FrameRateExtN = enc->fmt_in.video.i_frame_rate;
> + sys->params.mfx.FrameInfo.FrameRateExtD = enc->fmt_in.video.i_frame_rate_base;
> + sys->params.mfx.FrameInfo.FourCC = MFX_FOURCC_NV12;
> + sys->params.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
> + sys->params.mfx.FrameInfo.Width = QSV_ALIGN16(enc->fmt_in.video.i_width);
> + sys->params.mfx.FrameInfo.Height = QSV_ALIGN16(enc->fmt_in.video.i_height);
> + sys->params.mfx.FrameInfo.CropW = enc->fmt_in.video.i_width;
> + sys->params.mfx.FrameInfo.CropH = enc->fmt_in.video.i_height;
> + sys->params.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_UNKNOWN;
> +
> + /* Parsing options common to all RC methods and codecs */
> + sys->params.IOPattern = MFX_IOPATTERN_IN_SYSTEM_MEMORY;
> + sys->params.AsyncDepth = var_InheritInteger(enc, SOUT_CFG_PREFIX "async-depth");
> + sys->params.mfx.GopPicSize = var_InheritInteger(enc, SOUT_CFG_PREFIX "gop-size");
> + sys->params.mfx.GopRefDist = var_InheritInteger(enc, SOUT_CFG_PREFIX "gop-refdist");
> + sys->params.mfx.IdrInterval = var_InheritInteger(enc, SOUT_CFG_PREFIX "idr-interval");
> + sys->params.mfx.NumSlice = var_InheritInteger(enc, SOUT_CFG_PREFIX "num-slice");
> + sys->params.mfx.NumRefFrame = var_InheritInteger(enc, SOUT_CFG_PREFIX "num-ref-frame");
> + sys->params.mfx.TargetUsage = qsv_params_get_value(target_usage_text,
> + target_usage_list, sizeof(target_usage_list) / sizeof(int),
> + var_InheritString(enc, SOUT_CFG_PREFIX "target-usage"));
> +
> + if (enc->fmt_out.i_codec == VLC_CODEC_H264) {
> + sys->params.mfx.CodecId = MFX_CODEC_AVC;
> + sys->params.mfx.CodecProfile = qsv_params_get_value(profile_h264_text,
> + profile_h264_list, sizeof(profile_h264_list) / sizeof(int),
> + var_InheritString(enc, SOUT_CFG_PREFIX "h264-profile"));
> + sys->params.mfx.CodecLevel = qsv_params_get_value(level_h264_text,
> + level_h264_list, sizeof(level_h264_list) / sizeof(int),
> + var_InheritString(enc, SOUT_CFG_PREFIX "h264-level"));
> + msg_Dbg(enc, "Encoder in H264 mode, with profile %d and level %d",
> + sys->params.mfx.CodecProfile, sys->params.mfx.CodecLevel);
> +
> + } else {
> + sys->params.mfx.CodecId = MFX_CODEC_MPEG2;
> + sys->params.mfx.CodecProfile = qsv_params_get_value(profile_mpeg2_text,
> + profile_mpeg2_list, sizeof(profile_mpeg2_list) / sizeof(int),
> + var_InheritString(enc, SOUT_CFG_PREFIX "mpeg2-profile"));
> + sys->params.mfx.CodecLevel = qsv_params_get_value(level_mpeg2_text,
> + level_mpeg2_list, sizeof(level_mpeg2_list) / sizeof(int),
> + var_InheritString(enc, SOUT_CFG_PREFIX "mpeg2-level"));
> + msg_Dbg(enc, "Encoder in MPEG2 mode, with profile %d and level %d",
> + sys->params.mfx.CodecProfile, sys->params.mfx.CodecLevel);
> + }
> +
> + sys->params.mfx.RateControlMethod = qsv_params_get_value(rc_method_text,
> + rc_method_list, sizeof(rc_method_list) / sizeof(int),
> + var_InheritString(enc, SOUT_CFG_PREFIX "rc-method"));
> + msg_Dbg(enc, "Encoder using '%s' Rate Control method",
> + var_InheritString(enc, SOUT_CFG_PREFIX "rc-method"));
> +
> + if (sys->params.mfx.RateControlMethod == MFX_RATECONTROL_CQP) {
> + sys->params.mfx.QPI = sys->params.mfx.QPB = sys->params.mfx.QPP =
> + var_InheritInteger(enc, SOUT_CFG_PREFIX "qp");
> + sys->params.mfx.QPI = var_InheritInteger(enc, SOUT_CFG_PREFIX "qpi");
> + sys->params.mfx.QPB = var_InheritInteger(enc, SOUT_CFG_PREFIX "qpb");
> + sys->params.mfx.QPP = var_InheritInteger(enc, SOUT_CFG_PREFIX "qpp");
> + } else {
> + if (!enc->fmt_out.i_bitrate) {
> + msg_Warn(enc, "You should provide a bitrate. Since you didn't, we decided to use %d",
> + QSV_BITRATE_DEFAULT);
Hm I am not suure if we use the "we" style. What do you think of:
"No bitrate specified, using default %d" ?
> + sys->params.mfx.TargetKbps = QSV_BITRATE_DEFAULT;
> + } else
> + sys->params.mfx.TargetKbps = enc->fmt_out.i_bitrate / 1000;
> +
> + if (sys->params.mfx.RateControlMethod == MFX_RATECONTROL_AVBR) {
> + sys->params.mfx.Accuracy = var_InheritInteger(enc, SOUT_CFG_PREFIX "accuracy");
> + sys->params.mfx.Convergence = var_InheritInteger(enc, SOUT_CFG_PREFIX "convergence");
> + } else if (sys->params.mfx.RateControlMethod == MFX_RATECONTROL_VBR)
> + sys->params.mfx.MaxKbps = var_InheritInteger(enc, SOUT_CFG_PREFIX "bitrate-max");
> + }
> +
> + /* Initializing MFX_Encoder */
> + sts = MFXVideoENCODE_Init(sys->session, &sys->params);
> + if (sts == MFX_ERR_NONE)
> + msg_Dbg(enc, "Successfuly initialized video encoder");
> + else if (sts < MFX_ERR_NONE) {
> + msg_Dbg(enc, "Unable to initialize video encoder error (%d). " \
> + " Most likely because of provided encoding parameters", sts);
> + goto error;
> + } else if (sts > MFX_ERR_NONE)
else
> + msg_Dbg(enc, "Video encoder initialization warning (%d).", sts);
msg_Warn ?
> +
> + /* Querying PPS/SPS Headers, BufferSizeInKB, ... */
> + memset(&headers, 0, sizeof(headers));
> + memset(&nals, 0, sizeof(nals));
> + headers.Header.BufferId = MFX_EXTBUFF_CODING_OPTION_SPSPPS;
> + headers.Header.BufferSz = sizeof(headers);
> + headers.SPSBufSize = headers.PPSBufSize = 64;
> + headers.SPSBuffer = nals;
> + headers.PPSBuffer = nals + 64;
> + sys->params.ExtParam = (mfxExtBuffer **)&extended_params;
> + sys->params.NumExtParam = 1;
> +
> + MFXVideoENCODE_GetVideoParam(sys->session, &sys->params);
> + sys->params.NumExtParam = 0;
> + sys->params.ExtParam = 0;
> +
> + i_extra = headers.SPSBufSize + headers.PPSBufSize;
> + p_extra = malloc(i_extra);
> +
> + if (unlikely(!p_extra))
> + goto nomem;
> +
> + memcpy(p_extra, headers.SPSBuffer, headers.SPSBufSize);
> + memcpy(p_extra + headers.SPSBufSize, headers.PPSBuffer, headers.PPSBufSize);
> + enc->fmt_out.p_extra = p_extra;
> + enc->fmt_out.i_extra = i_extra;
> +
> + sys->async_depth = sys->params.AsyncDepth;
> + sys->tasks = (async_task_t *)calloc(sys->async_depth, sizeof(async_task_t));
cast not needed
> + if (unlikely(!sys->tasks))
> + goto nomem;
> +
> + /* Request number of surface needed and creating frame pool */
> + if (MFXVideoENCODE_QueryIOSurf(sys->session, &sys->params, &alloc_request)!= MFX_ERR_NONE)
> + goto error;
> + if (qsv_frame_pool_Init(&sys->frames, &alloc_request, sys->async_depth) != VLC_SUCCESS)
> + goto nomem;
> + msg_Dbg(enc, "Requested %d surfaces for work", alloc_request.NumFrameSuggested);
> +
> + enc->pf_encode_video = Encode;
> +
> + return VLC_SUCCESS;
> +
> + error:
> + Close(this);
> + return VLC_EGENERIC;
> + nomem:
> + Close(this);
> + return VLC_ENOMEM;
> +}
> +
> +static void Close(vlc_object_t *this)
> +{
> + encoder_t *enc = (encoder_t *)this;
> + encoder_sys_t *sys = enc->p_sys;
> +
> + if (likely(sys)) {
Can !sys be true ?
> + MFXVideoENCODE_Close(sys->session);
> + MFXClose(sys->session);
> + if (enc->fmt_out.p_extra) {
> + free(enc->fmt_out.p_extra);
> + enc->fmt_out.p_extra = 0;
> + enc->fmt_out.i_extra = 0;
> + }
> + if (sys->frames.size)
> + qsv_frame_pool_Destroy(&sys->frames);
> + if (sys->tasks)
> + free(sys->tasks);
> + free(sys);
> + enc->p_sys = 0;
not needed
> + }
> +}
> +
> +/*
> + * The Encode function has 3 encoding phases :
> + * - Feed : We feed the encoder until it stops to return MFX_MORE_DATA_NEEDED
> + * and the async_tasks are all in use (honouring the AsyncDepth)
> + * - Main encoding phase : synchronizing the oldest task each call.
> + * - Empty : pic = 0, we empty the decoder. Synchronizing the remaining tasks.
> + */
> +static block_t *Encode(encoder_t *this, picture_t *pic)
> +{
> + encoder_t *enc = (encoder_t *)this;
> + encoder_sys_t *sys = enc->p_sys;
> + async_task_t *task = 0;
> + block_t *block = 0;
> +
> + mfxFrameSurface1 *frame = 0;
NULL
> + mfxStatus sts;
> +
> + if (unlikely(!this || !enc))
> + return NULL;
> +
> + if (pic) {
> + if (!(frame = qsv_frame_pool_Get(&sys->frames, pic))) {
I think I prefer frame = foo; if (!frame) ..
> + msg_Warn(enc, "Unable to find an unlocked surface in the pool");
> + return NULL;
> + }
> +
> + // Finds an available SyncPoint
> + for (size_t i = 0; i < sys->async_depth; i++)
> + if ((sys->tasks + (i + sys->first_task) % sys->async_depth)->syncp == 0) {
> + task = sys->tasks + (i + sys->first_task) % sys->async_depth;
> + break;
> + }
> + } else
> + // If !pic, we are emptying encoder and tasks, so we force the SyncOperation
> + msg_Dbg(enc, "Emptying encoder");
> +
> + // There is no available task, we need to synchronize
> + if (!task) {
> + task = sys->tasks + sys->first_task;
> +
> + // Synchronize and fill block_t. If the SyncOperation fails we leak :-/ (or we can segfault, ur choice)
> + if (MFXVideoCORE_SyncOperation(sys->session, task->syncp, QSV_SYNCPOINT_WAIT) == MFX_ERR_NONE) {
> + block = task->block;
> + block->i_buffer = task->bs.DataLength;
> + block->p_buffer += task->bs.DataOffset;
> +
> + if (task->bs.TimeStamp) {
> + block->i_pts = qsv_timestamp_to_mtime(task->bs.TimeStamp);
> + if (task->bs.DecodeTimeStamp)
> + block->i_dts = qsv_timestamp_to_mtime(task->bs.DecodeTimeStamp);
> + else {
> + // HW encoder (sometimes) doesn't set the DecodeTimeStamp field
> + // so we give decoder some (100ms) headroom.
> + block->i_dts = qsv_timestamp_to_mtime(task->bs.TimeStamp - 100 * 1000);
Aren't the timestamps in 90kHz ?
> + msg_Dbg(enc, "Encode returning empty DTS");
> + }
> + }
> +
> + // Checking dts is increasing monotonically
> + if (block->i_dts <= sys->last_dts)
> + block->i_dts = sys->last_dts + 1000;
You should use CLOCK_FREQ and I guess actually warn/error out if an
incorrect dts is incoming.
> + sys->last_dts = block->i_dts;
> +
> + block->i_flags = 0;
> + if (task->bs.FrameType & MFX_FRAMETYPE_IDR || (task->bs.FrameType & MFX_FRAMETYPE_REF))
> + block->i_flags |= BLOCK_FLAG_TYPE_I;
> + else if ((task->bs.FrameType & MFX_FRAMETYPE_P) || (task->bs.FrameType & MFX_FRAMETYPE_I))
> + block->i_flags |= BLOCK_FLAG_TYPE_P;
> + else if (task->bs.FrameType & MFX_FRAMETYPE_B)
> + block->i_flags |= BLOCK_FLAG_TYPE_B;
> + else
> + block->i_flags |= BLOCK_FLAG_TYPE_PB;
i = 0; i |= x; -> i = x;
> +
> + // Copied from x264.c: This isn't really valid for streams with B-frames
> + block->i_length = INT64_C(1000000) *
CLOCK_FREQ
> + enc->fmt_in.video.i_frame_rate_base /
> + enc->fmt_in.video.i_frame_rate;
> + }
> + // Reset the task now it has been synchronized and advances first_task pointer
> + task->syncp = 0;
> + sys->first_task = (sys->first_task + 1) % sys->async_depth;
> + }
> +
> + // Allocate block_t and prepare mfxBitstream for encoder
> + if (!(task->block = block_Alloc(sys->params.mfx.BufferSizeInKB * 1000))) {
Not 1024 ?
> + msg_Warn(enc, "Unable to allocate block for encoder output");
msg_Err ?
> + return NULL;
> + }
> + memset(&task->bs, 0, sizeof(task->bs));
> + task->bs.MaxLength = sys->params.mfx.BufferSizeInKB * 1000;
> + task->bs.Data = task->block->p_buffer;
> +
> + sts = MFXVideoENCODE_EncodeFrameAsync(sys->session, 0, frame, &task->bs, &task->syncp);
> + while (sts == MFX_WRN_DEVICE_BUSY) {
> + msg_Info(enc, "Device is busy, let's wait and retry");
> + msleep(QSV_SPINLOCK_TIME);
Hum this is not a spinlock ?
Can't you hold data until pf_encode is called again?
> + sts = MFXVideoENCODE_EncodeFrameAsync(sys->session, 0, frame, &task->bs, &task->syncp);
> + }
> +
> + //msg_Dbg(enc, "Encode async status: %d, Syncpoint = %tx", sts, (ptrdiff_t)task->syncp);
> +
> + if (sts == MFX_ERR_MORE_DATA)
> + if (pic)
> + msg_Dbg(enc, "Encoder feeding phase, more data is needed.");
> + else {
> + msg_Dbg(enc, "Encoder is empty");
> + return NULL;
> + }
> + else if (sts < MFX_ERR_NONE) {
> + msg_Warn(enc, "Encoder not ready or error (%d), trying a reset...", sts);
msg_Err ?
> + MFXVideoENCODE_Reset(sys->session, &sys->params);
> + }
> +
> + return block;
> +}
> +
> --
> 1.8.1.2
>
>
> 0002-Adds-a-I420-NV12-chroma_filter-c-implementation.patch
>
>
> From a7d5bd47e058438478c14e99ef395c4a9fc7e45c Mon Sep 17 00:00:00 2001
> From: Julien 'Lta' BALLET <contact at lta.io>
> Date: Wed, 8 May 2013 21:30:03 +0200
> Subject: [PATCH 2/2] Adds a I420 -> NV12 chroma_filter (c implementation)
>
> ---
> modules/video_chroma/Modules.am | 5 +++
> modules/video_chroma/i420_nv12.c | 95 ++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 100 insertions(+)
> create mode 100644 modules/video_chroma/i420_nv12.c
> +static void I420_NV12 (filter_t *filter, picture_t *src, picture_t *dst)
> +{
> + VLC_UNUSED(filter);
> + uint8_t u, v;
The variables should be declared in the scope where they are used (and
merged with assignement if you like).
> +
> + // Copy Y plane unchanged
> + memcpy(dst->p[0].p_pixels, src->p[0].p_pixels, src->p[0].i_lines * src->p[0].i_pitch);
> +
> + // Interleave UV planes
> + for(int i = 0; i < src->p[1].i_lines; i++) {
> + for(int j = 0; j < src->p[1].i_pitch; j++) {
> + u = src->p[1].p_pixels[i * src->p[1].i_pitch + j];
> + v = src->p[2].p_pixels[i * src->p[1].i_pitch + j];
> + dst->p[1].p_pixels[i * dst->p[1].i_pitch + 2 * j] = u;
> + dst->p[1].p_pixels[i * dst->p[1].i_pitch + 2 * j + 1] = v;
> + }
> + }
> +}
More information about the vlc-devel
mailing list