From patchwork Tue May 19 14:54:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19775 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 6A2CB44A4FC for ; Tue, 19 May 2020 17:54:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DDF1688118; Tue, 19 May 2020 17:54:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9680F6880AA for ; Tue, 19 May 2020 17:54:50 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id x15so28521pfa.1 for ; Tue, 19 May 2020 07:54:50 -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=SbOghiAiE/DYuOG52rfKPC4KCCC2I0LuJd7/9FNWw28=; b=pcCaGmh7z/Sefcdktw1hn7m9wAZ4ZSmKM0MkRUkCJCT9oObXi6MWwTYef6BN5Jq12e MGUuORHOsRN3biyvlmNdFhCrtIJ7/OM03PnYCEg6QRefwImm5HuPAk80R2RhwD1oiQ9D w0+xiZGTboPMOy4TXtNlgztd72mE2vMBkTvqo63CeXzhfQQOvmsP3309CQ6fCc5EmsTj V1bWn/hwg4XZwQXKpf9ay5arktlm44j/nOF1ELk2ev2y/WxL9KbNpo3p08/zqWgYnlwE 2WfCEJHvr6mecwInaq2ZnDF8LgoYLkNeIdxK7uTsGm/NeM3F30WyUwagJN7qdJYH6Ug4 IgZw== 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=SbOghiAiE/DYuOG52rfKPC4KCCC2I0LuJd7/9FNWw28=; b=XXcHQj24ZGsxFWhx2SBKRmgdfIpYSblMRESAIe8NkPf7h6pQIho3mdi7ommjsoa9XQ JoyCPJ20mjD1RQOGH8C732ilxvGytpFtrNhiIyA2Y/VkAriRUpt4y8llf6bPartu07Jh cr3JDWxtPt0KPvj00cx053c7Uue5HZ9OwSyX7nKtPdydK1N53gpfAKFqLVymA2VIPr3X 11a60MGLG3I6IfyAqFQA8154YfzVT7OlnRfmQkeZKq0QWKIlIPLbg6S3a4GpsacIS2kL gQxClPxUQ8DN4AhB7Prr6TF9sRl3WgKDmEaxVLNisCQBBDft3YqbLSUibhsdHG1L8549 GK7w== X-Gm-Message-State: AOAM531bw7rGpiiU2qtzSTSsYgN58GNjyhX5XdU7vj5oMZtB2vEGu8K2 cuIc8I8m/oM4Wi757hIhCjmaN/d3 X-Google-Smtp-Source: ABdhPJwMh1ZHUempvyGQFsnFpE0FPYQwYNVkq0hX2Z4Hg/MGhOAu8JXsDmqBNITq9fXNyU5QNtqWLg== X-Received: by 2002:a63:30c2:: with SMTP id w185mr19355452pgw.353.1589900088272; Tue, 19 May 2020 07:54:48 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id k18sm6549249pfg.217.2020.05.19.07.54.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 May 2020 07:54:47 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 May 2020 22:54:33 +0800 Message-Id: <1589900073-4183-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589900073-4183-1-git-send-email-lance.lmwang@gmail.com> References: <20191126014130.15052-1-lance.lmwang@gmail.com> <1589900073-4183-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/2] avdevice/lavf: change the dumpgraph option to bool type 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 dumpgraph option currently uses string types, but actually only requires bool type Signed-off-by: Limin Wang --- doc/indevs.texi | 2 +- libavdevice/lavfi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index 6f5afaf..0ce61f2 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -974,7 +974,7 @@ filters. Syntax of the filtergraph is the same as the one specified by the option @var{graph}. @item dumpgraph -Dump graph to stderr. +Dump graph to stderr. Boolean value, by default disabled. @end table diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index c949ff7..57c3070 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -47,7 +47,7 @@ typedef struct { AVClass *class; ///< class for private options char *graph_str; char *graph_filename; - char *dump_graph; + int dump_graph; AVFilterGraph *graph; AVFilterContext **sinks; int *sink_stream_map; @@ -301,7 +301,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) goto end; if (lavfi->dump_graph) { - char *dump = avfilter_graph_dump(lavfi->graph, lavfi->dump_graph); + char *dump = avfilter_graph_dump(lavfi->graph, NULL); if (dump != NULL) { fputs(dump, stderr); fflush(stderr); @@ -493,7 +493,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) static const AVOption options[] = { { "graph", "set libavfilter graph", OFFSET(graph_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "graph_file","set libavfilter graph filename", OFFSET(graph_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC}, - { "dumpgraph", "dump graph to stderr", OFFSET(dump_graph), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, + { "dumpgraph", "dump graph to stderr", OFFSET(dump_graph), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC }, { NULL }, };