From patchwork Wed Feb 15 09:24:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 2560 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1866747vsb; Wed, 15 Feb 2017 01:25:11 -0800 (PST) X-Received: by 10.223.132.38 with SMTP id 35mr1651870wrf.130.1487150711246; Wed, 15 Feb 2017 01:25:11 -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 o19si4275942wra.219.2017.02.15.01.25.10; Wed, 15 Feb 2017 01:25:11 -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=@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 53FA5689A8F; Wed, 15 Feb 2017 11:24:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8FB61689A46 for ; Wed, 15 Feb 2017 11:24:23 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id c85so7195412wmi.1 for ; Wed, 15 Feb 2017 01:24:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=S+ooYQFfR4ZMq7rsZooL7osjZZ2d5yQA5QJZnW7u7O8=; b=crimlzXj9MEWa2UqK4LS2ufyVGBHB8N2zmZX3nTtzaybt365Almc793XtLxkag6QKa z4X913flHitxBYA1W00/t4fSQgELqBGbTQ/mwL9AMuHGU+r0wyZ++5zPa+fafHC52lir SmtuCmUC2s73xCTNZTIUGoolGpy+yXSmPVQ3U4YtnY8hSsWAUfvuh94ga+vyrHkBHSTR LxYv8sxbCat0Oo74pXqq+50MldJReTFJBeRwmNP8WkTV9Kb+bVG73s/PrT7kWQ6IX5WX gvjKZ0vzDTHwTVVhxvSnNj4N98xmFyKjejQbsvmlB+BFoNgWbPIQHqHd6HFjzxYNDBTm SnYg== 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:in-reply-to :references; bh=S+ooYQFfR4ZMq7rsZooL7osjZZ2d5yQA5QJZnW7u7O8=; b=Y35mzcSZHDSvQD2jqVcfnldiPIx30Wy9bKDi/SMbOvDDb11Nnsca++bmdhcH2iNHv4 b7fP7AyBKHJEA6ptMD0Vrn6ZQql+wYHcVCE2g/yap0CjjbkUO6+S0cTT/f7dcISkw3Mi VOEcf7o5SolmiCbtfihHnTcoX5fBNOpR5CoFtXUNNRckX7HJX+FZOcDxlvAExN7fcPkJ gTWjor8rLD3W0QZpI8OSeuYWI7xdPF8XqTkxvrMGRarIb+BnTgVSMt+jKGPTMPnEPS53 XqBB3lIC/OzXm7iNV9sdY8F/8U6HO6QIZxhodwKT98q527Tuu5McDyGcIJWsfmLdmT9G ckKg== X-Gm-Message-State: AMke39l2DGM0kHY1yQ/gAJF/g9BzTLN7cG865h4YpcDcDW23n+qjP57E1ZPS4RfAunB9QA== X-Received: by 10.28.134.76 with SMTP id i73mr7139114wmd.51.1487150668616; Wed, 15 Feb 2017 01:24:28 -0800 (PST) Received: from localhost.localdomain (p4FF0242F.dip0.t-ipconnect.de. [79.240.36.47]) by smtp.googlemail.com with ESMTPSA id u189sm6787730wmu.1.2017.02.15.01.24.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 01:24:28 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Feb 2017 10:24:23 +0100 Message-Id: <20170215092423.5358-9-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170215092423.5358-1-nfxjfg@googlemail.com> References: <20170210123541.32375-1-nfxjfg@googlemail.com> <20170215092423.5358-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH v2 8/8] avcodec/cuvid: update hw_frames_ctx reference after get_format call 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: Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Timo Rothenpieler --- libavcodec/cuvid.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c index f5a49ce86f..a0682e3cdc 100644 --- a/libavcodec/cuvid.c +++ b/libavcodec/cuvid.c @@ -140,6 +140,19 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form return 0; } + // Update our hwframe ctx, as the get_format callback might have refreshed it! + if (avctx->hw_frames_ctx) { + av_buffer_unref(&ctx->hwframe); + + ctx->hwframe = av_buffer_ref(avctx->hw_frames_ctx); + if (!ctx->hwframe) { + ctx->internal_error = AVERROR(ENOMEM); + return 0; + } + + hwframe_ctx = (AVHWFramesContext*)ctx->hwframe->data; + } + av_log(avctx, AV_LOG_VERBOSE, "Formats: Original: %s | HW: %s | SW: %s\n", av_get_pix_fmt_name(avctx->pix_fmt), av_get_pix_fmt_name(surface_fmt),