From patchwork Mon Jun 12 22:40:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 3948 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp78189vsw; Mon, 12 Jun 2017 15:43:24 -0700 (PDT) X-Received: by 10.28.236.71 with SMTP id k68mr9189753wmh.107.1497307403933; Mon, 12 Jun 2017 15:43:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497307403; cv=none; d=google.com; s=arc-20160816; b=HxMyYwfGYIPRRkPbf8HFrOBZiHnhNsRsaqU/yjXLg1eftd0VexxhgVG/PIMskh7dbn vPwOk986ayZDpRnoPd6MllchC7r2UimLRXkhN7IYMefzp/rZPb2Ihe0W5PNdmmpfBMYn kPicOWi2Xw8J2w5lsiYjBq0ypRq/vDJ3P8arXsmbYg9XAECqBmNmyghkzPBGR6lWo1bc CFo0XWcSvlyF0yw/YDeyZVHZaDsw6uevIQNHOJVUB7EC5rgmXOM3AV0rMEeOhr1BuMWD XDaV/89f4L9GTu6Ebfo2XF2jFRG48ZGpfcHpsv6nBQE1116rtJqtRpK5kooNTWRT25l1 x5Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=jiXh6jqyP+3aS/CyD7QomXCn9srwABZKbUMSczx1fgU=; b=tVB3j2c+sxWh9JZ4w8Ak442f0UF0oId6iSQ9tjQigDZ0JkWRF0JRsyPTeS424CU7Oh jWL0UNjGQoaJ46DHmBJ4Ayrfg0YN3ZndsIqTm5CZsYqR7bJsC6BPTr66NO/8YVIToPZ3 axalVFD4NExWSj5rwI0fPobNsh39L2DxcRQLmL3R21XCi23kKaxSnXVgqLTpRoptb1jc l2lhoe9gK/XlWPKhZwdYpY7XAAfJlWudpMZtbM5+STscMfNrX4i59a9dIdD0vZEGRwJn mGHrSv0UfWMfg2qnyLrab0/N6M+qbRxnBnTqvtevlk/L5qs96gLUsZUcjHzJw5XgowWM 1ADg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.b=sKTUPE9c; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p79si8920508wmg.77.2017.06.12.15.43.23; Mon, 12 Jun 2017 15:43:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.b=sKTUPE9c; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D6AEC68A095; Tue, 13 Jun 2017 01:41:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f182.google.com (mail-wr0-f182.google.com [209.85.128.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 504EE68A062 for ; Tue, 13 Jun 2017 01:41:06 +0300 (EEST) Received: by mail-wr0-f182.google.com with SMTP id g76so113428052wrd.1 for ; Mon, 12 Jun 2017 15:41:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=5twAc/2ObHcZaYCzcie4Xu+8KXtdrMJxxd49/z2IoTs=; b=sKTUPE9cFuWitfiozMTRqWaV61/AiiSMIYYgW7UcVt0yJafkeTXz9B3ZzuLpzEvkS0 BJt8n4cimC5BiLfkHFy74YMBd59h55DO2niOPBg8J/kkgP6zKfHarEKIm2E3HM9P5Ayo kSgtBLvMdG6olhXu6upRc/IKZnenAt0wjTND3lpKzdEn7CKiiDExASvg0Z38eOnw35mK 6bnWbw1ma52r2NgxJPwCTiwdNea8geFiZdTkkK5fZCNdej8+uIc4UkvBJfzlgLzgmBIB IgTGVCfOEe0QVvo8IBHI3l+itrv/dGWY5vsPuU3YZ2rnTU0+s/XwKjHqaaJ0ooYvSFzK o11A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=5twAc/2ObHcZaYCzcie4Xu+8KXtdrMJxxd49/z2IoTs=; b=M6JNasPpyxnSQhKBshmnf/t8tOBeIoMxGmwNrlE7Q+81Kbtsgg2SfHo714i9aa36Gn HoGb/NwYE9O9wrbgQ2Q7hhHeVgCrANt/jKcu8LEu60SzPfW8WtuPOzpyjsnNLH12XU7J JhaSKyuu0hX6C4J1Iq3FD7PZ23VdLYDv710BIbGCMR88j/vYczSiW5/27LhLf+GO+2N7 pLhNI5mS3l78GphQ/yIqT3i3OOS79t8jqObBkJbDPV1dPLunK98CnsEeOeI6G8PUgMS8 U55hoxMseVuwWBvjpNCMz2yklnaTxNX40g+fAt9TQm9TWkgY9aR1DS1C8BTN9WPQ715/ R1Ag== X-Gm-Message-State: AKS2vOw9zYTyNDTSYfK2Tb2KHBn7bSqp7HJbcvjPJ4iPJcYx7u8HuoUS 09O5NjPArRqZGNMr1pg= X-Received: by 10.223.179.86 with SMTP id k22mr706119wrd.5.1497307267761; Mon, 12 Jun 2017 15:41:07 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id m191sm13098233wmg.30.2017.06.12.15.41.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 15:41:07 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Jun 2017 23:40:27 +0100 Message-Id: <20170612224041.6750-11-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170612224041.6750-1-sw@jkqxz.net> References: <20170612224041.6750-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 10/24] qsv: Add ability to create a session from a device X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" (cherry picked from commit 4936a48b1e6fc2147599541f8b25f43a8a9d1f16) --- libavcodec/qsv.c | 49 ++++++++++++++++++++++++++++++++--------------- libavcodec/qsv_internal.h | 9 ++++++--- libavcodec/qsvdec.c | 6 +++--- libavcodec/qsvenc.c | 6 +++--- 4 files changed, 46 insertions(+), 24 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 1284419741..b9e2cd990d 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -535,27 +535,16 @@ static mfxStatus qsv_frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl) return MFX_ERR_NONE; } -int ff_qsv_init_session_hwcontext(AVCodecContext *avctx, mfxSession *psession, - QSVFramesContext *qsv_frames_ctx, - const char *load_plugins, int opaque) +int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession, + AVBufferRef *device_ref, const char *load_plugins) { static const mfxHandleType handle_types[] = { MFX_HANDLE_VA_DISPLAY, MFX_HANDLE_D3D9_DEVICE_MANAGER, MFX_HANDLE_D3D11_DEVICE, }; - mfxFrameAllocator frame_allocator = { - .pthis = qsv_frames_ctx, - .Alloc = qsv_frame_alloc, - .Lock = qsv_frame_lock, - .Unlock = qsv_frame_unlock, - .GetHDL = qsv_frame_get_hdl, - .Free = qsv_frame_free, - }; - - AVHWFramesContext *frames_ctx = (AVHWFramesContext*)qsv_frames_ctx->hw_frames_ctx->data; - AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx; - AVQSVDeviceContext *device_hwctx = frames_ctx->device_ctx->hwctx; + AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)device_ref->data; + AVQSVDeviceContext *device_hwctx = device_ctx->hwctx; mfxSession parent_session = device_hwctx->session; mfxSession session; @@ -605,6 +594,36 @@ int ff_qsv_init_session_hwcontext(AVCodecContext *avctx, mfxSession *psession, return ret; } + *psession = session; + return 0; +} + +int ff_qsv_init_session_frames(AVCodecContext *avctx, mfxSession *psession, + QSVFramesContext *qsv_frames_ctx, + const char *load_plugins, int opaque) +{ + mfxFrameAllocator frame_allocator = { + .pthis = qsv_frames_ctx, + .Alloc = qsv_frame_alloc, + .Lock = qsv_frame_lock, + .Unlock = qsv_frame_unlock, + .GetHDL = qsv_frame_get_hdl, + .Free = qsv_frame_free, + }; + + AVHWFramesContext *frames_ctx = (AVHWFramesContext*)qsv_frames_ctx->hw_frames_ctx->data; + AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx; + + mfxSession session; + mfxStatus err; + + int ret; + + ret = ff_qsv_init_session_device(avctx, &session, + frames_ctx->device_ref, load_plugins); + if (ret < 0) + return ret; + if (!opaque) { qsv_frames_ctx->logctx = avctx; diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 814db08e6c..c0305508dd 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -90,9 +90,12 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc); int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session, const char *load_plugins); -int ff_qsv_init_session_hwcontext(AVCodecContext *avctx, mfxSession *session, - QSVFramesContext *qsv_frames_ctx, - const char *load_plugins, int opaque); +int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession, + AVBufferRef *device_ref, const char *load_plugins); + +int ff_qsv_init_session_frames(AVCodecContext *avctx, mfxSession *session, + QSVFramesContext *qsv_frames_ctx, + const char *load_plugins, int opaque); int ff_qsv_find_surface_idx(QSVFramesContext *ctx, QSVFrame *frame); diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index d7664ce581..74866b57ff 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -59,9 +59,9 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses if (!q->frames_ctx.hw_frames_ctx) return AVERROR(ENOMEM); - ret = ff_qsv_init_session_hwcontext(avctx, &q->internal_session, - &q->frames_ctx, q->load_plugins, - q->iopattern == MFX_IOPATTERN_OUT_OPAQUE_MEMORY); + ret = ff_qsv_init_session_frames(avctx, &q->internal_session, + &q->frames_ctx, q->load_plugins, + q->iopattern == MFX_IOPATTERN_OUT_OPAQUE_MEMORY); if (ret < 0) { av_buffer_unref(&q->frames_ctx.hw_frames_ctx); return ret; diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 57bc83a47f..64227cea6e 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -691,9 +691,9 @@ static int qsvenc_init_session(AVCodecContext *avctx, QSVEncContext *q) if (!q->frames_ctx.hw_frames_ctx) return AVERROR(ENOMEM); - ret = ff_qsv_init_session_hwcontext(avctx, &q->internal_session, - &q->frames_ctx, q->load_plugins, - q->param.IOPattern == MFX_IOPATTERN_IN_OPAQUE_MEMORY); + ret = ff_qsv_init_session_frames(avctx, &q->internal_session, + &q->frames_ctx, q->load_plugins, + q->param.IOPattern == MFX_IOPATTERN_IN_OPAQUE_MEMORY); if (ret < 0) { av_buffer_unref(&q->frames_ctx.hw_frames_ctx); return ret;