From patchwork Fri Oct 25 15:36:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15955 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 9AD7E447286 for ; Fri, 25 Oct 2019 18:36:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78ECF68B4AD; Fri, 25 Oct 2019 18:36:58 +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 C7CF768B3A5 for ; Fri, 25 Oct 2019 18:36:51 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id 21so1800655pfj.9 for ; Fri, 25 Oct 2019 08:36:51 -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; bh=QhStBWtGPgutjIEfDdYRcwkz0VjQw1KERG5NxqLGiqU=; b=FR8mNv72x+GbP29/aIYzfOWfmjlV5qI6/Vigb2+20MVF5/2VAKOA/SnlxOjv01XAOm DjCp/ObSMe6tlr429eTZvf+EVVlMsY/d4E+yG9ULrdziANOQMRdjWXZCuI2jo8+OsGD5 c02jB1L4CuaXLNfhNW9F0tmv/UjcxPBdbreLbhfHVNv/CRGEbgbjhV0Lnk27DeW3eMiy hr4af0703bCryXc4BKequ4FJrL94L0Tutu6EFjO2kA0HZIBWiEdas0QP38+5LaniA7/t 8Os7pFffTNQPhfRKNTVE7d/Xzl8577EsvN51NqO2m0FfGb5c3xJap6QzXg5uKcznOd3V FaSg== 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; bh=QhStBWtGPgutjIEfDdYRcwkz0VjQw1KERG5NxqLGiqU=; b=BlE5Y+izFdvVARqaxmaUGECYvRY6KKqD8zMO5dKILSlrL20/TMoa1wVu7SfnopM3/5 hjCO8gLTxRJxpDIrulHuX1Smn+Qo7hjnc4vYoQLlpJj5s8+85Sw830Sn9/uHZKzqseUp p92oxQX66dUYpwVIf6LkSLC9tkSVrmGAwVvdob3Yk3+qpbWSyhgI3wKL4PePJ7cVr3mI Mbzw3VB0+A6YMxDL5imaYeYFSA3wrNgzq0f8CH8jSpYWj5wuiaFE/wdCGkqdsJ/TCyPl 0iXtymqEP+PIRFpFxeAlxDPD3RTcKZ7tUQZWCP2mJxPRYbwLmFAjEPsurZyMxSFwEnAf lyfA== X-Gm-Message-State: APjAAAUnknHEkvgFT7xB6YhN6brJvEN4HnFo+2Qm2omUcB8XhOoiRE3i NgNrm6tMqEHXFMHEJVA2zF8dyU7y5+A= X-Google-Smtp-Source: APXvYqyNJNkaCE5VqVaviXHVAzcBudmDtbMY4Z/KB0l0ax4sv3xHFZcyxSm78t0un92g6g2DF3EqrA== X-Received: by 2002:a17:90a:b902:: with SMTP id p2mr5011863pjr.62.1572017809702; Fri, 25 Oct 2019 08:36:49 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id f7sm2896552pfa.150.2019.10.25.08.36.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Oct 2019 08:36:49 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Oct 2019 23:36:44 +0800 Message-Id: <20191025153644.4904-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1] avcodec/v410dec: add the frame and 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 1, Test server configure: [root@localhost ~]# cat /proc/cpuinfo |grep "model name" model name : Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz model name : Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz ... [root@localhost ~]# free -h total used free shared buff/cache available Mem: 102G 997M 93G 16M 7.6G 100G 2, performance profiling master: ./ffmpeg -y -stream_loop 100 -i ./test.avi -benchmark -f null - video:529kB audio:40602kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown bench: utime=16.932s stime=9.417s rtime=26.341s bench: maxrss=271056kB frame= 1010 fps= 38 q=-0.0 Lsize=N/A time=00:03:36.54 bitrate=N/A speed=8.22x patch applied: ./ffmpeg -y -threads 2 -thread_type slice+frame -stream_loop 100 -i ./test.avi -benchmark -f null - frame= 1010 fps= 52 q=-0.0 Lsize=N/A time=00:03:36.54 bitrate=N/A speed=11.1x video:529kB audio:40602kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown bench: utime=23.164s stime=10.983s rtime=19.503s bench: maxrss=338252kB ./ffmpeg -y -threads 4 -thread_type slice+frame -stream_loop 100 -i ./test.avi -benchmark -f null - frame= 1010 fps= 71 q=-0.0 Lsize=N/A time=00:03:36.54 bitrate=N/A speed=15.3x video:529kB audio:40602kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown bench: utime=21.610s stime=11.603s rtime=14.160s bench: maxrss=517060kB Signed-off-by: Limin Wang --- libavcodec/v410dec.c | 72 +++++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 21 deletions(-) diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index 48fab68273..7ad5eb8fb5 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -24,6 +24,13 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "internal.h" +#include "thread.h" + +typedef struct ThreadData { + AVFrame *frame; + uint8_t *buf; + int stride; +} ThreadData; static av_cold int v410_decode_init(AVCodecContext *avctx) { @@ -42,31 +49,24 @@ static av_cold int v410_decode_init(AVCodecContext *avctx) return 0; } -static int v410_decode_frame(AVCodecContext *avctx, void *data, - int *got_frame, AVPacket *avpkt) +static int v410_decode_slice(AVCodecContext *avctx, void *arg, int jobnr, int threadnr) { - AVFrame *pic = data; - uint8_t *src = avpkt->data; + ThreadData *td = arg; + AVFrame *pic = td->frame; + int stride = td->stride; + int thread_count = av_clip(avctx->thread_count, 1, avctx->height/4); + int slice_start = (avctx->height * jobnr) / thread_count; + int slice_end = (avctx->height * (jobnr+1)) / thread_count; + const uint8_t *src = td->buf + stride * slice_start; uint16_t *y, *u, *v; uint32_t val; - int i, j, ret; - - if (avpkt->size < 4 * avctx->height * avctx->width) { - av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n"); - return AVERROR(EINVAL); - } - - if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) - return ret; + int i, j; - pic->key_frame = 1; - pic->pict_type = AV_PICTURE_TYPE_I; + y = (uint16_t*)pic->data[0] + slice_start * (pic->linesize[0] >> 1); + u = (uint16_t*)pic->data[1] + slice_start * (pic->linesize[1] >> 1); + v = (uint16_t*)pic->data[2] + slice_start * (pic->linesize[2] >> 1); - y = (uint16_t *)pic->data[0]; - u = (uint16_t *)pic->data[1]; - v = (uint16_t *)pic->data[2]; - - for (i = 0; i < avctx->height; i++) { + for (i = slice_start; i < slice_end; i++) { for (j = 0; j < avctx->width; j++) { val = AV_RL32(src); @@ -82,6 +82,35 @@ static int v410_decode_frame(AVCodecContext *avctx, void *data, v += pic->linesize[2] >> 1; } + return 0; +} + +static int v410_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *avpkt) +{ + ThreadData td; + ThreadFrame frame = { .f = data }; + AVFrame *pic = data; + uint8_t *src = avpkt->data; + int ret; + int thread_count = av_clip(avctx->thread_count, 1, avctx->height/4); + + td.stride = avctx->width * 4; + if (avpkt->size < 4 * avctx->height * avctx->width) { + av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n"); + return AVERROR(EINVAL); + } + + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) + return ret; + + pic->key_frame = 1; + pic->pict_type = AV_PICTURE_TYPE_I; + + td.buf = src; + td.frame = pic; + avctx->execute2(avctx, v410_decode_slice, &td, NULL, thread_count); + *got_frame = 1; return avpkt->size; @@ -94,5 +123,6 @@ AVCodec ff_v410_decoder = { .id = AV_CODEC_ID_V410, .init = v410_decode_init, .decode = v410_decode_frame, - .capabilities = AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS | + AV_CODEC_CAP_FRAME_THREADS };