From patchwork Sun Oct 8 15:11:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5455 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1687668jah; Sun, 8 Oct 2017 08:17:43 -0700 (PDT) X-Received: by 10.28.145.197 with SMTP id t188mr5815936wmd.136.1507475863491; Sun, 08 Oct 2017 08:17:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507475863; cv=none; d=google.com; s=arc-20160816; b=aJrQRLFg3pCORCHDXq91qCoPNh0FjrqHya5X9hScBVGQB7khExByIob0mVlkOuQ+E/ Ar06dRR++oiWQNvJ7MWpU1yjVPz51KccxOxrHqL7XOzt2MdVondF2mQ8u5kIFlik16cM t+qLnxIFebzGPEc8HM1XFqWYqqwc96L2xuyepVTs3HXH1ZJatQMzutCNcQkctWqvsPxy 8CCfpjujolazfWe22t3jKprfkswD1DVtUNR2PhSQAMhHLJ/8f0iTjk+7mcLofLGAGlj/ ayeqQgkhLWmCPLaVLLmbyPSCOCMRb0/BoxyE9T5zpAKJysoPiVTKHHPk8zoifxU43H3a mySQ== 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=6swDgQtYgoN3k+FqHltmq/56r8fh4iccmIHRLMmzd2w=; b=GBYpQXo/MWDP7nX8gi8mzvvHoDjV9+Nj35r7fA9KP1QQsNKkd12i1agiHgu9s1tIkH sBULL94MKjGL0hU7IJlMzXoFM1QN6utIz5bANAqBmw5Hka9GsrUYrJrJOAuCLhiCGTzV Mt3nvuULjRgJOyuLt5BM1K3vK5Ue5eWzHCmObdmAIKKxxl8V0h5hEZWlDo2yaJK+7x18 CIzug+PGTo06MIf4Yh6pntOV6oKnOuDpjsdHjbYnrTMcrX6HfcQRDViBtdjCQEFrF/Q6 CHCKVaE5PNyk537vXYQurG3rS6uaebwyUQ4u7gl1t4m5h0K7wjs+2GVMDRWdTBxfYaeH QMCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=o0JKwMJr; 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 o193si4780722wmg.194.2017.10.08.08.17.42; Sun, 08 Oct 2017 08:17:43 -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.s=20150623 header.b=o0JKwMJr; 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 3C6A5689DA1; Sun, 8 Oct 2017 18:17:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66A98689D7E for ; Sun, 8 Oct 2017 18:17:31 +0300 (EEST) Received: by mail-wm0-f54.google.com with SMTP id b189so16673491wmd.4 for ; Sun, 08 Oct 2017 08:17:33 -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=79FOJxqJhBPYY/wof+ZRlmEkS+3HA4NUnWtgZjWx9f0=; b=o0JKwMJrpzd8+qLNB3gzcAujV+zkVNr9VWOPb77MmdJ1CWOzzVhiK8zGa0FnJ/XV9Y mJfowQPSjKGnsQdcuY5/aj9SYSjmmIPwAHW2p3DQuXaPoakvsRMbcwbbEubBQR8YmVqd jCy5QdcoM1zpuTmXI4p/G7Pl63gE7z6Z3vwz2ZnBgdY5pUYeYJLmUYpwCMCCHl3UjEFu Ui5HK5kMciSLL9pSBNAXfrvtRimhotJT1qrJG+3ak7Zh3A5GmIR2D+ikiDKuKF7JgGai SvN5piFvtNe4xMBiKfF+8Lw+6Hj9ixjFBfy7tHDl4dHd5PjHz6E+9TYUPTqiuNZBZG2y wtHw== 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=79FOJxqJhBPYY/wof+ZRlmEkS+3HA4NUnWtgZjWx9f0=; b=NWRPWavMn12ISrAN811cNGJ2/lZxaJGsDtrdJ/XnIczekMczCxCG3lPWAWMWPbwRHe fui9c1nrp2QzaW6wd9orS5qiiv3xre83hWP7wiGvxr5Te/fbdPEY88DeEz9v9kcr5kc+ NIHxxb/kdNuWb7k2v9FvEeWnEElfRV32O+CiJIYhwwCCtvN1dmP6ePiEOmsWwD9Y/+SQ Enz7xJF4L1NX0lyuGYNrquecncsIz/lVtd89w01lLoC3Iorx8KDhw6twuCnZNCkCx/U+ Rb23GKrXVMFjLTCNciAmrbCqoP8h8AZR5UE2JQ7sCf8vg9ZEJLGc/ASvvbE+sKv8RlM2 98WA== X-Gm-Message-State: AMCzsaW9FLq1A4wAfx3hA3C6JaeH1xhsXIKKY2BjDasix4s4DvARNbrN ZsEg39Vbgh/MvYZNbzvCM6+6Nl0s X-Google-Smtp-Source: AOwi7QBMjuulv10V1V3UgqyCwXkNXixWm7EBlzhOCvdZhIltArDLSw8k6rY0sFNpTotP+BpulN/62A== X-Received: by 10.28.14.138 with SMTP id 132mr5697112wmo.7.1507475513851; Sun, 08 Oct 2017 08:11:53 -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 b190sm6770476wma.22.2017.10.08.08.11.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Oct 2017 08:11:53 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Oct 2017 16:11:45 +0100 Message-Id: <20171008151146.13505-5-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171008151146.13505-1-sw@jkqxz.net> References: <20171008151146.13505-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 5/6] hwcontext: Perform usual initialisation on derived device contexts 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" The initialisation should be common. For libmfx, it was previously happening in the derivation function and this moves it out. For VAAPI, it fixes some failures when deriving from a DRM device because this initialisation did not run. --- libavutil/hwcontext.c | 4 ++++ libavutil/hwcontext_qsv.c | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 2f4ee9661e..048e82126f 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -650,6 +650,10 @@ int av_hwdevice_ctx_create_derived(AVBufferRef **dst_ref_ptr, goto fail; done: + ret = av_hwdevice_ctx_init(dst_ref); + if (ret < 0) + goto fail; + *dst_ref_ptr = dst_ref; return 0; diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 75057f7d52..f1d16d8bf9 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1037,16 +1037,6 @@ static int qsv_device_derive_from_child(AVHWDeviceContext *ctx, goto fail; } - ret = qsv_device_init(ctx); - if (ret < 0) - goto fail; - if (s->handle_type != handle_type) { - av_log(ctx, AV_LOG_ERROR, "Error in child device handle setup: " - "type mismatch (%d != %d).\n", s->handle_type, handle_type); - err = AVERROR_UNKNOWN; - goto fail; - } - return 0; fail: