From patchwork Fri Jan 27 11:42:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 2334 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp203543vsb; Fri, 27 Jan 2017 03:44:22 -0800 (PST) X-Received: by 10.223.160.206 with SMTP id n14mr7070354wrn.31.1485517462473; Fri, 27 Jan 2017 03:44:22 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i133si2558125wme.31.2017.01.27.03.44.22; Fri, 27 Jan 2017 03:44:22 -0800 (PST) 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; 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 CF3DE68A8F4; Fri, 27 Jan 2017 13:44:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6034568A82D for ; Fri, 27 Jan 2017 13:44:12 +0200 (EET) Received: by mail-pg0-f68.google.com with SMTP id 3so7113883pgj.1 for ; Fri, 27 Jan 2017 03:44:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=apizoPRSwpq5scO+myo5RW9+uLlwrnasYVjUIksHZho=; b=WhEFBHbKUW+iw8ma/K7KgnRGMJWo/8EUpJLOLeP7c3briHVMM3uAn2bhqCNYsT+cM+ ot2xgoijkocrgRSuHccKC0LhGXr3cjnMJo0x7trDHDwthw6bTOjqcncKngC7ivXFGc43 TaLW4r3wD6eonv1IoNNGOz/FDK3kQwNBZjaL/uX6MOyiyL8tDhYa0RV8VqWer+ygjjK+ DmwltNd6QqNRhco+4SQcma8QwhH85Txo8QAm3/bWgeD++mrqw3sglXLuzlr2GjFGas11 Wb6BQtPzm5tvBj+8Tayu4h/YJd0cz7q3Krq8VWCb4QLqMaD/AAsFKplCQtxCMOnxDUgn 14UQ== 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=apizoPRSwpq5scO+myo5RW9+uLlwrnasYVjUIksHZho=; b=Zi0R+A8NwS04SnM1edzrd2NUCWrp/HNmuXnlYJen1n2sJL2dLP0k+9SEU3zFNfY4sS 0o2HAxk1mwSnGcXW8S46tGnYGBKHJx4AQfOO3OvyAZC5uWU5m1ZBQ617sHUohVszTgWP ZIpy064Z7Zs+p9eA8KOvj1R7hEdJhkj+CiXDi4Wft10lD4zG7dyX34zrcTaf3hstLTBo AwHL7ibUPPz0iBn1O0P+I3lT/bjVKUqR6t0/W+7On0uODrxwaPMOs/wZIQP7aNTP/RWy 0Lcn7HSAM3v+SpKEyPVY0tdk79NvhYo1Pm4oZIiItKSaX5dPQ8xOF8VD7bvKl+1qurAI lx5w== X-Gm-Message-State: AIkVDXKZm64w1CfJ1quUAh+qSA6qivjZKyo5qjESqLTkvjGiTf4DZx+MXjFr9YKuM+U4uQ== X-Received: by 10.84.136.34 with SMTP id 31mr11800028plk.52.1485517451983; Fri, 27 Jan 2017 03:44:11 -0800 (PST) Received: from localhost.localdomain.localdomain ([202.67.46.252]) by smtp.gmail.com with ESMTPSA id z74sm10731476pfd.70.2017.01.27.03.44.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jan 2017 03:44:11 -0800 (PST) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Jan 2017 18:42:03 +0700 Message-Id: <1485517323-19039-1-git-send-email-mfcc64@gmail.com> X-Mailer: git-send-email 2.5.0 Subject: [FFmpeg-devel] [PATCH] avfilter: do not write to unwritable frame 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: Muhammad Faiz MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" affect filters that set partial_buf_size test-case ffplay -i lavfi 'aevalsrc=sin(1000*t*t), aformat=sample_fmts=fltp, asplit [a][b]; [a] firequalizer=fixed=on, showcqt=s=1280x360 [a1]; [b] firequalizer=fixed=on, showcqt=s=1280x360 [b1]; [a1][b1] vstack' Signed-off-by: Muhammad Faiz --- libavfilter/avfilter.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c12d491..7e7e83c 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1235,6 +1235,23 @@ static int take_samples(AVFilterLink *link, unsigned min, unsigned max, frame = ff_framequeue_peek(&link->fifo, 0); av_samples_copy(buf->extended_data, frame->extended_data, p, 0, n, link->channels, link->format); + + if (!av_frame_is_writable(frame)) { + AVFrame *new = ff_get_audio_buffer(link, frame->nb_samples); + if (!new) + return AVERROR(ENOMEM); + ret = av_frame_copy_props(new, frame); + if (ret < 0) + return ret; + av_samples_copy(new->extended_data, frame->extended_data, + 0, 0, frame->nb_samples, + av_frame_get_channels(frame), + frame->format); + av_frame_unref(frame); + av_frame_move_ref(frame, new); + av_frame_free(&new); + } + frame->nb_samples -= n; av_samples_copy(frame->extended_data, frame->extended_data, 0, n, frame->nb_samples, link->channels, link->format);