From patchwork Tue Mar 17 21:31:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18272 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 2CC6B44B51F for ; Tue, 17 Mar 2020 23:32:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EDFF668B522; Tue, 17 Mar 2020 23:32:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07CE76883AD for ; Tue, 17 Mar 2020 23:31:56 +0200 (EET) Received: by mail-wm1-f41.google.com with SMTP id g62so968933wme.1 for ; Tue, 17 Mar 2020 14:31:56 -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=7oIAr87tHeo8xIWxldrHZh3YyTULjYl1zsM0tx/y3qI=; b=lelOUgj48Sd8ngro9y4Ufw+QsP8PWyc5JRR0Shi4itLWO+VbtUMsS2Vit2DIuBnUqo Wh2uTcitkssAu1MxJcMUnow9fUaFo6SS5TtOtvk755OJug8Per35eBxzDkME88YYWYzb 3IlxqHLkzYbnCrFEZgIa+yrqmry8WB8SWKghlvkyjYZuzEy2UuYgKuALryJeUHTNd/UN wA+BTAyRWSwLNb2L6b2tsNpmykBRdRzdXOQwok7K51snUFgdLJBwrU4hKbWOI1aeTiJt GDshU9zgDaYBVOmtqtYcQogp6S7j/bSpeWfAfCBUjNMJQ8S41tS4quJfCE+edVC63s/J toBA== 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=7oIAr87tHeo8xIWxldrHZh3YyTULjYl1zsM0tx/y3qI=; b=TxsblqBNVSFsrTE0HbLkHn51gYKZoW58c4FxVSSdUzhFcS/U21Wr4neJS4seBxAHgr l4tCcj+aPPuIQmz3JccsG4C+Ik3I2sNd5qYjYB/Q6/W4/vEWlMimO22HegRZ+5OMM+Zq NqpLHjVfHXk6WJ2iU8G7+pPrGTokEetelZszza7XLOBOks9E4j145IByL5FkdMAXSnaJ 4SXv30WgZXs5UOZuu0/YXB1c2Yd/Jpsex+tGK9Eyo2XSLbC2YwJIU2hdKgIJeNEPNHLY kq1+LiEmCdpmgTV3eRDJTjbjIhrHxYB2RR3jKz/FjVS1PcCBZhi22X7R7b+83jfNR8bH 0d9Q== X-Gm-Message-State: ANhLgQ3GMDNoJ+TVmwGmhauIRSX8d63tBF/+zHSGlKjIbfVtPwF7i7pY vw5AsKQ18lzpvvunj9rML8fxJBe1 X-Google-Smtp-Source: ADFU+vv+ZiykTP4JeezhyTiBgL7/W5KgTvG52+q1bQCrvyCb0awRrLvBhA53ITE3Wpf9U6SXSzYvMQ== X-Received: by 2002:a7b:cc8a:: with SMTP id p10mr1031016wma.10.1584480715187; Tue, 17 Mar 2020 14:31:55 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id i12sm6269233wro.46.2020.03.17.14.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 14:31:54 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Mar 2020 22:31:46 +0100 Message-Id: <20200317213147.1140-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/bsf: Don't set defaults for AVClass without options 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" This happened for AVBSFContext. Signed-off-by: Andreas Rheinhardt --- libavcodec/bsf.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index 9dbf6a636d..d0e0d46068 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -45,8 +45,6 @@ void av_bsf_free(AVBSFContext **pctx) if (ctx->filter->priv_class && ctx->priv_data) av_opt_free(ctx->priv_data); - av_opt_free(ctx); - if (ctx->internal) av_packet_free(&ctx->internal->buffer_pkt); av_freep(&ctx->internal); @@ -112,8 +110,6 @@ int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx) goto fail; } - av_opt_set_defaults(ctx); - /* allocate priv data and init private options */ if (filter->priv_data_size) { ctx->priv_data = av_mallocz(filter->priv_data_size); From patchwork Tue Mar 17 21:31:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18273 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 2057244A6A7 for ; Tue, 17 Mar 2020 23:38:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F318068B4EA; Tue, 17 Mar 2020 23:38:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8E6368AE79 for ; Tue, 17 Mar 2020 23:38:27 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id g62so986869wme.1 for ; Tue, 17 Mar 2020 14:38:27 -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 :mime-version:content-transfer-encoding; bh=C7j7gYrARLXrtRhA0UJiN0da+BXPKg14VXADw4Ipcyw=; b=NfZHtm2CXUkZle9G7X3F3Rkmu310Xw9T9XJpr/YAooxCU9B7kWZsXthOZvKBZJvJDY SK+CXQkoTICXu4SH1E5jAIJaVClaj/dyj5InniTcSyYazzWIuCD+oXvormHlZtHCSFU7 Mbe25bY9R+1QbetnOZXx6D/kBCrL0isYvd2qQT685OEltHnJaEAoeFOtrVNBLr45aTIs 2bTYwyQ+9PjFYL54VTAmT1pZvo4RUTeopBGUponknmnsDjWzw/648y42Ggp+iI3toMg0 6HmQ9TFJhU1ibLLYWrBOeJKSYWhGiapKD0TBONXDFtdJIgjG5h/SxzfJvdGS7lvC9veq 2FdQ== 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:mime-version:content-transfer-encoding; bh=C7j7gYrARLXrtRhA0UJiN0da+BXPKg14VXADw4Ipcyw=; b=Ru4jrmN6q2+D4dWErRRDTF2C1eUbOw2KxciI0GtCXe64l9uJJ+pTx+TYs35f1pLtnA gR29aE99K0TKEAwtvrZsoUXq82bmvS2KU+jonMxOsR5VRxLoPQ+iANsLk45urFGWWVbn klKwJTO4vYD+hl/B+i01Yt1fmnhPtxDBD7+m9m7ABmm5eRBhfrAy4XTvDEo7D72pwUY8 uup+E8jlw4/pdQLb0bHnAtNmyaPdhDc88Bm0N46kpLAz8z9rRQ5/szt74eCByhdTjPBu rf13PSWmHOFwOvnsVoEAs6F1aT8jb1pH85tyUml5R0mUbixMvD6WFoJaKMx0XBZUUifr FkOQ== X-Gm-Message-State: ANhLgQ3gfSV5bwNA6KFYCJmED/9ii3usys2l0dutGgqvL/bUNOQw3O2D NF0QdmTSZCTLWk4JQ15RwgvbSf3n X-Google-Smtp-Source: ADFU+vuNji85IDKlYXLSKKV01H+nvzE0MuhrhlvHemv884q2eSAT/8nl1ZWDaDJN2d22jb2z1SYd6g== X-Received: by 2002:a1c:5401:: with SMTP id i1mr968637wmb.177.1584480731851; Tue, 17 Mar 2020 14:32:11 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id i12sm6269233wro.46.2020.03.17.14.32.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 14:32:11 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Mar 2020 22:31:47 +0100 Message-Id: <20200317213147.1140-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317213147.1140-1-andreas.rheinhardt@gmail.com> References: <20200317213147.1140-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/bsf: Beautify log messages from bitstream filters 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" Up until now, the name of every AVBSFContext for logging purposes was "AVBSFContext", so that the default logging callback produced output like "[AVBSFContext @ 0x55813bae92c0] Extradata". This has been changed to "[trace_headers @ 0x60a000000700] Extradata" by adding an item_name- function to the AVClass for bitstream filters. Furthermore, the correct category has been set so that the introductory part before the actual message (everything before "Extradata" in the above examples) are displayed in a different colour than the rest. Signed-off-by: Andreas Rheinhardt --- libavcodec/bsf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index d0e0d46068..7b96183e64 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -64,12 +64,18 @@ static void *bsf_child_next(void *obj, void *prev) return NULL; } +static const char *bsf_to_name(void *bsf) +{ + return ((AVBSFContext *)bsf)->filter->name; +} + static const AVClass bsf_class = { .class_name = "AVBSFContext", - .item_name = av_default_item_name, + .item_name = bsf_to_name, .version = LIBAVUTIL_VERSION_INT, .child_next = bsf_child_next, .child_class_next = ff_bsf_child_class_next, + .category = AV_CLASS_CATEGORY_BITSTREAM_FILTER, }; const AVClass *av_bsf_get_class(void)