From patchwork Fri Aug 21 09:25:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21790 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1D7A5449A7F for ; Fri, 21 Aug 2020 12:26:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF32768B70F; Fri, 21 Aug 2020 12:26:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BA7168B70F for ; Fri, 21 Aug 2020 12:25:57 +0300 (EEST) Received: by mail-ej1-f45.google.com with SMTP id kq25so1536087ejb.3 for ; Fri, 21 Aug 2020 02:25:57 -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:mime-version :content-transfer-encoding; bh=I4je6pkh9TsE3OzV6JH9kA7C/IjPJZFRrKKALqmH5FI=; b=ixbdwHXN8XiAuqLtarmONDLMFjwb4yF1nW5rYjQMosnDvOdHqYgCgIsrSB28X99DKD b4KL9MhLaq3MvDcuBwr9E4/kSVx/NvmnO22/LTTBHbj1Qr/0nNi4nRPqCzp5oDpjnXXo ynmG7i5tikM1VFaqF2ejwDenlG25Wsf1jkc+rUVF6NcHHXr/OWpjDNWK8Sc0PRPOlm9m rMVKnBEvxsAIaGEhel5xWlswKk9N6tawwBGwHAkM+afRfWYbiNaPD+N7GUWHoHv+ISyk 9GuhOx5qa81CjoB8UyejnJuN/aSLEASy6EuQm7iQQSHzw5k00rrIWI08A0v0/g3HK6tF ZAdA== 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:mime-version :content-transfer-encoding; bh=I4je6pkh9TsE3OzV6JH9kA7C/IjPJZFRrKKALqmH5FI=; b=JpCzKmAvmLHIX4W5No1+u2Sl9JF7h0vQZuyQNc8KVgQlc/hfrC4fymB47o//3jGcnX HksaWqyogCG/EjFNN8sJzURnNOMTUezLz9cypniHR0W1OmQzWNBGlqzV5OkdcAkwb0vx DtPdINxsFfHya1hpjQ+utn8rQNRkdqb7kpmjfd9IM+Un+TQZATYEM5a9dfj/oHue6v97 0BLxsbiuWdknpOluXcFsHajKFINU4QFeyry9t1h/qHofshPWYR8u69CiI+tosMhBhNzy UnuzkTmEnMmVqqw8hkscxcuEOGjlYAHsLj36FSomtW3C0DFQnbIpdwvq642iH6EzsBAs ngZA== X-Gm-Message-State: AOAM530OzKECP21n3YBN4TAlRplKCw+GVajQqJ8knRa9Slw82RmTLYty eKUeRJizbnx4fBeUt0RuT6f4p8QzMSQ= X-Google-Smtp-Source: ABdhPJyK78+AVzDaft/DZbDcDf8d6q06fL91fBbzfW3tqwlVwrDpEdCLJONTgmWIW8+0aW8kZBDokg== X-Received: by 2002:a17:906:6d54:: with SMTP id a20mr1946887ejt.501.1598001956095; Fri, 21 Aug 2020 02:25:56 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id du2sm973269ejc.2.2020.08.21.02.25.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 02:25:55 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Aug 2020 11:25:48 +0200 Message-Id: <20200821092549.9444-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/fifo: Remove unused functions and header 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Forgotten in 03c8fe49ea3f2a2444607e541dff15a1ccd7f0c2. Signed-off-by: Andreas Rheinhardt --- Patchwork warned about this [1]. [1]: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200812172558.262021-4-george@nsup.org/ libavfilter/fifo.c | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c index 70f4876a50..9cccbbebaa 100644 --- a/libavfilter/fifo.c +++ b/libavfilter/fifo.c @@ -23,7 +23,6 @@ * FIFO buffering filter */ -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/mathematics.h" @@ -98,51 +97,6 @@ static void queue_pop(FifoContext *s) s->root.next = tmp; } -/** - * Move data pointers and pts offset samples forward. - */ -static void buffer_offset(AVFilterLink *link, AVFrame *frame, - int offset) -{ - int nb_channels = link->channels; - int planar = av_sample_fmt_is_planar(link->format); - int planes = planar ? nb_channels : 1; - int block_align = av_get_bytes_per_sample(link->format) * (planar ? 1 : nb_channels); - int i; - - av_assert0(frame->nb_samples > offset); - - for (i = 0; i < planes; i++) - frame->extended_data[i] += block_align * offset; - if (frame->data != frame->extended_data) - memcpy(frame->data, frame->extended_data, - FFMIN(planes, FF_ARRAY_ELEMS(frame->data)) * sizeof(*frame->data)); - frame->linesize[0] -= block_align*offset; - frame->nb_samples -= offset; - - if (frame->pts != AV_NOPTS_VALUE) { - frame->pts += av_rescale_q(offset, (AVRational){1, link->sample_rate}, - link->time_base); - } -} - -static int calc_ptr_alignment(AVFrame *frame) -{ - int planes = av_sample_fmt_is_planar(frame->format) ? - frame->channels : 1; - int min_align = 128; - int p; - - for (p = 0; p < planes; p++) { - int cur_align = 128; - while ((intptr_t)frame->extended_data[p] % cur_align) - cur_align >>= 1; - if (cur_align < min_align) - min_align = cur_align; - } - return min_align; -} - static int request_frame(AVFilterLink *outlink) { FifoContext *s = outlink->src->priv;