From patchwork Mon Jun 12 22:40:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 3942 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp77943vsw; Mon, 12 Jun 2017 15:42:27 -0700 (PDT) X-Received: by 10.223.130.151 with SMTP id 23mr758404wrc.16.1497307347184; Mon, 12 Jun 2017 15:42:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497307347; cv=none; d=google.com; s=arc-20160816; b=cR5cdzsvEk9HfotU0XuZ5vrBn0hzXk6Ywc3aFIS37p1XS8oLcryR/cDIi02R4AM0Ef bj+g2PgK1DThmr//UOYYCa3bNzkxVZAyohUVQFKfD+9BV4ABYXL9swf7uBjYXwnY3fjh Ij18sSrIP3AM2XNLCODwNMdVvcFRCF2kZIxbCJzr8gxp58f2im8JnY/4yTpus7cj9ucp YqnYfORVLm4EG9NdI5N0UOsX99AD3ZjJHCgO5sDduBakjqKJ4ihquJ4TqwN9o3K9xSE2 cf4om4iEkKplHMVTxohfLPIl8/IlgZE9vFxxYeon7ALXTHL9qK8CvM/AsomxPUAp5H6Z 2urQ== 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=lEtgs8moomRaKTo1zqK6wdP10/zqnvCRlh5/tI0KyMA=; b=eR3HIT2vZa3pybRUiz+MPlXSKDnpgOaK38nw/1FCjjhuKzPglwdz7PaT6PJqIo68SC eAkHUSFL+hzoNpg4mUFwf7kR8dkeAz/80Qv1qN07Q+BVt5JFIBRvWU1BOe5xTJ36nkQz lcOg17qmy3Z9UP8m9UXeyxnvSy7qy4agLv4FLZLb+nZyDvJMJvdZldCjROR0So9oDBbN bjsSGldjy1PoH7RtVXqa5Ag4fZNpVDHoJzYh6JLOYPSHNZQnFmiDQaXJaRktv+uIGgqZ 1pf6iEC+46iRtggteaj6O/QQz/qVoJehHSqsYMZAjmhw/VmQuSQPJ2vTfCDmBk0AwiAm uQQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com; 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 5si13014915wru.100.2017.06.12.15.42.26; Mon, 12 Jun 2017 15:42:27 -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; 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 36ACA68A060; Tue, 13 Jun 2017 01:41:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13A44680A18 for ; Tue, 13 Jun 2017 01:41:07 +0300 (EEST) Received: by mail-wr0-f180.google.com with SMTP id v111so116325866wrc.3 for ; Mon, 12 Jun 2017 15:41:10 -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=Ds7SdNhOJGEGeQUx7G/mcXgBQawYQx1io+FhWfVIS4c=; b=hCUTiCg9OORRNu9CUhtq1VJGBi9LRP9WHuAZxjt+JEIGxp4HBRDT6DrmB5nHi0pRZI myIBtvMsKv35v9A9OQYnR97yMXMEPtSPvu3iGmy9zGwX1OF2Lomlyntrr7YxoOU/+vd0 q4H2r60vCTq9OtM5AXrBeSAWE+07662VxcLKndn6cIfmXaqHueb9yzlwXcaXgJX2dwlD wnk5tCquCz+7vkrQ+RRk/JrY5Ups8DJzYPlrWwu8jM+zbXptI0iF9tTGb7pzW3OqGOqT yBA8GpFVMNockGhsKxrhgsZOwbg94yKAfzkGkpriINt72eb9Y54b+kukGVPIM2p9UEk7 mKJg== 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=Ds7SdNhOJGEGeQUx7G/mcXgBQawYQx1io+FhWfVIS4c=; b=HF53DcRSih936Sds8yu22wee5MrrU88tJmJyfnxTTm06JK9tb/OE6u1qryyueeP/VM M+ajBVFL45gF6uyp7uhgtS7m++KawucMQWpSbmVxdcYKI9knCe7z7FgN+8pd4lnYWhi9 rUpsTXgbB4b3CirAdGJ9uj1rvVMhPDP/sdkM0VHnCF9ZTkmMiC5G+Sx7W6tGyQv54Su0 ssR07ZIce332X0fCJVYBozNII/SB9e0jJcbNof9xCEXhi4UZqBd6c+iF1VlDlWwXWewu ot2vuUjtxlWhaKT+x6qrDpd6MOk1qWBRdxsiks22YiF2hAbv1w7Smg1MvysgcXkpFwYQ wJaA== X-Gm-Message-State: AKS2vOy94L8S5PiCzknRTCUPTEI5qh9o0aSbbKbhiyPo+mlJsQOWfIw0 wPJhXWzXlne5zp525tw= X-Received: by 10.223.136.131 with SMTP id f3mr717700wrf.151.1497307269440; Mon, 12 Jun 2017 15:41:09 -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.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 15:41:08 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Jun 2017 23:40:29 +0100 Message-Id: <20170612224041.6750-13-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 12/24] qsvenc: Allow use of hw_device_ctx to make the internal session 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 3d197514e613ccd9eab43180c0a7c8b09a307606) --- libavcodec/qsvenc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 64227cea6e..5eb506fb76 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -700,6 +700,13 @@ static int qsvenc_init_session(AVCodecContext *avctx, QSVEncContext *q) } q->session = q->internal_session; + } else if (avctx->hw_device_ctx) { + ret = ff_qsv_init_session_device(avctx, &q->internal_session, + avctx->hw_device_ctx, q->load_plugins); + if (ret < 0) + return ret; + + q->session = q->internal_session; } else { ret = ff_qsv_init_internal_session(avctx, &q->internal_session, q->load_plugins);