From patchwork Sun Sep 10 03:24:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ronald S. Bultje" X-Patchwork-Id: 5070 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1691905jaa; Sat, 9 Sep 2017 20:31:55 -0700 (PDT) X-Received: by 10.28.217.85 with SMTP id q82mr4762715wmg.89.1505014315136; Sat, 09 Sep 2017 20:31:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505014315; cv=none; d=google.com; s=arc-20160816; b=Y/QNmdgt+BH5frqIzGPvTdiaRy9HNic+CPM2J2LR0IT310a8n5dwDmsoIrOspCR3jE 3Jbc3cSyYKWP1Fk/f+m5iFl6SFOjAwjhgwO0KjLjiLXgJJgTFmWCjX71hlVA2XHSJ3sp jRFoQFGhxVETb0ikZD4lmTitPWjb9oTuAhr/lnXudthVF1JaIw7NWca362EOVh/CRYI9 VClZtYMBE9Cdo4YqSpigPrRidWVWLT5ErKOJErl1RIJBJcGHhtmAqULjyI9tXp3Sx+sp IqMviDygDCGJLUbHkkRxj7izBmjtjxV4wSyQJAXKLRmU2bamockQF1KSblDUjyeNzDUO Q7aw== 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=aJ8SM0MkFgNhWzLeHikziFiTTjxJ9EExTw5uauoJhL0=; b=Sf8ocMuWkWiAxdH+2EsYG7cMMzFJGC56ZxTUOrppyVW7jCtTCbnnevSfhm9iHvuS3p +Jp/3uaCJ1XvP+I2IqpTqnTzOzo4afHG8qBD1b/BmhPDnOjFWnALJAciyd+abRzTYqll 0cE4jHmO1yDfO2GBAYC+3btsaz+wW6sJzbXJG+yVCqog9Hl3V7Vl526FQBdQi+0G7poN z+hnz8v8yCQ2IpM09d7/SsV+T0jTEcs0hLLvNOr9kUEZlUIOBdDIhxFGaQ4WWQWxLl3d NmfRo71M4eimWjO8AMax8+BcYtmpmBfN20tnptUp2O8IxZtle+RWHVL6KS4p51hpzyWb KIWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UFVfZvqS; 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 x17si4372513wrd.106.2017.09.09.20.31.54; Sat, 09 Sep 2017 20:31:55 -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=UFVfZvqS; 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 EC086689AA7; Sun, 10 Sep 2017 06:31:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21B2068991C for ; Sun, 10 Sep 2017 06:31:42 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id l25so876591qtf.2 for ; Sat, 09 Sep 2017 20:31:47 -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=Z+qcwJeaaqesM0qvPQj76PaV0ewzhZZm3Mcs4i5nEqc=; b=UFVfZvqSeYxV4/q+FhGrI3ETQYD0bZyUXEMJUgUCbrCAfEiok0fuQsoewjnALj4wyr sMEESVJgv1Ivw3YJ8rPZkiBG2KeCwVvZg1XmaggEQbJ8XD8DljjsSswrualySdKh9q4Q c9fyq0Uv+qxLOPCNeBgB+yV8ApRz8w240uyH6hIWe4DxzP6hHMNbq0NgVLtSJn8b6eSb PfiDjPKmMZMPkEgsOBG9OhK/HqmQd1Kxv4RCq/AcJKXwMc6Loll1Z8LpK0ZIHiTWApx6 0CwO0bo/1TTqrS/c87tQw0kLM59EAewVE+5m6o1ESNuIRWMgUf8XKfVohw1e/2X51Szx LJ5A== 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=Z+qcwJeaaqesM0qvPQj76PaV0ewzhZZm3Mcs4i5nEqc=; b=Vane3EVlmnyqrrnoq9Amqe4/WJwY42V2CHtyAzvXP9cgWABQDPqwJOhIQoTcYeAalL cFKJBn0BhVlIsSgJzwFgBpWrpPSfXiMHHWiItsWqzZQmYYpIQr/FhLsYH6Ye3pLllBy5 wW+BbOfN8E1jTIq1dRz6IZmTpzbdBk8JNlHBoLWcun/+AzeVsNjOj8n4q4IEnOhz+th9 avc/zhrqTxQiV7snsdJwdPVV4d58LXRkQ086MfCudBYqZxkqbnyVaalH1ba/KGGQQdNv 9TMAvJUMhL/Nq603X+q+/Q19CCKcanbNIEw/NzDMvw1PMrGx7foG3bREkQOcjEO4HHOp S04A== X-Gm-Message-State: AHPjjUi0BMoLLD7I/X6J+ZYDgB2/nNkPVms6+in2bq4DQ+bQJtZDRjem T2RonC89BohCu7Zd5D0= X-Google-Smtp-Source: AOwi7QABrZMS25U3WsE+xhBlp+C9yAZ/BpWhgv5ZQcO9qLG1noWC0zQusypp/flxWI5/EOe8n9nRhA== X-Received: by 10.200.54.3 with SMTP id m3mr10233558qtb.195.1505013883756; Sat, 09 Sep 2017 20:24:43 -0700 (PDT) Received: from Macintosh-7.home (pool-173-77-254-54.nycmny.fios.verizon.net. [173.77.254.54]) by smtp.gmail.com with ESMTPSA id r190sm3813913qke.9.2017.09.09.20.24.41 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 09 Sep 2017 20:24:42 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Sep 2017 23:24:39 -0400 Message-Id: <1505013879-13022-1-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 Subject: [FFmpeg-devel] [PATCH] vp9: fix compilation with threading disabled. 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: "Ronald S. Bultje" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/vp9.c | 15 +++++++++------ libavcodec/vp9dec.h | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index a71045e..f626f81 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -88,10 +88,8 @@ static void vp9_await_tile_progress(VP9Context *s, int field, int n) { pthread_mutex_unlock(&s->progress_mutex); } #else -static void vp9_free_entries(VP9Context *s) {} +static void vp9_free_entries(AVCodecContext *avctx) {} static int vp9_alloc_entries(AVCodecContext *avctx, int n) { return 0; } -static void vp9_report_tile_progress(VP9Context *s, int field, int n) {} -static void vp9_await_tile_progress(VP9Context *s, int field, int n) {} #endif static void vp9_frame_unref(AVCodecContext *avctx, VP9Frame *f) @@ -1343,7 +1341,7 @@ static int decode_tiles(AVCodecContext *avctx, return 0; } - +#if HAVE_THREADS static av_always_inline int decode_tiles_mt(AVCodecContext *avctx, void *tdata, int jobnr, int threadnr) @@ -1451,7 +1449,7 @@ int loopfilter_proc(AVCodecContext *avctx) } return 0; } - +#endif static int vp9_decode_frame(AVCodecContext *avctx, void *frame, int *got_frame, AVPacket *pkt) @@ -1583,10 +1581,12 @@ FF_ENABLE_DEPRECATION_WARNINGS ff_thread_finish_setup(avctx); } +#if HAVE_THREADS if (avctx->active_thread_type & FF_THREAD_SLICE) { for (i = 0; i < s->sb_rows; i++) atomic_store(&s->entries[i], 0); } +#endif do { for (i = 0; i < s->active_tile_cols; i++) { @@ -1599,6 +1599,7 @@ FF_ENABLE_DEPRECATION_WARNINGS s->td[i].uveob[1] = s->td[i].uveob_base[1]; } +#if HAVE_THREADS if (avctx->active_thread_type == FF_THREAD_SLICE) { int tile_row, tile_col; @@ -1629,7 +1630,9 @@ FF_ENABLE_DEPRECATION_WARNINGS } ff_slice_thread_execute_with_mainfunc(avctx, decode_tiles_mt, loopfilter_proc, s->td, NULL, s->s.h.tiling.tile_cols); - } else { + } else +#endif + { ret = decode_tiles(avctx, data, size); if (ret < 0) return ret; diff --git a/libavcodec/vp9dec.h b/libavcodec/vp9dec.h index 15e0122..96c0e43 100644 --- a/libavcodec/vp9dec.h +++ b/libavcodec/vp9dec.h @@ -98,9 +98,11 @@ typedef struct VP9Context { VP56RangeCoder c; int pass, active_tile_cols; +#if HAVE_THREADS pthread_mutex_t progress_mutex; pthread_cond_t progress_cond; atomic_int *entries; +#endif uint8_t ss_h, ss_v; uint8_t last_bpp, bpp_index, bytesperpixel;