From patchwork Fri Aug 5 12:00:26 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: 99 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp1682689vsd; Fri, 5 Aug 2016 05:01:23 -0700 (PDT) X-Received: by 10.28.17.138 with SMTP id 132mr2962431wmr.81.1470398483672; Fri, 05 Aug 2016 05:01:23 -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 to5si18166670wjb.84.2016.08.05.05.01.23; Fri, 05 Aug 2016 05:01:23 -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 AC9AB68A64E; Fri, 5 Aug 2016 15:01:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07DDC68A506 for ; Fri, 5 Aug 2016 15:00:33 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id i5so3482976wmg.2 for ; Fri, 05 Aug 2016 05:00:40 -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=ZNEtwAkdxTMGm/zWI/aqWIL7WdpyzAa+1DWi4PguaWs=; b=GSoQf+4zUnmQ12EaJopeCp/Og+k7V/6BgWa35dUXoDN/yOqrQWxaK8ygZnJSHOpgUX V2O7wrpaGKEoxVrviktBcTW15RhukF+mkSySLNM1qJeIj44pNcMxrj21sJ89Pr7YJFeG pL8mxZ0RP361QprEsI+OSmcYRB2UlIuJ1hHAtL2eKNi/RvIi5Ih3YJUiUPN7lI0w9Fjl Xfedtl0J/MgX5JcI/2ULODsD1jtimVJAHvDCk9mOEtHzMsIctCoztYXd13dOI6vNWfzI TAoT2r3SScTQyjMOdnN/R+1VF4ZBM5UYaBOt5gz28+ctKrZXP9UzoFUBR7wuOHxu4WAO JJGw== 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=ZNEtwAkdxTMGm/zWI/aqWIL7WdpyzAa+1DWi4PguaWs=; b=Pw1X/Y90/kOdOr1QzINjOBHW1eRgFAFswU0PzukYkYzITQEsUJ9zgLUFpySTbmZhe9 DFgxvoteZqxWIQ3fL0MIDxYUzbmDhBcz4fNzWUQK7KrjGAu5mlV4UfHNpwfYdAuu7ckh jerCndIaVepxVX411dsP4S2XSqbdSrXWQRCaeONQg/JfgCNGlU83PHwpqDPabM6HhAuU QtxlT1Qil5TRx24sCy+vszv0nH75a7bCvm3zSXuDYqJwFqxsHYu5nrZ5efue9ky740jt 2xO5g4+RvXoiI0OAcRbEk5zWTAGXSpjeXxUpYE5T8YTsIEka89+MsjTuKVglPydLKIaO L8QA== X-Gm-Message-State: AEkooutme4OM+s/XJshWkhGx7FbGYkWg2CELLkOlD/KdxX+Vc1RgDlVzDlrBXyecQwiaGw== X-Received: by 10.28.174.76 with SMTP id x73mr3020425wme.60.1470398439598; Fri, 05 Aug 2016 05:00:39 -0700 (PDT) Received: from localhost.localdomain (157.174.broadband3.iol.cz. [85.70.174.157]) by smtp.gmail.com with ESMTPSA id b186sm8283960wmg.23.2016.08.05.05.00.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Aug 2016 05:00:38 -0700 (PDT) From: sebechlebskyjan@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Aug 2016 14:00:26 +0200 Message-Id: <1470398426-15863-2-git-send-email-sebechlebskyjan@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470398426-15863-1-git-send-email-sebechlebskyjan@gmail.com> References: <1470398426-15863-1-git-send-email-sebechlebskyjan@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 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 --- No changes from last version, just rebased because of the changes in previous patch. libavcodec/bsf.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index dcdc1d3..2462e62 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -248,6 +248,7 @@ typedef struct BSFListContext { unsigned idx; // index of currently processed BSF unsigned flushed_idx; // index of BSF being flushed + char * item_name; } BSFListContext; @@ -348,9 +349,34 @@ static void bsf_list_close(AVBSFContext *bsf) 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->nb_bsfs) + 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->nb_bsfs; i++) + av_bprintf(&bp, i ? ",%s" : "%s", lst->bsfs[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, };