From patchwork Thu Jul 20 15:45:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 4389 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2316147vsb; Thu, 20 Jul 2017 08:53:22 -0700 (PDT) X-Received: by 10.28.87.205 with SMTP id l196mr2581783wmb.121.1500565999705; Thu, 20 Jul 2017 08:53:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500565999; cv=none; d=google.com; s=arc-20160816; b=Csnj2jK+tVNUH3tVRwhZcKwJjYAk37Kc2fJeM25LtsZWXXtRJ/9SR4fdDW0StEBYwn 9yoo2DJaeMDoyc+3daOE4vSufxFheuhXvGeJmCObpKqYTrZp5sOhXc5At7B9GLhEepO7 EPcBXC8J4PJH85OoW4UL+vXTwDoifita0D7BDZjhzRngFfE9wf8p2sQdtGJw2sHPMeag AgHSUKlu5FH0ayR7p0NSr9+aMyssGmEE8Y/LIebPHu5mC80fQnan99gvb/UESSRtJqar 2KMkNnF3KpkunATrLUJ0uXmGwk1irePUjxh1uoFS1fLaJYyrMmV8EqZbhlmgbnAErKJK rqXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=VWGabdtZPsk86yRn0aYinYxzzemiXMYZs/RCPMvQDyw=; b=j+bhIhjOT+2wLsvI9yPsPBLx/YgHpmNv54b+co6OEe5Ki9be3IxWbKqpMRTPxRtAo+ sjjblDAq8657nDMQ5NSMnXObBBFLvbHcBsMRWxL1sN0C4LjuLruW1SJFcGFRO6oDm195 OFSG9+5/Z6/0dx6kwTOOD2bsnIZ3PKZPIuErg9ESCLbetI6EEK6a3T9zaUQYyDirZgzY O/RK/mmVhqZ9oBcjh0CjKxitoBRTueAKiyc+Hn0qM/gmxEtf0yeW6jSCGyVqoccpE9hf MgRmM6A6Gr34gX4VwVOsugWzfGquDumJcL4Hbr0tiMOx1H3jzjA/St+LtLGtircKhOwb Flww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=ox22zfKc; 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 sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v99si6631423wrb.289.2017.07.20.08.53.19; Thu, 20 Jul 2017 08:53:19 -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 header.b=ox22zfKc; 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 sp=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 5B47C689A05; Thu, 20 Jul 2017 18:53:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f171.google.com (mail-qk0-f171.google.com [209.85.220.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5EBA689949 for ; Thu, 20 Jul 2017 18:53:01 +0300 (EEST) Received: by mail-qk0-f171.google.com with SMTP id t2so12202638qkc.1 for ; Thu, 20 Jul 2017 08:53:09 -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=2GE/8hnQJj7rm6Sy9Juoko77/EvD71pC1+oqfShy8Hg=; b=ox22zfKcizsE9F0rZrK8W2je6DOB13KfyG6NboQZHw0KU3gXvh5dEqyi1QefgNSHkg Zw1ITE2pIqdxGHwdCTuf9MhhQGsqwzGmiul/bNwjNHLX2x837bA3ReSnTwHDz75zXgRl bj3rlBMWK/pIuRza5omjAKhn3c0F51DZKSgh8KFsrKCKFWF4VV3YHKKiZAbu64oH+cGu VIR8zS4pgS+tGWxlPpa3JU7W/zEcANGHDB7+HLsim/T7k41fGmk7x0YqIOAwLNduiiTZ BjteHokDKHhSTjB3g2mAeQ4Qf0ajThABjuTfAo6fAUZP7tm+NrMEB9wCYhHkxvdERpF8 OKng== 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=2GE/8hnQJj7rm6Sy9Juoko77/EvD71pC1+oqfShy8Hg=; b=FbcMLO3u/M008zfsppkUwJoBaKMmvAugULYv+w3Z5cJ1RHY7/CPFfhtXDei8PREA7p suJBRgETSQ3I6rVJdto3DkYj+A/m1wwlIrVc9asxHTS+fKJ8GOaUK6/urng0kOF0Jxo6 s8OFNMkyYjDCcM2O8i6xj3/AEyjSJcUm3CiNpjicVnDXKNLoi1Tv6deyRy2ipriqYqhC dSU0Ru+tuSrkHrsvk4VRPzH3vzGsCoM7LxaqdRKLMhnVlpfw/oey5LhiEIE5mQXt+6NY HuYz5oXmxJJlVCN2u5JNwjp3l7ajqrpq8/KE8Lz1Sjsrf9SMDMxyBT6Oco/FaG+xwIH0 qLLw== X-Gm-Message-State: AIVw110mZxRiFT35oIl49DFX1YL1h6fVP4rPH2ppVIyWWnJXlKODZZaz oZAuowNslZiEJTqg X-Received: by 10.55.27.145 with SMTP id m17mr5594351qkh.298.1500565548489; Thu, 20 Jul 2017 08:45:48 -0700 (PDT) Received: from vimacbookpro.vimeo.iac.corp (93-40-167-184.ip39.fastwebnet.it. [93.40.167.184]) by smtp.gmail.com with ESMTPSA id 59sm1905969qtc.35.2017.07.20.08.45.46 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 20 Jul 2017 08:45:47 -0700 (PDT) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2017 17:45:45 +0200 Message-Id: <20170720154545.28442-1-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170720123827.38649-1-vittorio.giovara@gmail.com> References: <20170720123827.38649-1-vittorio.giovara@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffprobe: Print color properties from show_frames 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" --- Updated according to Tobias' review. Vittorio doc/ffprobe.xsd | 5 +++++ ffprobe.c | 25 +++++++++++++++++++++++++ tests/ref/fate/ffprobe_compact | 16 ++++++++-------- tests/ref/fate/ffprobe_csv | 16 ++++++++-------- tests/ref/fate/ffprobe_default | 40 ++++++++++++++++++++++++++++++++++++++++ tests/ref/fate/ffprobe_flat | 40 ++++++++++++++++++++++++++++++++++++++++ tests/ref/fate/ffprobe_ini | 40 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 166 insertions(+), 16 deletions(-) diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 6d929a1a32..3e58da0f46 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -120,6 +120,11 @@ + + + + + diff --git a/ffprobe.c b/ffprobe.c index f6d9be0df9..3d9f795d2e 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -2105,6 +2105,31 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, print_int("interlaced_frame", frame->interlaced_frame); print_int("top_field_first", frame->top_field_first); print_int("repeat_pict", frame->repeat_pict); + + if (frame->color_range != AVCOL_RANGE_UNSPECIFIED) + print_str("color_range", av_color_range_name(frame->color_range)); + else + print_str_opt("color_range", av_color_range_name(frame->color_range)); + + if (frame->colorspace != AVCOL_SPC_UNSPECIFIED) + print_str("color_space", av_color_space_name(frame->colorspace)); + else + print_str_opt("color_space", av_color_space_name(frame->colorspace)); + + if (frame->color_primaries != AVCOL_PRI_UNSPECIFIED) + print_str("color_primaries", av_color_primaries_name(frame->color_primaries)); + else + print_str_opt("color_primaries", av_color_primaries_name(frame->color_primaries)); + + if (frame->color_trc != AVCOL_TRC_UNSPECIFIED) + print_str("color_transfer", av_color_transfer_name(frame->color_trc)); + else + print_str_opt("color_transfer", av_color_transfer_name(frame->color_trc)); + + if (frame->chroma_location != AVCHROMA_LOC_UNSPECIFIED) + print_str("chroma_location", av_chroma_location_name(frame->chroma_location)); + else + print_str_opt("chroma_location", av_chroma_location_name(frame->chroma_location)); break; case AVMEDIA_TYPE_AUDIO: diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact index 1948697e19..910837d290 100644 --- a/tests/ref/fate/ffprobe_compact +++ b/tests/ref/fate/ffprobe_compact @@ -1,31 +1,31 @@ packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=647|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=647|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=video|stream_index=1|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=2722|flags=K_ -frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2722|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2722|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified packet|codec_type=video|stream_index=2|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=233143|flags=K_ -frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233143|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233143|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=263148|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|best_effort_timestamp=1024|best_effort_timestamp_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263148|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=video|stream_index=1|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=265226|flags=K_ -frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265226|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265226|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified packet|codec_type=video|stream_index=2|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=495650|flags=K_ -frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495650|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495650|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=525655|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|best_effort_timestamp=2048|best_effort_timestamp_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525655|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=audio|stream_index=0|pts=3072|pts_time=0.069660|dts=3072|dts_time=0.069660|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=527726|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|best_effort_timestamp=3072|best_effort_timestamp_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527726|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=video|stream_index=1|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=529804|flags=K_ -frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529804|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529804|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified packet|codec_type=video|stream_index=2|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=760228|flags=K_ -frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760228|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760228|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=790233|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|best_effort_timestamp=4096|best_effort_timestamp_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790233|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=audio|stream_index=0|pts=5120|pts_time=0.116100|dts=5120|dts_time=0.116100|duration=393|duration_time=0.008912|convergence_duration=N/A|convergence_duration_time=N/A|size=786|pos=792304|flags=K_ frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|best_effort_timestamp=5120|best_effort_timestamp_time=0.116100|pkt_duration=393|pkt_duration_time=0.008912|pkt_pos=792304|pkt_size=786|sample_fmt=s16|nb_samples=393|channels=1|channel_layout=unknown packet|codec_type=video|stream_index=1|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=793120|flags=K_ -frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=793120|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=793120|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1023544|flags=K_ -frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1023544|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1023544|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|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|tag:E=mc²|tag:encoder=Lavc pcm_s16le stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|coded_width=320|coded_height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|color_range=N/A|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|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|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=Lavc rawvideo stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|coded_width=100|coded_height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|color_range=N/A|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|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|tag:encoder=Lavc rawvideo diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv index 88c79582f0..90e033f547 100644 --- a/tests/ref/fate/ffprobe_csv +++ b/tests/ref/fate/ffprobe_csv @@ -1,31 +1,31 @@ packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,647,K_ frame,audio,0,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,647,2048,s16,1024,1,unknown packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2722,K_ -frame,video,1,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2722,230400,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2722,230400,320,240,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233143,K_ -frame,video,2,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233143,30000,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,2,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233143,30000,100,100,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263148,K_ frame,audio,0,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263148,2048,s16,1024,1,unknown packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265226,K_ -frame,video,1,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265226,230400,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265226,230400,320,240,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495650,K_ -frame,video,2,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495650,30000,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,2,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495650,30000,100,100,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525655,K_ frame,audio,0,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525655,2048,s16,1024,1,unknown packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527726,K_ frame,audio,0,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527726,2048,s16,1024,1,unknown packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529804,K_ -frame,video,1,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529804,230400,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529804,230400,320,240,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760228,K_ -frame,video,2,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760228,30000,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,2,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760228,30000,100,100,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790233,K_ frame,audio,0,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790233,2048,s16,1024,1,unknown packet,audio,0,5120,0.116100,5120,0.116100,393,0.008912,N/A,N/A,786,792304,K_ frame,audio,0,1,5120,0.116100,5120,0.116100,5120,0.116100,393,0.008912,792304,786,s16,393,1,unknown packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,793120,K_ -frame,video,1,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,793120,230400,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,793120,230400,320,240,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1023544,K_ -frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1023544,30000,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1023544,30000,100,100,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,N/A,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc pcm_s16le stream,1,rawvideo,unknown,video,1/25,RGB[24],0x18424752,320,240,320,240,0,1:1,4:3,rgb24,-99,N/A,unknown,unknown,unknown,unspecified,unknown,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt,Lavc rawvideo stream,2,rawvideo,unknown,video,1/25,RGB[24],0x18424752,100,100,100,100,0,1:1,1:1,rgb24,-99,N/A,unknown,unknown,unknown,unspecified,unknown,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,0,Lavc rawvideo diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default index 067e6049de..bb3cf8a8d2 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -71,6 +71,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [/FRAME] [PACKET] codec_type=video @@ -111,6 +116,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [/FRAME] [PACKET] codec_type=audio @@ -185,6 +195,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [/FRAME] [PACKET] codec_type=video @@ -225,6 +240,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [/FRAME] [PACKET] codec_type=audio @@ -333,6 +353,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [/FRAME] [PACKET] codec_type=video @@ -373,6 +398,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [/FRAME] [PACKET] codec_type=audio @@ -481,6 +511,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [/FRAME] [PACKET] codec_type=video @@ -521,6 +556,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [/FRAME] [STREAM] index=0 diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat index 056bc29761..ac657db1ee 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -64,6 +64,11 @@ packets_and_frames.frame.1.display_picture_number=0 packets_and_frames.frame.1.interlaced_frame=0 packets_and_frames.frame.1.top_field_first=0 packets_and_frames.frame.1.repeat_pict=0 +packets_and_frames.frame.1.color_range="unknown" +packets_and_frames.frame.1.color_space="unknown" +packets_and_frames.frame.1.color_primaries="unknown" +packets_and_frames.frame.1.color_transfer="unknown" +packets_and_frames.frame.1.chroma_location="unspecified" packets_and_frames.packet.2.codec_type="video" packets_and_frames.packet.2.stream_index=2 packets_and_frames.packet.2.pts=0 @@ -100,6 +105,11 @@ packets_and_frames.frame.2.display_picture_number=0 packets_and_frames.frame.2.interlaced_frame=0 packets_and_frames.frame.2.top_field_first=0 packets_and_frames.frame.2.repeat_pict=0 +packets_and_frames.frame.2.color_range="unknown" +packets_and_frames.frame.2.color_space="unknown" +packets_and_frames.frame.2.color_primaries="unknown" +packets_and_frames.frame.2.color_transfer="unknown" +packets_and_frames.frame.2.chroma_location="unspecified" packets_and_frames.packet.3.codec_type="audio" packets_and_frames.packet.3.stream_index=0 packets_and_frames.packet.3.pts=1024 @@ -166,6 +176,11 @@ packets_and_frames.frame.4.display_picture_number=0 packets_and_frames.frame.4.interlaced_frame=0 packets_and_frames.frame.4.top_field_first=0 packets_and_frames.frame.4.repeat_pict=0 +packets_and_frames.frame.4.color_range="unknown" +packets_and_frames.frame.4.color_space="unknown" +packets_and_frames.frame.4.color_primaries="unknown" +packets_and_frames.frame.4.color_transfer="unknown" +packets_and_frames.frame.4.chroma_location="unspecified" packets_and_frames.packet.5.codec_type="video" packets_and_frames.packet.5.stream_index=2 packets_and_frames.packet.5.pts=2048 @@ -202,6 +217,11 @@ packets_and_frames.frame.5.display_picture_number=0 packets_and_frames.frame.5.interlaced_frame=0 packets_and_frames.frame.5.top_field_first=0 packets_and_frames.frame.5.repeat_pict=0 +packets_and_frames.frame.5.color_range="unknown" +packets_and_frames.frame.5.color_space="unknown" +packets_and_frames.frame.5.color_primaries="unknown" +packets_and_frames.frame.5.color_transfer="unknown" +packets_and_frames.frame.5.chroma_location="unspecified" packets_and_frames.packet.6.codec_type="audio" packets_and_frames.packet.6.stream_index=0 packets_and_frames.packet.6.pts=2048 @@ -298,6 +318,11 @@ packets_and_frames.frame.8.display_picture_number=0 packets_and_frames.frame.8.interlaced_frame=0 packets_and_frames.frame.8.top_field_first=0 packets_and_frames.frame.8.repeat_pict=0 +packets_and_frames.frame.8.color_range="unknown" +packets_and_frames.frame.8.color_space="unknown" +packets_and_frames.frame.8.color_primaries="unknown" +packets_and_frames.frame.8.color_transfer="unknown" +packets_and_frames.frame.8.chroma_location="unspecified" packets_and_frames.packet.9.codec_type="video" packets_and_frames.packet.9.stream_index=2 packets_and_frames.packet.9.pts=4096 @@ -334,6 +359,11 @@ packets_and_frames.frame.9.display_picture_number=0 packets_and_frames.frame.9.interlaced_frame=0 packets_and_frames.frame.9.top_field_first=0 packets_and_frames.frame.9.repeat_pict=0 +packets_and_frames.frame.9.color_range="unknown" +packets_and_frames.frame.9.color_space="unknown" +packets_and_frames.frame.9.color_primaries="unknown" +packets_and_frames.frame.9.color_transfer="unknown" +packets_and_frames.frame.9.chroma_location="unspecified" packets_and_frames.packet.10.codec_type="audio" packets_and_frames.packet.10.stream_index=0 packets_and_frames.packet.10.pts=4096 @@ -430,6 +460,11 @@ packets_and_frames.frame.12.display_picture_number=0 packets_and_frames.frame.12.interlaced_frame=0 packets_and_frames.frame.12.top_field_first=0 packets_and_frames.frame.12.repeat_pict=0 +packets_and_frames.frame.12.color_range="unknown" +packets_and_frames.frame.12.color_space="unknown" +packets_and_frames.frame.12.color_primaries="unknown" +packets_and_frames.frame.12.color_transfer="unknown" +packets_and_frames.frame.12.chroma_location="unspecified" packets_and_frames.packet.13.codec_type="video" packets_and_frames.packet.13.stream_index=2 packets_and_frames.packet.13.pts=6144 @@ -466,6 +501,11 @@ packets_and_frames.frame.13.display_picture_number=0 packets_and_frames.frame.13.interlaced_frame=0 packets_and_frames.frame.13.top_field_first=0 packets_and_frames.frame.13.repeat_pict=0 +packets_and_frames.frame.13.color_range="unknown" +packets_and_frames.frame.13.color_space="unknown" +packets_and_frames.frame.13.color_primaries="unknown" +packets_and_frames.frame.13.color_transfer="unknown" +packets_and_frames.frame.13.chroma_location="unspecified" streams.stream.0.index=0 streams.stream.0.codec_name="pcm_s16le" streams.stream.0.profile="unknown" diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index a89b43a71d..37e1563c38 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -73,6 +73,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [packets_and_frames.packet.2] codec_type=video @@ -113,6 +118,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [packets_and_frames.packet.3] codec_type=audio @@ -187,6 +197,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [packets_and_frames.packet.5] codec_type=video @@ -227,6 +242,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [packets_and_frames.packet.6] codec_type=audio @@ -335,6 +355,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [packets_and_frames.packet.9] codec_type=video @@ -375,6 +400,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [packets_and_frames.packet.10] codec_type=audio @@ -483,6 +513,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [packets_and_frames.packet.13] codec_type=video @@ -523,6 +558,11 @@ display_picture_number=0 interlaced_frame=0 top_field_first=0 repeat_pict=0 +color_range=unknown +color_space=unknown +color_primaries=unknown +color_transfer=unknown +chroma_location=unspecified [streams.stream.0] index=0