From patchwork Thu Aug 9 07:06:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9944 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1825624jad; Thu, 9 Aug 2018 00:14:09 -0700 (PDT) X-Google-Smtp-Source: AA+uWPx5opb2aLyDq5MsZ9w5qKT9iZr55lvUKPsOKhn/t0NLmz+rcEOLpiouGmtvhOWWXlyd5XxO X-Received: by 2002:adf:8362:: with SMTP id 89-v6mr614138wrd.147.1533798849402; Thu, 09 Aug 2018 00:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533798849; cv=none; d=google.com; s=arc-20160816; b=iQg4BOBDa5Jz/Oy8qGfMWNw9Nvd3U6r410GAYPSXWVIyWaK2l6mf0+uEUv7Z82EQZK 2w/xRIoczMe+xRptHr7Cktwf1XRNnl+9rKRpzcxu4d1xO6dXR6ndHoYTHAbpt5Si2mZG r5VMCoiSVwvE2bfFxxmCJyTSmCwiSNuXxOKQQhdmrRsMP7Rk2IR4Tcf/A1oAKAbU5YO+ qj7ozQFQUJWWnX3CV1R52W6DNiNiBMazBAQdORHKCtnX143ahoKK6I3NasqFRCHcgHy8 Rg1mP0I+AQdTNQAxxR1oPiYViY2094fkic2/eIuEmbEffHwwTRHIQdeKqql7wcb9VL9H NTOw== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=s9FA5g8NTpu0tBc3Fz+F9unWWdSleSfA2g+oTaoJnJc=; b=Fqxn2mZLyDfEC0tYjWkJAcYNfy3BRFmGo6/2uvTPT3JdBzaVpxOjf/3O9AtkGzVq4u x0FYYkuhvghNNKhPA7tYH3Ev8fGYQDow2xU65jWXkjZw8CYJnze5PM6T7P/DHYoHLSWD xCw9Lno0dfJMmmxV79cTxwkWvbGyL245YZWozGq5Hn0Lh7Syk74DxvfGsBFEIPQqc5E1 3jOu2zMeenIE8b20hJwDAlk+ZiFWNmqOdX4pGUjsNer7BV/+AYxqT4Stz6aqYt5bZsKh CjYEbX7hAMrhXLAzTrNE9JwL6fzpsxRROYVmIIt0NKnSBfwFSBOAWEF9UULWezcLUosj IYsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bLctZwmk; 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=QUARANTINE 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 h8-v6si4401133wrm.44.2018.08.09.00.14.09; Thu, 09 Aug 2018 00:14:09 -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=bLctZwmk; 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=QUARANTINE 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 57E68689E3E; Thu, 9 Aug 2018 10:13:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f48.google.com (mail-pl0-f48.google.com [209.85.160.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F3C5689C54 for ; Thu, 9 Aug 2018 10:13:39 +0300 (EEST) Received: by mail-pl0-f48.google.com with SMTP id g6-v6so2162526plq.9 for ; Thu, 09 Aug 2018 00:14:00 -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=j4ybgOp3CQNCLRTAmTE4Y/p+4oetTKs5Nkt06GQAhrU=; b=bLctZwmk7HgEATq8xBPr7+DBrbFin6E8AEfWWK5My8+Oer9L+iUnA9AwcyCnpZxjCi FcuIB9a7LYuLENOVUqWi2BDSxKziLkrRqHN5DXFhkSd7+6vXEg3cOyvHTTt8tBfejmgO IH1hhKCIUnc3P7laovTNOsU95qGhGkoCy+dl/CJ5PYwgj3Tr6j0FfeNqpX3NZDjbw/ti +dk5T6M7TMK/h9s3W8e8VxC7hwusLOwoOvjB6uxnnDhaDp6wCuhbgK1AY7X3+OfZ3jYP BOkp6MEfYmgr3qPHs3toXiqK1TNGVUG7WZuzzFS5TqEpL/RjNnaS5ef9p5n8BVWLzSBA v6ew== 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=j4ybgOp3CQNCLRTAmTE4Y/p+4oetTKs5Nkt06GQAhrU=; b=uBfOBHVcc49CgMtJ8XTd1WnhNUsN7UDXOyaS7kCi9MMislQwCJcyZ/zpF3izHdeRhY jNlP25kuAZcoy/yAkSD4GPAhzeO9V5h3jVHBWYgRz2wSLVdUgyq6/i3uIs5om9ooiNaO 98AWwd53EmtTr8L7d7rvUqmk+uXPWLN4hG1FJse/6IyvA57EsWnJ2YgqszTaOhY9S6RS 49jtBR5sU+flulmR6sQsaIV01h3qeq/IncEPvf1PcKwGEKOZq2QydVRyBFD5CqA48feD Sn4FgK644H4rA6BlfJU8xGJ6FYkgWNy5BHrUmqsicEmKHiQqi3zWa5+tDP8FbMWAyHdd n/pQ== X-Gm-Message-State: AOUpUlFLXbcjaQh1MSu4KkM2RfzLy8Vup99xDn35qF7yfVH7gnTFwR6e V8bWHsWe+bdvrJXYwVPI93kR6JdD+H0= X-Received: by 2002:a17:902:28e4:: with SMTP id f91-v6mr960476plb.146.1533798419367; Thu, 09 Aug 2018 00:06:59 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id x87-v6sm11254427pfa.143.2018.08.09.00.06.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 00:06:58 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Aug 2018 15:06:53 +0800 Message-Id: <1533798413-2439-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH] lavc/hevcdec: add ONLY_IF_THREADS_ENABLED where it is missing. 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" add add ONLY_IF_THREADS_ENABLED where it is missing. Signed-off-by: Jun Zhao --- libavcodec/hevcdec.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 409e77f..a3b5c8c 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3358,6 +3358,7 @@ fail: return AVERROR(ENOMEM); } +#if HAVE_THREADS static int hevc_update_thread_context(AVCodecContext *dst, const AVCodecContext *src) { @@ -3439,6 +3440,7 @@ static int hevc_update_thread_context(AVCodecContext *dst, return 0; } +#endif static av_cold int hevc_decode_init(AVCodecContext *avctx) { @@ -3478,6 +3480,7 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) return 0; } +#if HAVE_THREADS static av_cold int hevc_init_thread_copy(AVCodecContext *avctx) { HEVCContext *s = avctx->priv_data; @@ -3491,6 +3494,7 @@ static av_cold int hevc_init_thread_copy(AVCodecContext *avctx) return 0; } +#endif static void hevc_decode_flush(AVCodecContext *avctx) { @@ -3529,8 +3533,8 @@ AVCodec ff_hevc_decoder = { .close = hevc_decode_free, .decode = hevc_decode_frame, .flush = hevc_decode_flush, - .update_thread_context = hevc_update_thread_context, - .init_thread_copy = hevc_init_thread_copy, + .update_thread_context = ONLY_IF_THREADS_ENABLED(hevc_update_thread_context), + .init_thread_copy = ONLY_IF_THREADS_ENABLED(hevc_init_thread_copy), .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING,