From patchwork Sat Apr 8 10:12:40 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: 3336 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp628124vss; Sat, 8 Apr 2017 03:13:15 -0700 (PDT) X-Received: by 10.223.134.46 with SMTP id 43mr5601492wrv.190.1491646395031; Sat, 08 Apr 2017 03:13:15 -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 u10si12249833wrd.26.2017.04.08.03.13.14; Sat, 08 Apr 2017 03:13:14 -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 BA15C6883BB; Sat, 8 Apr 2017 13:13:06 +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 99064688337 for ; Sat, 8 Apr 2017 13:13:00 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id g19so23111343wrb.0 for ; Sat, 08 Apr 2017 03:13:04 -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=UhbhVt5JggSNquQ8k5EJDLIW0JdqIw60FaN0a9Umrak=; b=KfUq1j5OQjK50LgOaQ1+RgZoaYSO6EAtFHJd8JLXzaP9kn14MHPISTrhuQ5LHi7qvu s/wNH2hb9MNUWdBERU0QOSjPmFnG3s91RHV6+wOYIPLVPlS2R6fuDm9CLMRPTxLMzbW8 23bzT33JL4BoxH3JdSdXFXB4eMBUd8YAJhIU+GbsESkR+1hBuo1fMIm+iFmsnJl5i5Z0 fRTBU3XPVKSIe0A0nXxBHrWQqOibh+rLQOwCkOMANbFWuS1iVLnzlOz3PxO1DKgfrD6+ uRopAfJPgD4hHxK0H3t+0j1IJjyjj4E0dSBmpm+uOF5UByWPK3ykkRdJlGGlc9UbLeCI OYDw== 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=UhbhVt5JggSNquQ8k5EJDLIW0JdqIw60FaN0a9Umrak=; b=maxk1bhExKuuEGZRks1VIB5r2NrxadY1PE1hFOodGbKmCIiUsbhEjeWe1HwRidqx5H DetuZsOIsWdQ6jnHV5C0nMgEfiipjwg77gm31WqcYE5Dh/BGmmDbwB7PgDg9s3ScD+JZ kcXzPL20DoDe7m6sy5BgRdByHvyPSSgU7MMrdgIrFd4DFC3+bE7IBbH+35XnAAEUDJqz GyB02SIkD+JDX/L8A0M1HQdpnmWX5zV7XT/r6i+QKbia68+vUYrCnsb7DtG62i0t2V/Z D9vEyx+AQiNbyq++/G9cfePXSFSZO8wcydAoWClY6rsGaS9i6145jjYXhlO4F+/BvSWA pp+g== X-Gm-Message-State: AFeK/H2qfmAaB/S9eELvmWwrv1yQTZ4e0omP79iH2Lma75GBfRh/4vQ3wjpjmtyWhEA5bw== X-Received: by 10.223.177.219 with SMTP id r27mr42247838wra.194.1491646384035; Sat, 08 Apr 2017 03:13:04 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id t16sm9336763wra.44.2017.04.08.03.13.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Apr 2017 03:13:02 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Apr 2017 12:12:40 +0200 Message-Id: <20170408101240.15925-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avcodec/hqx: 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/hqx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c index 1bc123e..bc24ba9 100644 --- a/libavcodec/hqx.c +++ b/libavcodec/hqx.c @@ -27,6 +27,7 @@ #include "canopus.h" #include "get_bits.h" #include "internal.h" +#include "thread.h" #include "hqx.h" #include "hqxdsp.h" @@ -405,6 +406,7 @@ static int hqx_decode_frame(AVCodecContext *avctx, void *data, int *got_picture_ptr, AVPacket *avpkt) { HQXContext *ctx = avctx->priv_data; + ThreadFrame frame = { .f = data }; uint8_t *src = avpkt->data; uint32_t info_tag; int data_start; @@ -491,7 +493,7 @@ static int hqx_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - ret = ff_get_buffer(avctx, ctx->pic, 0); + ret = ff_thread_get_buffer(avctx, &frame, 0); if (ret < 0) return ret; @@ -510,6 +512,9 @@ static av_cold int hqx_decode_close(AVCodecContext *avctx) int i; HQXContext *ctx = avctx->priv_data; + if (avctx->internal->is_copy) + return 0; + ff_free_vlc(&ctx->cbp_vlc); for (i = 0; i < 3; i++) { ff_free_vlc(&ctx->dc_vlc[i]); @@ -536,7 +541,8 @@ AVCodec ff_hqx_decoder = { .init = hqx_decode_init, .decode = hqx_decode_frame, .close = hqx_decode_close, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS | + AV_CODEC_CAP_FRAME_THREADS, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };