From patchwork Thu Aug 9 07:24:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9945 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1834742jad; Thu, 9 Aug 2018 00:25:17 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxMgevEK5bb5nFaQBzbY//fSd3xUm66pHULq5K0kiQub8m3ZrIuMT1wLx+xFfUKYi6V9le/ X-Received: by 2002:adf:c44c:: with SMTP id a12-v6mr666545wrg.20.1533799517585; Thu, 09 Aug 2018 00:25:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533799517; cv=none; d=google.com; s=arc-20160816; b=XQq14rbIOLBV+P9Uzha8gI+/8qibBiXJK7TEfBU6fW2/BbhR+okorhLOObd+nXWEhi 2wnEYC9lcHhTHvnlKTg6woo7Iw/JauF960apmHSbHyPHPISoDIaxVdmvPMs9QwAsqun+ jaYAcuyFzP/HQeEevREjIW2J8EBLrHcQ42ypaKd5VzpaMTdh2jSJOQUd0U6L/QaJ1+0g Voq0hMWSYL3wd0lRmGFCp8EL4MJtcDuvfq44UsNYlcVvEu/GoHMDmJAT2Dp++ycQ5i9k clIv41gyq1b3fed/se6zjJxkNj1c5H35nu1D5Bnr+inzTG4+bmzOZR8L34TEVDy09bAa RvtA== 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=7m8oMSZ+VswBWzyIcHw+vqUIblkPu4Y4HGs3ZM6xdCA=; b=Y5wx+PKWKMDDZaWPztVf4EeZnqA9iaO/orras9PNx8iXKuJAA6pMgznGVZcbIX4RlV Qs0MyG05GlCmqFeDRdHgGo9kzAicJwcwkp/RhKBjR2JmkDlw41mGaq48/RNF1L+tfQdg v/uN9FXEKew1CsciiK+T9HAv3WbsG5SQ/S300WvwOqJP5vlmmz2piQ6qwS/1KbabW1WY 9KUaB7Wsfxot8oY2hGOL5zZocFwaAgiJFFwFUFzeHBDspcYZCXLacC3puIyuOGGs0tGG pR+XqyPmH4gfA0L1ecUvzWy4g6va0GTDnxkkP6/8rADeQsJeOEyfPMHQJrmd4q41rx8y VEFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LPBefnSg; 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 m189-v6si5220373wme.147.2018.08.09.00.25.17; Thu, 09 Aug 2018 00:25:17 -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=LPBefnSg; 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 8E97D68A4F1; Thu, 9 Aug 2018 10:24:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E35DD68A4D6 for ; Thu, 9 Aug 2018 10:24:45 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id y10-v6so2411485pfn.8 for ; Thu, 09 Aug 2018 00:25:07 -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=bqd9ek+KG7WaxcqLjG+lGXt5boY0g2BnHJ3qiMqdCY0=; b=LPBefnSgzdVTXJQMzV5n4mSuwJp48EMcksmRArne2jSHk3qPVbXAA1nBy24v6HRbuv PDtA8sKncpaUgJG7Knm3npSsuxVPdqxlJ4NeU8u6EoioHFkULIkGDjnY7i174R/uydpm GLbzMttePdXAbqPz9Qlh6PeJP+IGnwDJgiulBScCGi63MmUZBfM50TPZ8ZXvagEg5NHW wYM1AU/HiZlZmyjHV6TVWfSTxVb9KVMm5iCsfjQb7b2PndCMQXq/xV1/bty+gQKIa0Yd bj+t+q8mOZ+ROzvOMEjcjLhaDjWPkqdNjxZ++9LkZ4AhfQsWnWpe03a5qjO8wPxZ7wII +1iA== 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=bqd9ek+KG7WaxcqLjG+lGXt5boY0g2BnHJ3qiMqdCY0=; b=GZ3p58+YeR7EnqTnmh258Z6z+c+efluULM3JcMIZoFhLt+BSBFXbtORQOSW5kw0iMs z9VU3nnXqG0sbxy8OQLTSH8tuyP/iDXQPHV4S/SmOC/KHkCo6CQUVm7LRHEAsTn2ZpvY ceZ5hmAUbLNP2yYe9JPTzccuLjptIYygPIF+PYtQX+Nof+n348qbEZyYNI0EAqQuk6Jp PNe1zimGQ8Nhc6VWiGyQ9J/Ln++qqW88AAOeaHtKzikay0sYsDmOK/QmKS22NCWV9/ur wMk4IqiVE/XNPpi0CLWbRsLdFdl5jZYSMlvf6z4dSusZ9rEgyLYsXlPrRQ9Sn2SeqWrW DMew== X-Gm-Message-State: AOUpUlEPa0eEuuYxgUDahUv1c2g6WVJzQ8W7VQVYb40/k5Td8cmR53il x0ah2DvVagQ5CXAnUIxt7w1LvlsAx88= X-Received: by 2002:a62:1089:: with SMTP id 9-v6mr1123446pfq.30.1533799505692; Thu, 09 Aug 2018 00:25:05 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id t186-v6sm7364955pgd.77.2018.08.09.00.25.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 00:25:04 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Aug 2018 15:24:54 +0800 Message-Id: <1533799494-2716-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1533799494-2716-1-git-send-email-mypopydev@gmail.com> References: <1533799494-2716-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V3] 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 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,