From patchwork Tue May 2 23:56:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 3561 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp2127343vsd; Tue, 2 May 2017 16:56:06 -0700 (PDT) X-Received: by 10.223.165.71 with SMTP id j7mr24177399wrb.35.1493769366070; Tue, 02 May 2017 16:56:06 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k4si132114wmf.64.2017.05.02.16.56.05; Tue, 02 May 2017 16:56:06 -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=@googlemail.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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C9FB680A64; Wed, 3 May 2017 02:55:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 496AB680906 for ; Wed, 3 May 2017 02:55:53 +0300 (EEST) Received: by mail-wr0-f176.google.com with SMTP id l9so93697924wre.1 for ; Tue, 02 May 2017 16:55:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Up5ubGF78bvzsWcElEI+36We6R+zkPIMwFFoFY7lcjs=; b=I2aGBwBfE0vyVmkwyoUWTDqDwBiN8x3Tv/Cbrj2BMfW+EefDTpFj9cduu7eOdKuy/y X0E8RZB7C6LweJPsev+BWycMgZwCQkcXCX2whIIGaTxUjvUqB4bGUPRz5CuKbhGwcJ/R EtIx0ILSukwIoDfJEvrKZq4Z4/8oPnhr0CwYjHi6JALDIq8SiuCmn/sKPa28woj+3CZY jvqSmm+1oQekzb26oDcp8ZyDhLiEOgrFlr3B+XXIFPA+W35+2lgpTuCyuIR3HuFTyPtR a/wSy2IPVJc6t4ugQGq8ZDzogroJCD3vbEHEFlWtANFRolGLuKbB0ZFgbjO4tIIFw/mL IGSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Up5ubGF78bvzsWcElEI+36We6R+zkPIMwFFoFY7lcjs=; b=W+Yq2JweDdgIedPdcSkVQDJcVYGXqxSVHvX/4XUX+dhmZYw6hM7JfElaczzQ6EnKOl 2lDmKBRojBXEKizpbAwzC8NQJcIryMBE8wSaCxwP1S6McjEJerZRc6MATTXE7FUUZyEI kTUz/Ije94PVNMON+nfPAY1UeFmM4DrzwBaBncs9o1d0imAVivDUgMi4AzkxbtFJGOSt aMpwMfC7YCZTdlCq0MZaWIk+ip9L/MajNe5+1fzpggCngoqqIiN3QAZlCrG6s5R0Sa4K jhNMK9A1QBuKWvVx4iDKQM/3RU+ICif6v7mw9SCDJaHBJoRluLXjfQ63kTOrABCHRlAM DjXw== X-Gm-Message-State: AN3rC/4yYI2ErQYjbmQW5vZhliHHZYWGQDdDVvRH9TZjpkkhcSraI019 nWSIAgF1lj63kQ== X-Received: by 10.223.150.167 with SMTP id u36mr21967610wrb.184.1493769356990; Tue, 02 May 2017 16:55:56 -0700 (PDT) Received: from localhost.localdomain (p4FF0022F.dip0.t-ipconnect.de. [79.240.2.47]) by smtp.googlemail.com with ESMTPSA id r60sm25589483wrb.37.2017.05.02.16.55.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 May 2017 16:55:56 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 May 2017 01:56:26 +0200 Message-Id: <20170502235626.30567-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] cuvid: support AVCodecContext.hw_device_ctx API 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 Cc: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is a newer API that is intended for decoders like the cuvid wrapper. Until now, the wrapper required to set an awkward "incomplete" hw_frames_ctx to set the device. Now the device can be set directly, and the user can get AV_PIX_FMT_CUDA output for a specific device simply by setting hw_device_ctx. This still does a dummy ff_get_format() call at init time, and should be fully backward compatible. --- Not sure how to test correctly - it worked with mpv even when I accidentally didn't use the correct VO device. --- libavcodec/cuvid.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c index 288083423e..3453003965 100644 --- a/libavcodec/cuvid.c +++ b/libavcodec/cuvid.c @@ -802,9 +802,17 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) goto error; } } else { - ret = av_hwdevice_ctx_create(&ctx->hwdevice, AV_HWDEVICE_TYPE_CUDA, ctx->cu_gpu, NULL, 0); - if (ret < 0) - goto error; + if (avctx->hw_device_ctx) { + ctx->hwdevice = av_buffer_ref(avctx->hw_device_ctx); + if (!ctx->hwdevice) { + ret = AVERROR(ENOMEM); + goto error; + } + } else { + ret = av_hwdevice_ctx_create(&ctx->hwdevice, AV_HWDEVICE_TYPE_CUDA, ctx->cu_gpu, NULL, 0); + if (ret < 0) + goto error; + } ctx->hwframe = av_hwframe_ctx_alloc(ctx->hwdevice); if (!ctx->hwframe) {