From patchwork Thu Sep 7 20:57:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilia X-Patchwork-Id: 5044 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp651498jao; Thu, 7 Sep 2017 13:58:23 -0700 (PDT) X-Received: by 10.223.165.137 with SMTP id g9mr408471wrc.269.1504817903635; Thu, 07 Sep 2017 13:58:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504817903; cv=none; d=google.com; s=arc-20160816; b=SNWOr0TTS2JgY8k+KU17PzVzoP2djHq+3H8gdZEsgV7EGFBw/7qUQjnE7QPiwGW8w/ aAJNDAEyrQL0FFaOu4EoMcm6CMmr4mHKLhx04Qh48qrNkl5R16fXunu25Naj/ISPEhGo sqI6GAa/o/iJNYbQWStaHHjG5GG0Pog3b1YT3LzGnD4yaPKd4xrAhygDu2OYdfojOV3s /0uMSvvcPNKldy/G8+n1INmMLW85Dq3CnDdv/KimsrDhgumMZISxpLdila3wza6Wv7wb zdjoyzdF19TgMo824JQ+7qKBnIH1sNo+YxVZfZ3eydDCp4u0s2n8uG4ZcGM94geI87ng /17w== 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:arc-authentication-results; bh=mzgdEmV5pfTKG+aTZn0wckjr1hG3FPwl2ICcBO6KtZA=; b=ptx2gj35gmZidmSphAyL5DcwSuNwEv7mXLuibQYneF3XJRXBYs7AViPW7djbKYTgiC uUwl2V2xr0llHraM7zuPMxYCSgOEeZxZl/3aoZ85dz51P9TDDlwubTWym4I4RavuI049 6dGj48rWK3L/d7ZrVje0VqD+1Z1bP0cvBF+0ETybIMx6n98ULwRtJsdNq9Jg6jwBxAyV eh+Z9K2qagiucQv9rD8qvgQ5e3iZTSE9ZQFyLKbsJvvrKn+S/7LPpAPB5vbtbvJTRrWh OzPUOYV6wZNyq5L12UcNHEKhUkIHfiGi2hcFIZDqv0x4vFtU1g+q3RYmsOBd6AtRjtS/ NGfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=h3/4lcbG; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v139si96279wmv.62.2017.09.07.13.58.23; Thu, 07 Sep 2017 13:58:23 -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 header.s=20161025 header.b=h3/4lcbG; 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 B20C3689D0F; Thu, 7 Sep 2017 23:58:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B89C6808C2 for ; Thu, 7 Sep 2017 23:58:12 +0300 (EEST) Received: by mail-lf0-f67.google.com with SMTP id q132so319692lfe.4 for ; Thu, 07 Sep 2017 13:58:16 -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=vsYb3bMoSa9gXBty2F1ZSkuToyGOwO6CcLO2IeMbCW4=; b=h3/4lcbGOBxx5qHOBQFIQVmCiNbKgdU3hn/GPy1VS4EH/2nTJE3Kt7hA+ZCzPn/uuT K5nDmwmmrGOzoPIn1y4cB4eYVRUrvg6biXJHn8NxKcrhEgVWEEm6WRt2YmnhU1ZOSeN5 Qq9GdrywafzpRbTy1MPwwCCDEp38nLY3IGaXVUQlJAMVEeLKyJwMnYWnMnAJwUdEzvWS +/gkIF+UNPtmi2GRvoCunJSYgaqXR648ANV9Y4T6626YsYFTbiHIy7Mkdl4HDRbi60BO 1sxFjLxqjoOgUSvIP0jLNw71+fybkjqSlOeKOyREhrcqwT9HpdC52onndb15yM5oV8oZ Cqhg== 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=vsYb3bMoSa9gXBty2F1ZSkuToyGOwO6CcLO2IeMbCW4=; b=merGC0AD+EFeL7qPlW0GvJhqskytbNWAK/O2U5Te4DzxIELFMZIRTG2Egpnl2SvGjF OQzmmP+PNVBBRd6rRTFeUmoTgv/hZrNX+aj+2mpuyeC7y8hzOQCc0lMALUCFDpeFBkZc HoNTDuPWYzsvVv4mQk7qhOzpfK4hvQMfQgZIC9brM+Ot4E3hhKubcKtGdbIZ5pD1/HmI S9jaZfiZvQNRPUvAbg7vW0pW+RorjSLjj7mN2jyd3aIlEdaSqC4+rd0ZEZldyR/TbRnm HJAhWrEt3CuEQftRAudB1c1eawjrjPjLz5PlY3lLNJfzk7AyhSf+RnncohfOeaVUG1L8 qdGg== X-Gm-Message-State: AHPjjUg9MbYAQnvv8Abeo06Cs9RCUl1wxRP+fVrf47oh8ZBocdvX2nid RTMbQ6jkOwIP+8MQ X-Google-Smtp-Source: AOwi7QAA5FJj6eGJ9PkEwnqrcYZ+kNqmtkt/G7zHyrNt2tHb0KPPxKYiUSiY2/y5JWcyzYoORXybOQ== X-Received: by 10.25.18.195 with SMTP id 64mr172276lfs.60.1504817895571; Thu, 07 Sep 2017 13:58:15 -0700 (PDT) Received: from localhost.localdomain ([95.191.192.76]) by smtp.gmail.com with ESMTPSA id n87sm42196lje.37.2017.09.07.13.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Sep 2017 13:58:14 -0700 (PDT) From: Ilia Valiakhmetov To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Sep 2017 03:57:37 +0700 Message-Id: <20170907205737.1032-1-zakne0ne@gmail.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20170907175529.4420-1-zakne0ne@gmail.com> References: <20170907175529.4420-1-zakne0ne@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/vp9: change avctx->execute3 in favor of ff_slice_thread_execute_with_mainfunc() 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: Ilia Valiakhmetov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Ilia Valiakhmetov v8: --- libavcodec/vp9.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index b780262..a71045e 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1628,7 +1628,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } } - avctx->execute3(avctx, decode_tiles_mt, loopfilter_proc, s->td, NULL, s->s.h.tiling.tile_cols); + ff_slice_thread_execute_with_mainfunc(avctx, decode_tiles_mt, loopfilter_proc, s->td, NULL, s->s.h.tiling.tile_cols); } else { ret = decode_tiles(avctx, data, size); if (ret < 0) @@ -1776,7 +1776,8 @@ AVCodec ff_vp9_decoder = { .init = vp9_decode_init, .close = vp9_decode_free, .decode = vp9_decode_frame, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_SLICE_THREAD_HAS_MF, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, + .caps_internal = FF_CODEC_CAP_SLICE_THREAD_HAS_MF, .flush = vp9_decode_flush, .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp9_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp9_decode_update_thread_context),