From patchwork Wed Dec 1 13:39:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31862 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp9269803iob; Wed, 1 Dec 2021 05:40:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbNFBvALW3KDdS/curtYr+LchWiN+H01uIKcZcqio6xIkG5kob1JYGisc/X+oEzXrzm+d8 X-Received: by 2002:a17:906:5d05:: with SMTP id g5mr7312851ejt.406.1638366006500; Wed, 01 Dec 2021 05:40:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638366006; cv=none; d=google.com; s=arc-20160816; b=ADbf4rkFoVGxRKB9/mkjQSOHyb0bTXXxWSVHx3cY5bVOv0E1SBT+zLFvb6D8wu6cL7 4JaMKs0USI+q/aNnDbUy/x8sjvyKnxKoA1JCvEp0qdVfU4YkhXNu5rmKbWyvEgXNybL3 e0YXWEHQwwy7rF1VByFS13aCeo2S3nU9bIhBiH5/N2KYTxkaUgqrrwvcXndmYc5JCPhe EvHjhob2PMh4k8x2XcyyIqgOS8owabYsQngdSdebuZs1IWiNbtGdlFOCPViScQ7OXFJi wgcJQ2uZ68zVCjOmSrp1OeF303iyvLOpXw1kE13jPWxpPezeeS3xWbBhp3xABYymwAjz ZU0g== 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:cc: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; bh=URsO2f3a+g0B4dlHLHhr+VbupzOQotAysU/kIDb383k=; b=Qc93gjog6ytm3m9+Fvk5qh+0Ruyhb0N1wbUoSILjlF+pT226+U1Mgz9nfvQbthyTN4 ih72HuUPsjEy3aIvhak1qZOnffQTZ9Yoz/HLZkVho6t8I0EJQ8Y4lnNUwYly52CCb1p/ sjmmFnbJ/GSA/UnFVUmcKEp0RMEgsb3sj13HDoVrjUwheOJX2XXaZgKe5pQY+hkxV613 jfpME/o91GLzdcKjRbs08G9DwJQ7Y51w/PcDHPcrSbAXdnz4YFqEbFB1e/RJKxsJ7CkH gzkUwkGvdRM8yphQCXyVgkdQUx6dUHtU+hEelIp4idx9PtGbqQJHQrxAbFWh9NX7vRd+ 5dWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XYMMJVlo; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id lj6si27092562ejb.258.2021.12.01.05.40.05; Wed, 01 Dec 2021 05:40:06 -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=@gmail.com header.s=20210112 header.b=XYMMJVlo; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2743468AF8D; Wed, 1 Dec 2021 15:39:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5461268AF75 for ; Wed, 1 Dec 2021 15:39:25 +0200 (EET) Received: by mail-pj1-f50.google.com with SMTP id np6-20020a17090b4c4600b001a90b011e06so1508216pjb.5 for ; Wed, 01 Dec 2021 05:39:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3SOVjV0XS1oOwUskyrVfFLFKLC0m+u5y+bpvwGWSe1c=; b=XYMMJVlogX3jZ+Yk3lCRld/t4hy7ABFHbrM7P7EOE9c7xW41OhcYibUxayV98IFDlo AO4WI6EdkGjSwDfK7bYNTsvFfJlFR/3++qsg2ABimqY59rX1vxt85WrD28D3FRq/bC4/ qEWGZPrjP9r8bfrHVlvMSUTXywqeTl9vBlrjpx8kqAH/O/zY+N9wW+fyPSF+oY0jO41p ir6SQUT190vjtpHDO8pClCQo1NsBHgnRYqIl/n3TCzmZ2RImW1EJhrNktldkkEy8XH6n Xf9Aa4lUSjtNosk/PJmrYe4Pl06q9psJECnPSbNej3m2vT1qqeK8+pJw8TVyExwu0udi gT1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3SOVjV0XS1oOwUskyrVfFLFKLC0m+u5y+bpvwGWSe1c=; b=lSCmGMZtU3VWUTw/zxahEE0eXQJkknuZXWTLNgWLgHXIhpOjbj730QTS/vE5sq8gIH B9JrCFNi2mon1PdIM9O4OaT9WN8XpJLpPBfl52ACo3Kc+CUlzFVyWB7l9PTbOMJBoU0c CcTY3+FdbvgxPVHUy5jiskYz6qBh/EJQ3fWiLmERTMlwmX4B2tRebZ2S5j86KdOe6c7Z 3VJEZwqTq/7auLHnVnm+D/7IsbJgnFNSbuXHhha+JaQpASXjLo0ZWB0u+RzFy5vGHGB1 o/PRFRBKE82n8WLPYDpm/P7G7Z6Q4eUG151WIuRTJbJRgSU8sv6F452ieACCes701TzQ At2A== X-Gm-Message-State: AOAM533Fh24K20cFW1CxFOiyUboUu4TMqMW4bmCivfD6OIV7oMBbvY9U oXGysQWTNeX8kZcRRTzEuuOsQ8QxxMs= X-Received: by 2002:a17:90b:4a05:: with SMTP id kk5mr7581248pjb.142.1638365963521; Wed, 01 Dec 2021 05:39:23 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id s28sm26276914pfg.147.2021.12.01.05.39.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Dec 2021 05:39:23 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Dec 2021 21:39:13 +0800 Message-Id: <1638365954-29420-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638365954-29420-1-git-send-email-lance.lmwang@gmail.com> References: <1638365954-29420-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/bitpacked_dec: support for frame thread 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9g0t5Pn27pBU From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/bitpacked_dec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/bitpacked_dec.c b/libavcodec/bitpacked_dec.c index a2edccc..90e5bcc 100644 --- a/libavcodec/bitpacked_dec.c +++ b/libavcodec/bitpacked_dec.c @@ -30,6 +30,7 @@ #include "internal.h" #include "get_bits.h" #include "libavutil/imgutils.h" +#include "thread.h" struct BitpackedContext { int (*decode)(AVCodecContext *avctx, AVFrame *frame, @@ -64,11 +65,12 @@ static int bitpacked_decode_yuv422p10(AVCodecContext *avctx, AVFrame *frame, { uint64_t frame_size = (uint64_t)avctx->width * (uint64_t)avctx->height * 20; uint64_t packet_size = (uint64_t)avpkt->size * 8; + ThreadFrame tframe = { .f = frame }; GetBitContext bc; uint16_t *y, *u, *v; int ret, i, j; - ret = ff_get_buffer(avctx, frame, 0); + ret = ff_thread_get_buffer(avctx, &tframe, 0); if (ret < 0) return ret; @@ -126,10 +128,10 @@ static int bitpacked_decode(AVCodecContext *avctx, void *data, int *got_frame, { struct BitpackedContext *bc = avctx->priv_data; int buf_size = avpkt->size; - AVFrame *frame = data; int res; + AVFrame *frame = data; - res = bc->decode(avctx, frame, avpkt); + res = bc->decode(avctx, data, avpkt); if (res) return res; @@ -149,6 +151,7 @@ const AVCodec ff_bitpacked_decoder = { .priv_data_size = sizeof(struct BitpackedContext), .init = bitpacked_init_decoder, .decode = bitpacked_decode, + .capabilities = AV_CODEC_CAP_FRAME_THREADS, .codec_tags = (const uint32_t []){ MKTAG('U', 'Y', 'V', 'Y'), FF_CODEC_TAGS_END,