From patchwork Fri Aug 30 15:53:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14810 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 90AB344A69B for ; Fri, 30 Aug 2019 18:54:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75927687F9A; Fri, 30 Aug 2019 18:54:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 950E5680ADB for ; Fri, 30 Aug 2019 18:54:08 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id w26so4882655pfq.12 for ; Fri, 30 Aug 2019 08:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zZAZJTlZvXhpqyTSoa3l6xiY6DMlfaooQpeLZW9gRhU=; b=AVKyVIxxXIX0ulDyksoyMsws/3sjbeYbBp9TrE5PvrDQqq3/8x6f7aje7eOc6MPPen ole4FHwW/J7xjUB8kP9BVp3FNsM9m8eEZni7yHI9E1gFco8dcDAAFveZ1aOvZq8mhr4g TBRlk1U+oyEwxOpAitNXX2jb7hh66XSxmbXj7IHM0iggG6DzaIrLbwN5yxS3Kf28DQuo VELH7hB+U07axwjEzFXoU99pV1n5pEAcc0qFx2znDTXKq2WDBjfBWFtZ9YHrL6gE9ZYY rGxbk09EmZr46iNcw0ls/IhF2KiNCu3qS2PZ0D6wHV9xoJ5VxeeBgiNKRzEzOdPuZHi4 PkKQ== 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=zZAZJTlZvXhpqyTSoa3l6xiY6DMlfaooQpeLZW9gRhU=; b=S6Zyro+emwVUGcdWvhkNPHGSE9NlN7YJ7I29WvBgSEPU1Te4wiZWwq5/FnhcXwqFyY +bBGb2kCxEWifwByR4a88KNAQ1/XK4hlX4LZkMgfZJmMqysOl6Se1K5HpoRUkiwf4snP mCMPMKZILMkiSBb4jJptawK7URd4DtOiMIv+G+c8rL3ldLIGpvE6rd1uV2LAuS01uCBZ XB20xjPSZ4N3+hKHUGboyy7ZsYGpVlI8hnk3cmsJEPl9i2jQwCbLfksvNrFZqjGTMpc/ EdIthJIaQpC7kBQ+Tdcdex23e7NaoGxkyoNh7pXv5Okyc/cEB2bf/5LTp1gsBBjoPzmz c/1g== X-Gm-Message-State: APjAAAXRP5T9/h44iXKIqIyAMRNea4NiR4l2LJTB3wX5y47ISdn8j+Ax igiGrWIY9ld7EQoCyJmv5tr8L3wM X-Google-Smtp-Source: APXvYqwQfgQUBmn4AxARgWbbF7ZYVE5mPUqhOBd9e2kSj2juVFZpNsqMzi7q62P+CVxSa0UtqWsdnw== X-Received: by 2002:a65:621a:: with SMTP id d26mr7132714pgv.153.1567180446776; Fri, 30 Aug 2019 08:54:06 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id v20sm2899140pfm.63.2019.08.30.08.54.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Aug 2019 08:54:06 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Aug 2019 23:53:57 +0800 Message-Id: <20190830155357.27747-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190830155357.27747-1-lance.lmwang@gmail.com> References: <20190830155357.27747-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/2] avcodec/v308dec: add the slice threading support 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/v308dec.c | 74 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 19 deletions(-) diff --git a/libavcodec/v308dec.c b/libavcodec/v308dec.c index dd53fbd..07e5e24 100644 --- a/libavcodec/v308dec.c +++ b/libavcodec/v308dec.c @@ -22,6 +22,13 @@ #include "avcodec.h" #include "internal.h" +#define MAX_SLICES 32 +typedef struct ThreadData { + AVFrame *frame; + uint8_t *buf; + int stride; +} ThreadData; + static av_cold int v308_decode_init(AVCodecContext *avctx) { avctx->pix_fmt = AV_PIX_FMT_YUV444P; @@ -32,14 +39,53 @@ static av_cold int v308_decode_init(AVCodecContext *avctx) return 0; } +static int v308_decode_slice(AVCodecContext *avctx, void *arg, int jobnr, int nb_jobs) +{ + ThreadData *td = arg; + AVFrame *pic = td->frame; + int stride = td->stride; + int thread_count = av_clip(avctx->thread_count, 1, MAX_SLICES); + int slice_h = avctx->height / thread_count; + int slice_m = avctx->height % thread_count; + int slice_start = jobnr * slice_h; + int slice_end = slice_start + slice_h; + const uint8_t *src = td->buf + stride * slice_start; + uint8_t *y, *u, *v; + int i, j; + + /* add the remaining slice for the last job */ + if (jobnr == thread_count - 1) + slice_end += slice_m; + + y = pic->data[0] + slice_start * pic->linesize[0]; + u = pic->data[1] + slice_start * pic->linesize[1]; + v = pic->data[2] + slice_start * pic->linesize[2]; + + for (i = slice_start; i < avctx->height; i++) { + for (j = 0; j < avctx->width; j++) { + v[j] = *src++; + y[j] = *src++; + u[j] = *src++; + } + + y += pic->linesize[0]; + u += pic->linesize[1]; + v += pic->linesize[2]; + } + + return 0; +} + static int v308_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { + ThreadData td; AVFrame *pic = data; - const uint8_t *src = avpkt->data; - uint8_t *y, *u, *v; - int i, j, ret; + uint8_t *src = avpkt->data; + int ret; + int thread_count = av_clip(avctx->thread_count, 1, MAX_SLICES); + td.stride = avctx->width * 3; if (avpkt->size < 3 * avctx->height * avctx->width) { av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n"); return AVERROR(EINVAL); @@ -51,21 +97,9 @@ static int v308_decode_frame(AVCodecContext *avctx, void *data, pic->key_frame = 1; pic->pict_type = AV_PICTURE_TYPE_I; - y = pic->data[0]; - u = pic->data[1]; - v = pic->data[2]; - - for (i = 0; i < avctx->height; i++) { - for (j = 0; j < avctx->width; j++) { - v[j] = *src++; - y[j] = *src++; - u[j] = *src++; - } - - y += pic->linesize[0]; - u += pic->linesize[1]; - v += pic->linesize[2]; - } + td.buf = src; + td.frame = pic; + avctx->execute2(avctx, v308_decode_slice, &td, NULL, thread_count); *got_frame = 1; @@ -79,5 +113,7 @@ AVCodec ff_v308_decoder = { .id = AV_CODEC_ID_V308, .init = v308_decode_init, .decode = v308_decode_frame, - .capabilities = AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, + .caps_internal= FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, };