From patchwork Sat Apr 8 10:31:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 3337 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp632475vss; Sat, 8 Apr 2017 03:31:37 -0700 (PDT) X-Received: by 10.28.152.70 with SMTP id a67mr2922229wme.89.1491647497450; Sat, 08 Apr 2017 03:31:37 -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 f129si3081889wmd.110.2017.04.08.03.31.36; Sat, 08 Apr 2017 03:31:37 -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=@gmail.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=NONE sp=NONE 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 206026808B9; Sat, 8 Apr 2017 13:31:30 +0300 (EEST) 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 A0C92688345 for ; Sat, 8 Apr 2017 13:31:23 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id u18so15097845wrc.1 for ; Sat, 08 Apr 2017 03:31:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=iH9Uz/Td0BUbc4hoGa5mIUZfih8Nz2hlct7yGtPW7TI=; b=dduU1BWzohrRxHgrjksJ9GsZqXNL5P8FmnY07lUhRmBnAQgDmmjtVCLbwzg1QFAHb1 mGlSAKRNMEffULJ2YX4WN9jXWTtrWaDLdiJ4ux8MWjB0dR+agXJHUwY02svopT8EGjt+ XFjbrbhOY1f30bW9vS0CyV5fpwrO3SL0prRJqApeumbsjvMH/+pM0XDSBgthplU1h2wj kye4mFy6pgYrjJkN0T0wpC8P+9iKOh2KgZkg/q6TbgEsLC6mNM988w5jRLeDjvBLXcwT AtzMiFgsIlz0oIzoREyhbKJr6gbqU1ZaDS1QCMuO0Ug1gNwo1tbIq1zbb+RiphU2iR8E EHWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=iH9Uz/Td0BUbc4hoGa5mIUZfih8Nz2hlct7yGtPW7TI=; b=JUIWcRBjuBEb3vTTcCurtQ0UcAE8NlPS0ny6TrJ0W60QqRrC40WlRzoVi5Q6G8e7nr DbxWrs7UX0pytl6vRiDHeZ962/9qnb9FUKwPu0sKByccBMoB5QlQxgmvmsrqDjn3uUUu L/ATaHpNmcZ7w/4Q2QZUrAAsGTKiXJgLNqr+XWCIBB/DChmD5wzk/jZTaxDUSkPRb+ai feqRTMz8OLma6d3TiRQDECWrSdX2siOwcLdprlTEA7dSlKPOaXnciFrOEKy2JNRoaebA M3gveDWTo9Ije78RkDWJWJTHUFdpCm5SmGHfB12XIa79prokZLCvJHXc3hifIG8wFrtR Zowg== X-Gm-Message-State: AN3rC/6eedYz+jh9RDsrSKUK1+EViqN/OIRhUQQiZ0BFi2tJHo/LU0r2aLda8AKCT/L3nw== X-Received: by 10.223.129.229 with SMTP id 92mr1543883wra.17.1491647487159; Sat, 08 Apr 2017 03:31:27 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 32sm9403857wrr.2.2017.04.08.03.31.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Apr 2017 03:31:26 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Apr 2017 12:31:14 +0200 Message-Id: <20170408103114.18270-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avcodec/cllc: add support for 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/cllc.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c index 80b0498..e0895d2 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -28,6 +28,7 @@ #include "get_bits.h" #include "avcodec.h" #include "internal.h" +#include "thread.h" typedef struct CLLCContext { AVCodecContext *avctx; @@ -357,6 +358,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data, { CLLCContext *ctx = avctx->priv_data; AVFrame *pic = data; + ThreadFrame frame = { .f = data }; uint8_t *src = avpkt->data; uint32_t info_tag, info_offset; int data_size; @@ -417,7 +419,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data, avctx->pix_fmt = AV_PIX_FMT_YUV422P; avctx->bits_per_raw_sample = 8; - if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) return ret; ret = decode_yuv_frame(ctx, &gb, pic); @@ -430,7 +432,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data, avctx->pix_fmt = AV_PIX_FMT_RGB24; avctx->bits_per_raw_sample = 8; - if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) return ret; ret = decode_rgb24_frame(ctx, &gb, pic); @@ -442,7 +444,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data, avctx->pix_fmt = AV_PIX_FMT_ARGB; avctx->bits_per_raw_sample = 8; - if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) return ret; ret = decode_argb_frame(ctx, &gb, pic); @@ -463,6 +465,19 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data, return avpkt->size; } +#if HAVE_THREADS +static int cllc_init_thread_copy(AVCodecContext *avctx) +{ + CLLCContext *ctx = avctx->priv_data; + + ctx->avctx = avctx; + ctx->swapped_buf = NULL; + ctx->swapped_buf_size = 0; + + return 0; +} +#endif + static av_cold int cllc_decode_close(AVCodecContext *avctx) { CLLCContext *ctx = avctx->priv_data; @@ -493,8 +508,9 @@ AVCodec ff_cllc_decoder = { .id = AV_CODEC_ID_CLLC, .priv_data_size = sizeof(CLLCContext), .init = cllc_decode_init, + .init_thread_copy = ONLY_IF_THREADS_ENABLED(cllc_init_thread_copy), .decode = cllc_decode_frame, .close = cllc_decode_close, - .capabilities = AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };