From patchwork Tue Jan 17 22:31:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 2239 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp739151vsb; Tue, 17 Jan 2017 14:31:20 -0800 (PST) X-Received: by 10.28.16.211 with SMTP id 202mr19788380wmq.133.1484692280640; Tue, 17 Jan 2017 14:31:20 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 60si18523622wri.305.2017.01.17.14.31.20; Tue, 17 Jan 2017 14:31:20 -0800 (PST) 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 50D9868A2B5; Wed, 18 Jan 2017 00:31:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63CE1689995 for ; Wed, 18 Jan 2017 00:31:02 +0200 (EET) Received: by mail-wm0-f45.google.com with SMTP id c85so220585697wmi.1 for ; Tue, 17 Jan 2017 14:31:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=16fudJGqHB5IJlCj+prIMDMP+o13pgVG60I/5zS60sA=; b=W3Q7E6hyBPkGtnmuzD9qkEMMm4xLqMCXt5CuEibugxO3LpEoKmq/jZca1BU0usipuv xMykhwrLcEM3HlUyknYFppiUS8al2W+s17QfSVezfWfsVjmmg+QQ7txUOSOHizkGNHfn gUD4W4A8uu5Yrf0MnFA2Zi0BMQF5+lwyjw+s7Z6FqA2FelVNLSdpZFSDPQveO3bmd2D9 C88QtNGeGtpiFYg7jtO4cuzRX2LgOFyoUGwLtGfqRI1m2Z6m8S/dYbUbgbmwSPAVA8zf haNUGtGG4nz2+x/RCbgOOL2lEvMvwh/FLLlEZ0Pn0rSxJuu6BBf0dpEHqRuTTPxlPKTz KmQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=16fudJGqHB5IJlCj+prIMDMP+o13pgVG60I/5zS60sA=; b=MEomC3JW3P58QdzVgI/oODye/x3yCd2Zk4OHyKIvVehPHuWyn1k0+lpAGddVcZJZLn 6lg/kKoJZ5Kb8/4iloX4Q6csQPsL0GD+Brb6rHvQLGT/SNWcJVZsvuLdh/T6ga0OquBf NpfqjoqYmhgKxX4scyMkyfDTqYYSRI7ebXf6rF8xIjCwArECWhS/JCnDjxcNpZxO4/xc S+ysqYudIbcpi4sQKrizX7ARSfePnAv2Ua3pP5cAcCg9lmSo13s6C0Q97ljASaImWws+ 65UqVzmCqRQE50jIEKTAy2DC/ezbKEdnMlgKCvT7b6019VoqEYpdmyiRKhTk3NPfFoLy VPeQ== X-Gm-Message-State: AIkVDXLDXDgj3mWyzVQlfhDa6rGZKfT2562rS8vmSSWkkcpz8GBMLAPnvEW2mkPbHAFS7w== X-Received: by 10.28.222.11 with SMTP id v11mr17339767wmg.1.1484692271987; Tue, 17 Jan 2017 14:31:11 -0800 (PST) Received: from [192.168.0.8] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 135sm40151117wmh.14.2017.01.17.14.31.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jan 2017 14:31:11 -0800 (PST) To: FFmpeg development discussions and patches References: <6b40ed0b-4faf-1591-1a47-e8ad6bd12952@jkqxz.net> From: Mark Thompson Message-ID: <765ae39b-d219-6f7a-68e5-43bd1de3e9e9@jkqxz.net> Date: Tue, 17 Jan 2017 22:31:10 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <6b40ed0b-4faf-1591-1a47-e8ad6bd12952@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 4/6] qsvenc: Allow creation of the internal session from a device context 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/qsvenc.c | 15 +++++++++++++++ libavcodec/qsvenc.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index ac443c1..7a46979 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -672,6 +672,19 @@ static int qsvenc_init_session(AVCodecContext *avctx, QSVEncContext *q) } q->session = q->internal_session; + } else if (avctx->hw_device_ctx) { + q->hw_device_ctx = av_buffer_ref(avctx->hw_device_ctx); + if (!q->hw_device_ctx) + return AVERROR(ENOMEM); + + ret = ff_qsv_init_session_device(avctx, &q->internal_session, + q->hw_device_ctx, q->load_plugins); + if (ret < 0) { + av_buffer_unref(&q->hw_device_ctx); + return ret; + } + + q->session = q->internal_session; } else { ret = ff_qsv_init_internal_session(avctx, &q->internal_session, q->load_plugins); @@ -1121,5 +1134,7 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) av_freep(&q->extparam); + av_buffer_unref(&q->hw_device_ctx); + return 0; } diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 361d933..a2187ad 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -104,6 +104,8 @@ typedef struct QSVEncContext { AVFifoBuffer *async_fifo; + AVBufferRef *hw_device_ctx; + QSVFramesContext frames_ctx; // options set by the caller