From patchwork Sun Sep 13 04:40:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 22328 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 2ABE944B427 for ; Sun, 13 Sep 2020 07:48:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B86168BBD2; Sun, 13 Sep 2020 07:48:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80FAC68BB72 for ; Sun, 13 Sep 2020 07:48:07 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id k18so8120747wmj.5 for ; Sat, 12 Sep 2020 21:48:07 -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; bh=SkGcdO0KW9zMoJDUKiLDNP8T/Yz21c7CPZRknkNSYr8=; b=UXbjeJv1dMj+OYwY52z4r0VndOYDrOlLE5Jw0y6SgOlONXjveUXlztLHMyP0cS4Qnk /fmexA7mBds9GeshDqCQ9/mDDGhpGYoeFG+H/GW4/qMSKwNeJDPm5mVNI4++YqK+tBsz T9A9sgKp/zwhxUimim/DN/fiibombbg1S61TEdk62w+KrVTAJxtGKojBCUGDkv3Gz4iM 9TmteZnaNF8u2acxEny8g0MNgP85LuqyeDtrfsYdJlNl7g2pK8MGjOQVdR0UswqljYL8 cbl/7nJ7LewRDI9/U1YNGPOdNVgJethqZpGugkPXskKXUR0s0Y1l2o8A4Eur/4HjYGXP 92sQ== 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=SkGcdO0KW9zMoJDUKiLDNP8T/Yz21c7CPZRknkNSYr8=; b=D7eTWSW8UtyuYHOkGfDCngCS6gG6vXd84XJcb5hvfJYMoEpovFQRPjdskWVcpA8/mR umlcwevqZRQiStwC8ajO1fYpmDq6oZDQccbRCxc0WYbdP1Tm1ZUc1wVGde+jItJrpfS6 oLqL8LNhpC1x+7sH0wQ5DinhFbrlvNYeMb/ofMRMX9r1Mm/WkNQeBl3ybx6mgGPzyU53 cLHlTQI0NP8ncglIrsFNWbluooBuAI2CTE9IqVzevSOvGMVhm/FVJbsbKZQDc+hKO00M r5k+a9MDMdG+fhFKS/sZTXP6PC7sisld3SXr1gTJFa0hGRDSS1R64Dr56EUxd9fVk9fN HSUA== X-Gm-Message-State: AOAM533+QGqEI1nVMsW1twbb87GUQp8zukhlLO8q6t50O3B82/f3AmCX vZNEk27E9HlmJWRaEh+Ir168Xc1rcY3tDA== X-Google-Smtp-Source: ABdhPJzTvAqjwmjc8Jk9nRrRLPBDiPqOZk5enP8B9+I5KxgT83xP4tUZRuJwXGza/XAVuVrfvhO/cQ== X-Received: by 2002:a05:600c:215:: with SMTP id 21mr9196852wmi.105.1599972068413; Sat, 12 Sep 2020 21:41:08 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id x24sm13169177wrd.53.2020.09.12.21.41.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Sep 2020 21:41:07 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 12:40:44 +0800 Message-Id: <1599972045-11361-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/2] lavfi/drawtext: Add reinit to debug message 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Add reinit flag to debug message, it's help to debug sending commands to drawtext. Signed-off-by: Jun Zhao --- libavfilter/vf_drawtext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index abe1ca6..19e73b7 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1536,10 +1536,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) draw_text(ctx, frame, frame->width, frame->height); - av_log(ctx, AV_LOG_DEBUG, "n:%d t:%f text_w:%d text_h:%d x:%d y:%d\n", + av_log(ctx, AV_LOG_DEBUG, "n:%d t:%f text_w:%d text_h:%d x:%d y:%d reinit:%d\n", (int)s->var_values[VAR_N], s->var_values[VAR_T], (int)s->var_values[VAR_TEXT_W], (int)s->var_values[VAR_TEXT_H], - s->x, s->y); + s->x, s->y, s->reinit); return ff_filter_frame(outlink, frame); } From patchwork Sun Sep 13 04:40:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 22329 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 AAC1344BD0C for ; Sun, 13 Sep 2020 08:12:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7EAF268BBAC; Sun, 13 Sep 2020 08:12:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 906AC68BA84 for ; Sun, 13 Sep 2020 08:12:05 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id k15so15162942wrn.10 for ; Sat, 12 Sep 2020 22:12:05 -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=LaLZOEIZk4ydeFIi83iFDfS5s+xbfWDcD/7Lr6Z9rVI=; b=czL8XdIfKP4+rO+K5DxX4KoqRVqFXPnIif+e4Zu0MMBq22iWOYR+V2IPuMGjJecNmr 0FBvIafmPhTRH0h5f3Bpttda4oPuQd90gHAIpL+o7Le8Lj1vcH2qtqA9ktA1ug2akie2 LFK6XLN1/ZhIPtGVjxh3UF6RKiMDkrAwS5tyXn2vxlwxCrZOXfiOMygHeYpN4VslhBC1 z2qr9mmgjTQBFtZM3UhbLRyJWVVBn+wPPiOZa6DvSLDebWonXnPoZG3R3hdkiklz1w3f 9k+qtdYwDQw7cdyCD5sfUDG5oDPijzhLchIrX0ZvuC3g0GQteD062GeoHydmUfpG95AF IAuQ== 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=LaLZOEIZk4ydeFIi83iFDfS5s+xbfWDcD/7Lr6Z9rVI=; b=gCqhwnDE1+XXOg/MLfcNsVotG/3h6eeBwNLrK4vBAWdBJRFMfaufnv++PMMHELCfvf uszQwe/j+Ba3NV/6lIJshm9/YL/8n/AUvdpFG+cXxv+JqSS8yj1R3t1r9doTL9wC3e9h sLtsdHaCFv615rYfUPk4DP+jkwfmBUd4Zlz7PGvHf0v6CI9yRpsrvxlqby+CUWnXO8C4 x6ANRQ6w7vw9BiD2dgeHB5c0zFs3uh9Dbk19qyV7RpRo+Zfd3wzGyJEkELW502UqgkID 2jRFEn6sPwPVumgJCSpvG23n1Dep44BQozZrxmeDPznn+qKAg5ANqykWGt73SyBCr324 ODmg== X-Gm-Message-State: AOAM5309sPq6FL1uV787x9TUEtRJo4FwuvBtBVzAzuKp0FNq5Musg5xx QFbOGi94WPt3UDhWJd+G5F6v9nZXBYgLPQ== X-Google-Smtp-Source: ABdhPJyZOoWS7KjjYLP2+NwsR9Nkzwq3iFYynqlAAs6iSuT8OnuxR7rdCv2gaprGr1iFHFmdkFZ5/g== X-Received: by 2002:a5d:60d0:: with SMTP id x16mr9355503wrt.196.1599972068865; Sat, 12 Sep 2020 21:41:08 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id x24sm13169177wrd.53.2020.09.12.21.41.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Sep 2020 21:41:08 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 12:40:45 +0800 Message-Id: <1599972045-11361-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1599972045-11361-1-git-send-email-mypopydev@gmail.com> References: <1599972045-11361-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavfi/sendcmd: correct the option flags dump 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao correct the option flags dump for sendcmd/asendcmd. Signed-off-by: Jun Zhao --- libavfilter/f_sendcmd.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/libavfilter/f_sendcmd.c b/libavfilter/f_sendcmd.c index 6b02669..5e4c891 100644 --- a/libavfilter/f_sendcmd.c +++ b/libavfilter/f_sendcmd.c @@ -103,14 +103,6 @@ typedef struct SendCmdContext { } SendCmdContext; #define OFFSET(x) offsetof(SendCmdContext, x) -#define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_VIDEO_PARAM -static const AVOption options[] = { - { "commands", "set commands", OFFSET(commands_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS }, - { "c", "set commands", OFFSET(commands_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS }, - { "filename", "set commands file", OFFSET(commands_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS }, - { "f", "set commands file", OFFSET(commands_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS }, - { NULL } -}; #define SPACES " \f\t\n\r" @@ -574,7 +566,14 @@ end: #if CONFIG_SENDCMD_FILTER -#define sendcmd_options options +#define VFLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM +static const AVOption sendcmd_options[] = { + { "commands", "set commands", OFFSET(commands_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, VFLAGS }, + { "c", "set commands", OFFSET(commands_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, VFLAGS }, + { "filename", "set commands file", OFFSET(commands_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, VFLAGS }, + { "f", "set commands file", OFFSET(commands_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, VFLAGS }, + { NULL } +}; AVFILTER_DEFINE_CLASS(sendcmd); static const AVFilterPad sendcmd_inputs[] = { @@ -609,7 +608,14 @@ AVFilter ff_vf_sendcmd = { #if CONFIG_ASENDCMD_FILTER -#define asendcmd_options options +#define AFLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_AUDIO_PARAM +static const AVOption asendcmd_options[] = { + { "commands", "set commands", OFFSET(commands_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AFLAGS }, + { "c", "set commands", OFFSET(commands_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AFLAGS }, + { "filename", "set commands file", OFFSET(commands_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AFLAGS }, + { "f", "set commands file", OFFSET(commands_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AFLAGS }, + { NULL } +}; AVFILTER_DEFINE_CLASS(asendcmd); static const AVFilterPad asendcmd_inputs[] = {