From patchwork Wed Jun 6 18:47:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Borsboom X-Patchwork-Id: 9273 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1186470jad; Wed, 6 Jun 2018 11:47:54 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJTpqqBiCjHd5uIHntw11w6FU/dh82qu09PCHw4huVEPlpSO9CHP4c9Dc7ya3VhCMPplHns X-Received: by 2002:adf:b782:: with SMTP id s2-v6mr3083580wre.247.1528310874890; Wed, 06 Jun 2018 11:47:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528310874; cv=none; d=google.com; s=arc-20160816; b=ildQK9i/R/F0eQu53I8mhxw8N5Z0ZFScLTgPk10rhIxeBYOEWslr8c1OXd+kTeQqw3 X7ryfVg8XSdMCQn5C1JOtuDgRUPq3aOQzMt03vITBpOOyRUzUPv8ppn3QJazemLDNMn1 DJT0KDaHeAH9OT9zGwxMOppXOiFFNVLYnwG5YfZ2CHZe/6GK19FgXOG/XcSI2Bzx5Zwo GS370XRdgnLEE8RT70aDwcaRnkTx9kN4D6z5nvlRasoC4o2wZ+F5TQ3coTYQqgqJdNuN zYlMy3T3jNgUC72QdSkmV1Ait1cbF1l/S5/XhBtw7xeuTi0axm8xNcboQ6rx1uKLHUaa AHtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:mime-version:user-agent:date :message-id:from:to:dkim-signature:delivered-to :arc-authentication-results; bh=/RLaQzSydEP199GUvceNcS2C13Ax+0jtHoiIAiJeMk4=; b=L7Qv8pBIrLwlKoe8xix2C+nmcU/M9tkwRbeTmseFcbL6jChzyuwxgjb9NoT/aOpHpg bDhHlv50JQrcFyV31YUl9GGOy84c7Z8thPL6r/BklYz287Z7Gz9jbdzt0i6C/q+BLpK8 rvioI8OwW+CRs0xjxbnpA1ZzWDNDgr8jwxnWNxMmgXJBQKP9col7vNNjn4dt6CM5+as+ i3lEEyYknswNKxudVtnXvqiLwC8oqkUO1NdlGG7Dck4MiXsCEPveeAOj3qjIsy58thzG DwNvRmC8KE7zsiMgaF8Hlyg83alZQSPw1DLcCs4E/lqALv62wIm+bXxczQWy0WywWQx7 QTow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@carpalis.nl header.s=default header.b=Z/mKkTCq; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g20-v6si32247638wra.391.2018.06.06.11.47.54; Wed, 06 Jun 2018 11:47:54 -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=@carpalis.nl header.s=default header.b=Z/mKkTCq; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8C55168A794; Wed, 6 Jun 2018 21:46:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from kyoto.xs4all.nl (kyoto.xs4all.nl [83.161.153.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C64068A760 for ; Wed, 6 Jun 2018 21:46:47 +0300 (EEST) Received: from [IPv6:2001:980:9507:0:8e70:5aff:fec6:83fc] ([IPv6:2001:980:9507:0:8e70:5aff:fec6:83fc]) (authenticated bits=0) by kyoto.xs4all.nl (8.14.7/8.14.7) with ESMTP id w56IlWfk014988 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 6 Jun 2018 20:47:33 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carpalis.nl; s=default; t=1528310853; bh=qdTvNNdv7Llf7ZmZLy08TA11667xnPf5qOcyYoBYxYo=; h=To:From:Subject:Date; b=Z/mKkTCqdgTF3lVDX/zLgk3geeUnP87e2SW04OHeuo3svLJG3yLVNe+nvZc3RIYW4 MS/s6UNdeq2hfpKve7xN7odME8jCcW4QSMCpov+IGpfJ0rt0fP0XSd/0BAa01c3VMc sUOm+IZpyMLEXi+uwesYfpPTob8KSLZV5AdMfuzlx876hRqKBeRFN258IQJuoSxpXD rlzv9vpgdRNRc330K7IrsEvdqufRgyDYLFXySmja1qzWP7Kp/518yshqUi4y+0RFBW bZMr23HWaUP4UG+guzq0CXU6yEsOqyvZkT4MQGZWrDAIlo2ZEw00lPPH8cbVr9eBEV hAzto8UYbJ45Q== To: ffmpeg-devel@ffmpeg.org From: Jerome Borsboom Message-ID: Date: Wed, 6 Jun 2018 20:47:32 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: nl Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/vc1: remove unused ff_vc1_loop_filter_iblk 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Jerome Borsboom --- libavcodec/vc1.h | 1 - libavcodec/vc1_loopfilter.c | 30 ------------------------------ 2 files changed, 31 deletions(-) diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 1d283f8589..69f6ca9e4d 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -422,7 +422,6 @@ void ff_vc1_init_transposed_scantables(VC1Context *v); int ff_vc1_decode_end(AVCodecContext *avctx); void ff_vc1_decode_blocks(VC1Context *v); -void ff_vc1_loop_filter_iblk(VC1Context *v, int pq); void ff_vc1_i_overlap_filter(VC1Context *v); void ff_vc1_p_overlap_filter(VC1Context *v); void ff_vc1_i_loop_filter(VC1Context *v); diff --git a/libavcodec/vc1_loopfilter.c b/libavcodec/vc1_loopfilter.c index 39b298cd28..fd83eaa7f5 100644 --- a/libavcodec/vc1_loopfilter.c +++ b/libavcodec/vc1_loopfilter.c @@ -31,36 +31,6 @@ #include "vc1.h" #include "vc1dsp.h" -void ff_vc1_loop_filter_iblk(VC1Context *v, int pq) -{ - MpegEncContext *s = &v->s; - int j; - if (!s->first_slice_line) { - v->vc1dsp.vc1_v_loop_filter16(s->dest[0], s->linesize, pq); - if (s->mb_x) - v->vc1dsp.vc1_h_loop_filter16(s->dest[0] - 16 * s->linesize, s->linesize, pq); - v->vc1dsp.vc1_h_loop_filter16(s->dest[0] - 16 * s->linesize + 8, s->linesize, pq); - if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) - for (j = 0; j < 2; j++) { - v->vc1dsp.vc1_v_loop_filter8(s->dest[j + 1], s->uvlinesize, pq); - if (s->mb_x) - v->vc1dsp.vc1_h_loop_filter8(s->dest[j + 1] - 8 * s->uvlinesize, s->uvlinesize, pq); - } - } - v->vc1dsp.vc1_v_loop_filter16(s->dest[0] + 8 * s->linesize, s->linesize, pq); - - if (s->mb_y == s->end_mb_y - 1) { - if (s->mb_x) { - v->vc1dsp.vc1_h_loop_filter16(s->dest[0], s->linesize, pq); - if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) { - v->vc1dsp.vc1_h_loop_filter8(s->dest[1], s->uvlinesize, pq); - v->vc1dsp.vc1_h_loop_filter8(s->dest[2], s->uvlinesize, pq); - } - } - v->vc1dsp.vc1_h_loop_filter16(s->dest[0] + 8, s->linesize, pq); - } -} - static av_always_inline void vc1_h_overlap_filter(VC1Context *v, int16_t (*left_block)[64], int16_t (*right_block)[64], int block_num) {