From patchwork Sat Sep 18 22:10:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30365 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp214154iob; Sat, 18 Sep 2021 15:10:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvbw2XUYwb+cHz+SvCpyZOze30hJ8JfmX1crrtirccAJZySqP2F3xt+yL6eiNSMs/ocX3Q X-Received: by 2002:a17:906:660f:: with SMTP id b15mr19778301ejp.491.1632003024003; Sat, 18 Sep 2021 15:10:24 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v14si11037541edf.579.2021.09.18.15.10.23; Sat, 18 Sep 2021 15:10:23 -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=@hotmail.com header.s=selector1 header.b=RStjKkR9; arc=fail (body hash mismatch); 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=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A73068AE9B; Sun, 19 Sep 2021 01:10:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2098.outbound.protection.outlook.com [40.92.41.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE82668AE13 for ; Sun, 19 Sep 2021 01:10:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fFBig9jdxiF4ULskuqfy6k2AOsLOUKZIiVQhsvpdN3ntKPRFdZVf+VBsBPjNRMUzFVdmWvZbOkC3cMPj9V+Q/kb5J/AIsk9a3L2KFo8gNXwVyqrfg2tfu8LqVZv4+B/Sz2U1vcUd0DyqFND+0nZ5Lh7G5uuVCPgXLIPfBmdGQMaiOd79SWCJ3IB9GG5ipaTDOW2ekqJGPyoFiugGvxNsQi+u8IlhFDFbkOoTUXq4zIujZHKAnigNIE4hEY2j+dpLeaC3KvUNehK6J2XLE+hPWC1FHSt/beYYwYRyOyvnioSjWC/0wBlQPEI6U0fR5uSFyc5pCtTklNQjLjntaQDoVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=nDlbwDc4uHxeumywC51tPjT9ck7tqA8vwc2HEM4ecsY=; b=J1Il7fMwESChngFhe2eKQwU99ZT+x4RG8cctxtYe5d1FhIDAyWI9q7enDFZcfDlBacKv07uIlx+OhSlNskG9hbzFQIBFECAwllpoJX05Ti/u8Ejj2qYByyyIWWygTBBMTN1srO6mj+eRBeaXoHW36+r7ZXO0e9TTRf130LtmC0zLytieACQxeeoFJ4sK+IYUlWS1zwAL7hf1HHhmYc6/noR0FsWGV+2sPczOtuRgtR0RvgngLrgl8E+tAk5pXqovBO2/XrLhWwL00d+fig61lNq3UnlZdRxyDVd7CheRIz3z+ZVb/GkEcxNWeXt9LOogRIm5a5TPVMvDC++JEv+0CQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nDlbwDc4uHxeumywC51tPjT9ck7tqA8vwc2HEM4ecsY=; b=RStjKkR95sYy40rJcJJoJuTImSdXziwCTW528K4+9ORvj9UJ9/Hc6AL8lc1cJ2xgNHk51XUfYEGFk3cKsc5d0xTjjwNXmdWg30+WDKRcyimw/C+8YdMOiyyadpiFYMAnPGDxvwJ4yN2ocrF6Dm8MXGkpi/HcLbx4lWIwFKNii0uAwbSCInmFUjLiLS7rcQ9MWGowouLJdOUGSlqpQlnGKiBtB452pS33lFHL72sq7sv8tGctG0Ple9aaF+NVi8qpBIovgexzt8GVGUJWx6pNbS+h2WHU3a8qcoP9LP00QXVEtZCPeyKNHrMqDMmtrYUZtDKykXSWMI+gijFUzKl2sg== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5600.namprd04.prod.outlook.com (2603:10b6:208:fd::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Sat, 18 Sep 2021 22:10:11 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4523.018; Sat, 18 Sep 2021 22:10:11 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v2 2/2] ffprobe: Fix incorrect display of closed_captions property Thread-Index: AQHXrNnzsl5FiNc8KUat9EyAvFMKig== Date: Sat, 18 Sep 2021 22:10:11 +0000 Message-ID: References: <4ba51d5721808c3d286b89b4d31193c2dfd7721d.1632002844.git.softworkz@hotmail.com> In-Reply-To: <4ba51d5721808c3d286b89b4d31193c2dfd7721d.1632002844.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [+58RxlLEbhimOHK0OjC3Mar1vpBLP8Z3] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d0de64f5-d8cb-4a15-e8f6-08d97af115b7 x-ms-traffictypediagnostic: MN2PR04MB5600: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: lQrpMR0uEf0sR3aLj0uQKPeVRuGjizYiM1fkQLjL+gdr7pPVsnvNvORvZHvjXtrjuO5JY/j613xa7Eeuby8UXbYms30k6MaH43PH+qpqzXAHmE2dOfTeD5yYVFl/gFDlbbvYXXDOcJtAFpLMe93V5keS3Yjy2Ov1Ir/oFp+E4PzpMfuCQgFaR+VJV23VCi42ptcnTaVdl6hPwac8Tevnag8SMuP8nZk7GCrWczajD4cUQKOaO05cT0d6oVR7oz5Q3uFPObrmiTcqXYdPj6aR8omqX2CD7QfuKggRjixxTwhxoUPFs4rk0nXtfBSBoVEc7UdhUofOwQtlNnA/JAhPPBOZgyuQ7mvs9auVeYpcRKn3TlKm+E0+0+Eh3j0gsDXioA4Xp5ZCAlwQvDGhkVtcisIgNCgxUdHOFsZ7iwkHafG7X/MSVSvu5N+1Hvi2+CTTCJfHUoCfVSGr9FBvELo45GEy9YMJb2M09Z2J3v3IpFo= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 0xhEZ1uBDUHu+zNV/bDxkn96BTJEm2A1TzDw1oHhfRlBNt60sY9x/s/oX0a2L0v/60Ewu4Tdi/KDcJygFyHNkzJ9z0lKWwFNFSPkO5x15wVDnz7aDL+gVdQSl1vB414odpQmOHP39YpiUJ2ltLEHeQ== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: d0de64f5-d8cb-4a15-e8f6-08d97af115b7 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Sep 2021 22:10:11.8857 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB5600 Subject: [FFmpeg-devel] [PATCH v2 2/2] ffprobe: Fix incorrect display of closed_captions property X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: OKWO2CV29A9k Repro Example: ffprobe -show_entries stream=closed_captions:disposition=:side_data= "http://streams.videolan.org/streams/ts/CC/NewsStream-608-ac3.ts" While the codec string includes "Closed Captions", the stream data is showing: closed_captions=0 The test ref was incorrect as the test media file actually does have cc. Signed-off-by: softworkz --- v2: Fix test result. It was undiscovered locally as make fate does not seem to properly rebuild ffprobe. fftools/ffprobe.c | 5 +++-- tests/ref/fate/ts-demux | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) stream|index=1|codec_name=ac3|profile=unknown|codec_type=audio|codec_tag_string=[4][0][0][0]|codec_tag=0x0004|sample_fmt=fltp|sample_rate=48000|channels=6|channel_layout=5.1(side)|bits_per_sample=0|id=0x34|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=3912633305|start_time=43473.703389|duration_ts=14400|duration=0.160000|bit_rate=384000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=5|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|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:language=eng stream|index=2|codec_name=ac3|profile=unknown|codec_type=audio|codec_tag_string=[4][0][0][0]|codec_tag=0x0004|sample_fmt=fltp|sample_rate=48000|channels=2|channel_layout=stereo|bits_per_sample=0|id=0x35|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=3912634060|start_time=43473.711778|duration_ts=14400|duration=0.160000|bit_rate=192000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=5|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|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:language=es diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 880f05a6c2..9425c1a2e3 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2678,10 +2678,11 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id print_int("width", par->width); print_int("height", par->height); if (dec_ctx) { + unsigned codec_properties = av_stream_get_codec_properties(ist->st); print_int("coded_width", dec_ctx->coded_width); print_int("coded_height", dec_ctx->coded_height); - print_int("closed_captions", !!(dec_ctx->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS)); - print_int("film_grain", !!(dec_ctx->properties & FF_CODEC_PROPERTY_FILM_GRAIN)); + print_int("closed_captions", !!(codec_properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS)); + print_int("film_grain", !!(codec_properties & FF_CODEC_PROPERTY_FILM_GRAIN)); } print_int("has_b_frames", par->video_delay); sar = av_guess_sample_aspect_ratio(fmt_ctx, stream, NULL); diff --git a/tests/ref/fate/ts-demux b/tests/ref/fate/ts-demux index 8e7a81da41..1d1382cf37 100644 --- a/tests/ref/fate/ts-demux +++ b/tests/ref/fate/ts-demux @@ -41,7 +41,7 @@ packet|codec_type=audio|stream_index=2|pts=3912642700|pts_time=43473.807778|dts= packet|codec_type=video|stream_index=0|pts=3912686363|pts_time=43474.292922|dts=3912686363|dts_time=43474.292922|duration=1501|duration_time=0.016678|size=4944|pos=506660|flags=__|data_hash=CRC32:54a86cbb packet|codec_type=audio|stream_index=1|pts=3912644825|pts_time=43473.831389|dts=3912644825|dts_time=43473.831389|duration=2880|duration_time=0.032000|size=906|pos=474888|flags=K_|data_hash=CRC32:0893d398 packet|codec_type=audio|stream_index=2|pts=3912645580|pts_time=43473.839778|dts=3912645580|dts_time=43473.839778|duration=2880|duration_time=0.032000|size=354|pos=491808|flags=K_|data_hash=CRC32:f5963fa6 -stream|index=0|codec_name=mpeg2video|profile=4|codec_type=video|codec_tag_string=[2][0][0][0]|codec_tag=0x0002|width=1280|height=720|coded_width=0|coded_height=0|closed_captions=0|film_grain=0|has_b_frames=1|sample_aspect_ratio=1:1|display_aspect_ratio=16:9|pix_fmt=yuv420p|level=4|color_range=tv|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=left|field_order=progressive|refs=1|id=0x31|r_frame_rate=60000/1001|avg_frame_rate=60000/1001|time_base=1/90000|start_pts=3912669846|start_time=43474.109400|duration_ts=19519|duration=0.216878|bit_rate=15000000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=15|extradata_hash=CRC32:53134fa8|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|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0 +stream|index=0|codec_name=mpeg2video|profile=4|codec_type=video|codec_tag_string=[2][0][0][0]|codec_tag=0x0002|width=1280|height=720|coded_width=0|coded_height=0|closed_captions=1|film_grain=0|has_b_frames=1|sample_aspect_ratio=1:1|display_aspect_ratio=16:9|pix_fmt=yuv420p|level=4|color_range=tv|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=left|field_order=progressive|refs=1|id=0x31|r_frame_rate=60000/1001|avg_frame_rate=60000/1001|time_base=1/90000|start_pts=3912669846|start_time=43474.109400|duration_ts=19519|duration=0.216878|bit_rate=15000000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=15|extradata_hash=CRC32:53134fa8|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|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0 side_data|side_data_type=CPB properties|max_bitrate=15000000|min_bitrate=0|avg_bitrate=0|buffer_size=9781248|vbv_delay=-1