From patchwork Sat Apr 10 21:00:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26840 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 DD45244A5AD for ; Sun, 11 Apr 2021 00:06:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7F7668799C; Sun, 11 Apr 2021 00:06:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF159680A2C for ; Sun, 11 Apr 2021 00:06:51 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id b139so4087553qkc.10 for ; Sat, 10 Apr 2021 14:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EmIPcUQCyANF59at9ep/8qNWiyTs8sZ+vCfMcKDbRuI=; b=A7KEnEtetdRkKytUzVsmHrOm7JQIJSUy7HzTRa9KdUN8f1oixtAkUWe2IdY7Fr+VD7 +tzKKSoRqiS1nHl/S8Axs1+BIJFOFAZLp5gPF0noCFmKx7jkAudTHBWVlPfmVVjG4sH1 Fl4pKBdB90PxJEJrQLYYXO6uG77CONu5CMk7NzgPMOheyUzvLQbSlSZQiOEClYszjCv6 f1nhWqV5WdSR0+1MRbq75kC+F9ZeIDjMdiW7rAxH66wdQUJOJtGkxmMwmS8m7Wikli3A goqdeERU2rSVw8d0QbHgZ0CcIgBh70qth+c0FQWK+aUHTW8i7/w2v65o6bxm7s2iCNvS LAmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EmIPcUQCyANF59at9ep/8qNWiyTs8sZ+vCfMcKDbRuI=; b=oce6o7s+u6IV4yyGyKZtM9fCIDecNvoU1JoRqu8xn39cyyRs5UZo/EkxeySrQGQIJp WkDlVC+vV685+9z369t/Nc9glpK7lGlkVD8aD1GvGGc0ny+0BgYS2cZCVS3wbegbCjq+ dDdjI9vxKyrMCj1nd8WFNwydvkOWWlF4pqfvqtcW+J6gJ+AROWHu7e9+Pg+vqdoLl/j6 AVd8ariN8K4zMF7EEWf7+4820OXtAJ2d0dXECq/p2CRMNvn45K40AJEAEiyosp6igq2E n+92Y0EqiXFA7D62VsZ5sAp3KT/eYp4kMJ/cPkOQnUoplt2Dy7b5d8sLTK2BpU7NndvG SalQ== X-Gm-Message-State: AOAM531vMexrk/go3g5OuVIVigdzH1hEHnFzf07nf54exvzw6woEWEdt uzSYC3r39X/RjOdgxNRMm97uq/DcWZE= X-Google-Smtp-Source: ABdhPJxIuUVbuLxYTvee93ZkXtuzEy1SsAlB312x8uN2zYP4l1wPIpSB9J+tIbY3NNxXdT1gXxptJQ== X-Received: by 2002:a05:620a:914:: with SMTP id v20mr20911286qkv.140.1618088438955; Sat, 10 Apr 2021 14:00:38 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.158]) by smtp.gmail.com with ESMTPSA id 1sm4914759qtu.96.2021.04.10.14.00.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Apr 2021 14:00:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Apr 2021 18:00:21 -0300 Message-Id: <20210410210023.27057-2-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210410210023.27057-1-jamrial@gmail.com> References: <20210410210023.27057-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] ffprobe: only print exported private decoder 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- fftools/ffprobe.c | 2 +- tests/ref/fate/mov-zombie | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 38462e1ff3..8c7b238adf 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2714,7 +2714,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id const AVOption *opt = NULL; while (opt = av_opt_next(dec_ctx->priv_data,opt)) { uint8_t *str; - if (opt->flags) continue; + if (!(opt->flags & AV_OPT_FLAG_EXPORT)) continue; if (av_opt_get(dec_ctx->priv_data, opt->name, 0, &str) >= 0) { print_str(opt->name, str); av_free(str); diff --git a/tests/ref/fate/mov-zombie b/tests/ref/fate/mov-zombie index 1b54c58d04..7b417e59dd 100644 --- a/tests/ref/fate/mov-zombie +++ b/tests/ref/fate/mov-zombie @@ -194,5 +194,5 @@ frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=188623|pkt_pts_time=2. packet|codec_type=video|stream_index=0|pts=197632|pts_time=2.195911|dts=191625|dts_time=2.129167|duration=3003|duration_time=0.033367|size=580|pos=101820|flags=__ frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=191626|pkt_pts_time=2.129178|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=191626|best_effort_timestamp_time=2.129178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=99180|pkt_size=1666|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=63|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleftside_data|side_data_type=H.26[45] User Data Unregistered SEI message -stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|closed_captions=0|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|refs=2|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:rotate=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264 +stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|closed_captions=0|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|refs=2|is_avc=true|nal_length_size=4|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:rotate=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264 side_data|side_data_type=Display Matrix|displaymatrix=\n00000000: 131072 0 0\n00000001: 0 65536 0\n00000002: 0 0 1073741824\n|rotation=0