From patchwork Thu Jul 28 16:18:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sebechlebskyjan@gmail.com X-Patchwork-Id: 19 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp886623vsd; Thu, 28 Jul 2016 09:32:41 -0700 (PDT) X-Received: by 10.194.123.35 with SMTP id lx3mr5185174wjb.126.1469723560934; Thu, 28 Jul 2016 09:32:40 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m126si14451067wmm.55.2016.07.28.09.32.39; Thu, 28 Jul 2016 09:32:40 -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; 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 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 CB1DA68A5EA; Thu, 28 Jul 2016 19:32:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 700A068A510 for ; Thu, 28 Jul 2016 19:32:27 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id o80so11950104wme.0 for ; Thu, 28 Jul 2016 09:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gqoI2MbZXnNlzp31J09FVENmfinE9h3v1Wkzk/7vddk=; b=T4RX+p+pMJnOgA8MlrKEDLiG3J72sKJRcQhV4DSzrsAtCbOVFkRfLg5ck/RJX9sh6k Oaxw+PBJxINMqWZKcDSmuNa0boWuXwPqdiWLYif0JFOJ+4jqWcm/NlaIU5g/52aEX57D Q/uB0t5z3RJ9TP0VTPay4MJs58l0oMVsRN0EK7eRjkwcBowXfWYM98CsZduCx08v3IA8 Ph7m+sX0oqhWR9H+osxa0scmn2HS6AVNYJ8kmjoO1i0LOHeGKuk7WiJNqEYOT97sSakc LhDqg8u949maQqL+pWnbzq+7S4Shh13Ac10E3LzTGzsDZwc64dR8d7lYmRcO8HxPg/k6 SGYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gqoI2MbZXnNlzp31J09FVENmfinE9h3v1Wkzk/7vddk=; b=E5sIGqgccCgV+E/llS6OZRqFdM5BZQlARI8J4527bNbKE2Ng9bXCCJdAZV620PPGbj Q9bIQFQDCklMWGj5WghSGGIIJL39i6coAnYt/KtQOyR8qxccjltSMVS+2gcyHfEREQxs w5LUbXBxntrO4CHv4YkdSU0w+zgJ64LloZ+2i3lsszrVWxmtxnigeSdzsrKPbfSc6G/q wnUkjSBqTEJ69rPq24WTMFdvayXoRDDGm/Ml9ki5mqDPlKM2FuLe4Owzc6sOiTljXzDJ euj2tzcWY/dDNwG8CqnTffP1shqBQ8/a/vtVQ2/U2Sh+qMuAv7rIG8EQ66K71yidBtur 2hrA== X-Gm-Message-State: AEkoout3I5YQtRy2u6JXnhqBIy+ol6dk6ZoK2jI4xqZ7oVG18LQvklH9SIxRC510dltmaQ== X-Received: by 10.28.3.69 with SMTP id 66mr34892679wmd.26.1469722716649; Thu, 28 Jul 2016 09:18:36 -0700 (PDT) Received: from localhost.localdomain (157.174.broadband3.iol.cz. [85.70.174.157]) by smtp.gmail.com with ESMTPSA id i80sm12961969wmf.11.2016.07.28.09.18.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Jul 2016 09:18:36 -0700 (PDT) From: sebechlebskyjan@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jul 2016 18:18:15 +0200 Message-Id: <1469722696-2018-4-git-send-email-sebechlebskyjan@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1469722696-2018-1-git-send-email-sebechlebskyjan@gmail.com> References: <1469722696-2018-1-git-send-email-sebechlebskyjan@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/bsf: Add custom item name func for BSF list 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: Jan Sebechlebsky MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jan Sebechlebsky Add custom item name function for bsf list, which will construct string description of filter chain. This is done using lazy-initialization, so there is no overhead if item name is never accessed. Signed-off-by: Jan Sebechlebsky Conflicts: libavcodec/bsf.c --- This allows to get some text representation of list BSF filter for logging purposes. libavcodec/bsf.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index 3ae0a2b..c2e13f7 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -23,6 +23,7 @@ #include "libavutil/opt.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/bprint.h" #include "avcodec.h" #include "bsf.h" @@ -247,6 +248,7 @@ typedef struct BSFListContext { int idx; // index of currently processed BSF int flushed_idx; // index of BSF being flushed + char * item_name; } BSFListContext; @@ -370,11 +372,37 @@ static void bsf_list_close(AVBSFContext *bsf) for (i = 0; i < lst->ctx_nr; ++i) av_bsf_free(&lst->bsf_lst[i]); av_freep(&lst->bsf_lst); + av_freep(&lst->item_name); +} + +static const char *bsf_list_item_name(void *ctx) +{ + static const char *null_filter_name = "null"; + AVBSFContext *bsf_ctx = ctx; + BSFListContext *lst = bsf_ctx->priv_data; + + if (!lst->ctx_nr) + return null_filter_name; + + if (!lst->item_name) { + int i; + AVBPrint bp; + av_bprint_init(&bp, 16, 128); + + av_bprintf(&bp, "bsf_list("); + for (i = 0; i < lst->ctx_nr; i++) + av_bprintf(&bp, i ? ",%s" : "%s", lst->bsf_lst[i]->filter->name); + av_bprintf(&bp, ")"); + + av_bprint_finalize(&bp, &lst->item_name); + } + + return lst->item_name; } static const AVClass bsf_list_class = { .class_name = "bsf_list", - .item_name = av_default_item_name, + .item_name = bsf_list_item_name, .version = LIBAVUTIL_VERSION_INT, };