From patchwork Sat Dec 18 11:09:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 32702 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2463991iog; Sat, 18 Dec 2021 03:09:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJxworUoJrP6oSyfW6kumJomDssNznW34bPhSJ2Saz5tB4tqgGgvgxSDYL6isNDu1/UGTJt+ X-Received: by 2002:a05:6402:14f:: with SMTP id s15mr6757076edu.118.1639825791589; Sat, 18 Dec 2021 03:09:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639825791; cv=none; d=google.com; s=arc-20160816; b=DksXRKir+CvFExLPh/zSgWCxVwpN2lhdoep+hFIjdDubX5MeeJv+xNcXWUtoPYCdBx JPQay3Da6cS8Sx2AV5mA6EMXeN64qBLTlFAW2KAJPRrVq+vGmYWk9MSdlQoxTTbw+cli yZERmcgJwI4G8BfS4uNWUvj5Yfcs4BsWaQUpjizEuxxiGiea2vCe7rVm9axn29sWf2ga IaCblXn7XvfsUOTKY/qKbUn85Vb6F8K2+wR7n3xFZg/chZj1Th+mJByCWsQS6rXIdJG8 BZ/HGtg+487PNnUCDwIwH8Nd5mdIGnMQQEzoQDulugviMhGXNpR6ZMEA2TBfgeMXDSth VhjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=ra2tpTboZhEhDYUvsF4uOkHWsMk1sF9BBBOtyTp19ZA=; b=FGlcdcbKemVxnfynIbZLYoIZ9Qyb+n/OOt7lleCmJenmtr7I8LWXrvBXZvJRvHO40A LPXOrzXI1gDQpyd6uI+EsBUOZUydYsVpyrBWZK9KLzf1B0osE9R1VPFRDtKIUyPQlpix Lff9SrLPnXdqIBZujBdVWGGd62/uZruKT22DKJP6MJed8ObnLvzgrTfElrh8Ewo2jOrG 00VadCsB1rHi2RNQQuMk6ubdohku6yk4M0U5fU/8i35GVibeUCVq5dEMv9yDo/AvvvBA Yi2xcv00WFeYMEfRd4OkefEKY01WW5cXIuF/6LinF/LDW7cZvBl/d8i5wOqS031VOYxY KFQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=qYp5MGSq; 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=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x3si8997428edd.66.2021.12.18.03.09.51; Sat, 18 Dec 2021 03:09:51 -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=@rcombs.me header.s=google header.b=qYp5MGSq; 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=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BD2168AED4; Sat, 18 Dec 2021 13:09:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3844680529 for ; Sat, 18 Dec 2021 13:09:41 +0200 (EET) Received: by mail-qv1-f48.google.com with SMTP id h5so3053979qvh.8 for ; Sat, 18 Dec 2021 03:09:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=UtKH7UOKxd7FqYhTqrGrGwya7rF6IMWLRhHcDnsJmOU=; b=qYp5MGSq8TqIwb44hPM9jpR1dJ/veh0a4jU+dPz7RlmPv2rPdKIwJ56VjEbV7zVv6+ d6fOz3tJ5KMabT6/En9uRKd1V/MHpmpNnOHZXRbVB3jk98L+nFqQkbxjFQEeKT5qEayY vUt9Sxqi1DPWSL5bVFqpFTSteJuLeRodXsmQ0OBWh8pLb7efd5Dif+ynMcON/KRojuOm jyTIxyGMpVbrjGF9m0E7gH0Dg8ZSE8kJJv5AbffqtBjOOgMCA9kLhhzofPfTnAoPK+90 kk8ClkjYvFC5Z4fvw0XBKwnRULUjt0KnOmPIecC0+EFt9j3ZxieLdtFc2WAlbidikKEu r1rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=UtKH7UOKxd7FqYhTqrGrGwya7rF6IMWLRhHcDnsJmOU=; b=zDf6p1BSAg8husOQmJyaeiv9K8BBa6WWsbl0hqwVrGyERPNFIURt3bnIiTPdJF/GY+ m0aoayyZfMeLa7FqBg6auFxDEUAa0SNh3XCxqgtq3LPJUsBc9Sywnmyb2kCc4cxn7eY6 uTImXmI/KaFRCxnGdFYxcjtdbY/JdBN9bgZK+hixu5TQOsga4STJEgL2iQbjJfRVvjhg gMcVSltqONHseboNUw7S767Y/4vobMDzOW7+XfObvpqnJVHoZSNnOsMKBNIM3k9I6Imf ZzS1E2hYPq7LtQu8ZpgsiKIaowW3/dhqi7FMM6zGN5u1mW7UCbyXqVhwzRgoqiHo/Rj5 gn/A== X-Gm-Message-State: AOAM531fGyzsvINXFWIHBluvnsK5VAD+0Ks82HeyoprP3PDZaOx5DFjT T5b5yi93Hv+JTksE7KTa30r28H+GhLa2mlA= X-Received: by 2002:a05:6214:2523:: with SMTP id gg3mr5676245qvb.1.1639825779971; Sat, 18 Dec 2021 03:09:39 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:70a5:b034:a3a1:e733]) by smtp.gmail.com with ESMTPSA id d15sm9195825qtd.70.2021.12.18.03.09.39 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 18 Dec 2021 03:09:39 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Dec 2021 05:09:19 -0600 Message-Id: <20211218110919.30707-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/proresdec: fix threaded hwaccel decode X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: mAZwXWUzCDyJ --- libavcodec/proresdec2.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 719194f21e..d2d881a3dd 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -807,6 +807,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if ((ret = ff_thread_get_buffer(avctx, &tframe, 0)) < 0) return ret; + ff_thread_finish_setup(avctx); if (avctx->hwaccel) { ret = avctx->hwaccel->start_frame(avctx, NULL, 0); @@ -856,6 +857,18 @@ static av_cold int decode_close(AVCodecContext *avctx) return 0; } +#if HAVE_THREADS +static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) +{ + ProresContext *csrc = src->priv_data; + ProresContext *cdst = dst->priv_data; + + cdst->pix_fmt = csrc->pix_fmt; + + return 0; +} +#endif + const AVCodec ff_prores_decoder = { .name = "prores", .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), @@ -865,6 +878,7 @@ const AVCodec ff_prores_decoder = { .init = decode_init, .close = decode_close, .decode = decode_frame, + .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, .profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,