From patchwork Sat Mar 18 08:56:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 2997 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp609739vsy; Sat, 18 Mar 2017 01:56:49 -0700 (PDT) X-Received: by 10.28.51.140 with SMTP id z134mr1972399wmz.55.1489827409800; Sat, 18 Mar 2017 01:56:49 -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 t3si6514656wmd.79.2017.03.18.01.56.49; Sat, 18 Mar 2017 01:56:49 -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 DF40A688380; Sat, 18 Mar 2017 10:56:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A409F68837C for ; Sat, 18 Mar 2017 10:56:01 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id g10so12012399wrg.0 for ; Sat, 18 Mar 2017 01:56:19 -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:in-reply-to:references; bh=3pnRKy0epXvxGhQwXKIrIStLACtWDyFZkf3uaEB/pI0=; b=WxIyEl6+ifAKRVqyq4fF5Ma/4w+T5Vmn2qr1cvHDHVRrhePwZPRHAsv9LbNOZMOW3D ldZzLsxf0QxgxfumdXQCdZYuTqvmZxkBaqXJNiTWjgiX/uI2/0UT+3eababOpr9yayKS 8S7WysrOdamfbdTHGswVBmT8fJYEb47zg/oMgzx1pUcZ2KgOCXU/8ZOJBv9txpBxEs10 SYub2pCBOSuZNgBPZOKEbSfbbknK/scCj9aT1Rl7BdUixFl0bFhjqpXdXjZVBESsW/nr fPDqmT4aREJYstu01otVegL0h9orS+7FHYHwcgubNJi6ktIKUF5KibU/Iid3+CEIm5F5 8kbg== 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=3pnRKy0epXvxGhQwXKIrIStLACtWDyFZkf3uaEB/pI0=; b=HRgZ1hjEsZn7LzAWmY/eFXJs/xUtauydZxp5ALdLneebiA5w/vKj476yYEC1kadjNt yyKeZuiJMfHhvfWL98uSaZBmhiuMQpgRrEavNgXarImZ3PnXLow+277+V+Pv7roFtGdt gFAMjgADgK1RK26TnuAq2FJ8l2Ph+lJxzSVb0pBwGNFXMCb65MFUfX+eoZHM4hw8gdNE 00bRUIiIZX6zD9F9JM6GmWhJQIm4Td1notRRZY0llm895JqKD3uL5Ii+ghumlDPxa4xt 9k0i3F8zA2iU+N01BUpDSL9J1qBuqAQX4pEYv/Zx5S/p8NOYuiHnPpl3ptz3EmeR/TCl dR6g== X-Gm-Message-State: AFeK/H25RmdFshdjqWl8d3YWQqeRbjfysgA06c6VZ5KjeuCkdUN0ZYCfelhhEH1c9nlchg== X-Received: by 10.223.182.167 with SMTP id j39mr15618829wre.152.1489827378810; Sat, 18 Mar 2017 01:56:18 -0700 (PDT) Received: from localhost.localdomain (p4FF02CC6.dip0.t-ipconnect.de. [79.240.44.198]) by smtp.googlemail.com with ESMTPSA id p12sm12879637wrb.46.2017.03.18.01.56.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Mar 2017 01:56:17 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Mar 2017 09:56:00 +0100 Message-Id: <20170318085606.26011-4-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170318085606.26011-1-nfxjfg@googlemail.com> References: <20170318085606.26011-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH 3/9] pthread_frame: properly propagate the hw frame context across frame threads 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" From: Anton Khirnov Merges Libav commit 84f22568. Signed-off-by: wm4 --- libavcodec/pthread_frame.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 2a5dfc6723..18f89ee73d 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -235,6 +235,17 @@ FF_ENABLE_DEPRECATION_WARNINGS dst->sample_fmt = src->sample_fmt; dst->channel_layout = src->channel_layout; dst->internal->hwaccel_priv_data = src->internal->hwaccel_priv_data; + + if (!!dst->hw_frames_ctx != !!src->hw_frames_ctx || + (dst->hw_frames_ctx && dst->hw_frames_ctx->data != src->hw_frames_ctx->data)) { + av_buffer_unref(&dst->hw_frames_ctx); + + if (src->hw_frames_ctx) { + dst->hw_frames_ctx = av_buffer_ref(src->hw_frames_ctx); + if (!dst->hw_frames_ctx) + return AVERROR(ENOMEM); + } + } } if (for_user) {