From patchwork Mon Jun 8 15:01:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20216 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 75E1F44B305 for ; Mon, 8 Jun 2020 18:01:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 52AAB68B0A5; Mon, 8 Jun 2020 18:01:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC9F668AB55 for ; Mon, 8 Jun 2020 18:01:25 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id 185so8841941pgb.10 for ; Mon, 08 Jun 2020 08:01:25 -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=1W4BClC5oTyKTKfsLNFrlE2FxUTspB1HMlt61vc6LU4=; b=UIzWyPD3DOYsLMrRpVB3BcbKt3dN4ipnf/4WdCx9a1znjUh3eM8Tyb5yaHxQlMYNfC Cj+99A75jE9DJSZ2BMVzG0OWhQ6XDh8sn5cRVQ2JMzpuE+56LLqqyiL6wu4/DbQN1yos GJQhPB6gDvyu7OmEQNL+NYqg1qkEvXDt7+tO34Q4y1cGRsdwOp0Li/3simrtt3ERP3UQ RDinjYjrb9A6dcLbHfacamdJuafHhanvm9LwkRdo24IqkJB+4zc3Wi8ebeas7YLuUaVB nwK07Gn98kr8dOgOHzbsidpeirJm8wmLRkFCLhYLkfpWMWqovhjBEvGaIWrVu0lvU98C XpYQ== 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=1W4BClC5oTyKTKfsLNFrlE2FxUTspB1HMlt61vc6LU4=; b=fQAY0J7w1+t2wRE9BLF+7c2XDrmC5Gb7o0wRT8Fi7GlDrHvFOahY01Ofa2rKDGvyC1 E/pe71bEQkUKE0dAMSI0bNjMcUNqdxJc8XtNuKsVHkoa/TUCjNIU3YdDH286/te6LxM3 CqwfGa28+yYcq6oXwVzhQkMqQCNUXCbjFf6/8WOuP00BU6oPkqTYkjBYOaStRAckj5Kz 9gfYlMx3BNjmLeYqaqEiumzAH3CIEBXIxqNFLfgCQRjlFMQXW9cF0ejZDVptFCalkQeS 9cF0runvoGWP+A9QIAApLMupM/cnYb3kEUgarvCof8CJi+MidLLym/UDTwbY7eJ0ABCg 0+Fg== X-Gm-Message-State: AOAM5328dtGt0xM3YTzm3sTofPDA0LS+AmOTGkY1U4L/uXoW3bx/xmfI l6O+3BUjEw0iCAPWmmmbi8x1xrjf X-Google-Smtp-Source: ABdhPJyF0R0k7poMSjzytAfks0ga4GMH1hIgyy9znRPEznZJtaNU4DiRclmBnDaDqhRvFlbMZbloFw== X-Received: by 2002:a63:f91b:: with SMTP id h27mr20497087pgi.276.1591628482964; Mon, 08 Jun 2020 08:01:22 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id r7sm6245675pgu.61.2020.06.08.08.01.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jun 2020 08:01:22 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jun 2020 23:01:16 +0800 Message-Id: <1591628476-15762-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591624871-18131-1-git-send-email-lance.lmwang@gmail.com> References: <1591624871-18131-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avfilter/f_metadata: use AVBPrint API to remove buf size limitation 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/f_metadata.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index 598257b..79515b7 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -31,6 +31,7 @@ #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/timestamp.h" +#include "libavutil/bprint.h" #include "libavformat/avio.h" #include "avfilter.h" #include "audio.h" @@ -192,14 +193,20 @@ static void print_file(AVFilterContext *ctx, const char *msg, ...) { MetadataContext *s = ctx->priv; va_list argument_list; + AVBPrint buf; + av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); va_start(argument_list, msg); - if (msg) { - char buf[128]; - vsnprintf(buf, sizeof(buf), msg, argument_list); - avio_write(s->avio_context, buf, av_strnlen(buf, sizeof(buf))); - } + av_vbprintf(&buf, msg, argument_list); va_end(argument_list); + + if (!av_bprint_is_complete(&buf)) { + av_bprint_finalize(&buf, NULL); + av_log(ctx, AV_LOG_ERROR, "No memory for buf\n"); + return; + } + avio_write(s->avio_context, buf.str, buf.len); + av_bprint_finalize(&buf, NULL); } static av_cold int init(AVFilterContext *ctx)