From patchwork Wed Oct 6 02:09:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30917 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp6001170iob; Tue, 5 Oct 2021 19:10:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzC5DgNX4dIxFEz9shSwQwSFNyy9Ku3Azik+tiW8hSuzO6FShFyKXvKfbQfS0aBGprIg/hF X-Received: by 2002:a05:6402:143b:: with SMTP id c27mr31605550edx.224.1633486237277; Tue, 05 Oct 2021 19:10:37 -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 dd10si13851936ejc.222.2021.10.05.19.10.14; Tue, 05 Oct 2021 19:10:37 -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=WhjwK8CN; 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 6FBB168AA49; Wed, 6 Oct 2021 05:10:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2066.outbound.protection.outlook.com [40.92.19.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3996B68A767 for ; Wed, 6 Oct 2021 05:09:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bx6poODxCJ7ix6KVSa2MTlag1hWb9BR/0YK9/uwpWXeNuAm/FBMDXcOUmWwpwvCxr4X7qe7EAQ1ZR3JZS+2UxpPu7xGdBhWEHh8PHaWWfzzYOylFNGFcslD2YIlgFTr5TornERV9oq+Y0RIXwQBAQWv4vBCqAVMEvJxFzU6U5RgN1Eb85rqJXvId/u7O9ehkC7mXfB5mDmqp8XCD1pbow8wcs/USn4TDLdzTv+mMoVg9A5+6RyUfZ7cJWwzvQNaCRXs1JyIk5+QEhPixAM40fcgBROipToId+kxgBDVfmN3UhqKuy88wBKXkWjQLX8vSkDuwH6xqZNvtYLjtiWEttw== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WrbJCWExHMMr0UOeHVxVmORXKuJQoX/7U95W3UT2PKs=; b=fLuyvqBizmZdc9g30Wby+Gc/oiLbA+/86ecG2yv4C1ViT5U49qnZOzIrnGc5bLjG+qpTLObK25K0wHsVfJXyLsd46MLHmIGA05Evefn/ycfF1H+JJ6KJfinPpiizzRLMQ+LDBhFZTUIGi02LVTTumyXVPFra/ORId5Zco06kNG2s5g/b6H7FTo4ghs+ddmihryx1+rhkjsU6UotuVt5gu7GHfZesTPI+bh1BK5aCopjGnRdHicf8pHZ9IIByPMpqsQVPNT+n+e4oYFErNMEkIU32cmgW+qq3vMB1vXc8xgUHXAiu60mHp3+fLDKJB6BA3FXPvzfOlWBFj6GDXSBT6w== 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=WrbJCWExHMMr0UOeHVxVmORXKuJQoX/7U95W3UT2PKs=; b=WhjwK8CN+FvfQwg5eIhCVkemlWNFup+HnrcV02akm94/9nBTUUN1LigfjNSgONb9362XXU7rzh0S0OIhfjwoGhfbI25NFj6Cyjw5Au274zXP8uN7FSeSkRomCetquS4t+qUDODBicIL3sfZsUdoN8poD/jAUwOyi/FFlH71gU1/x+mCJPJUI5XJxDXVPX3xG+MSlee1AYAbENQl1MR7/vCuo1eq4zFNokZGhBQPc8plU5XLjBqAmy8aZZXxf+jghNU1xeRcXgnaicxmdCwIG8d7dlF4F5up51aYQnSi8WOyyYPh4k1IZBFrLe5x+CKDRfzgke6DDNLZMQa5pAGgG6A== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6239.namprd04.prod.outlook.com (2603:10b6:208:e0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.19; Wed, 6 Oct 2021 02:09:54 +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.4566.022; Wed, 6 Oct 2021 02:09:54 +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: AQHXuldAqNflOErRX0ygjDpdxrn6/A== Date: Wed, 6 Oct 2021 02:09:54 +0000 Message-ID: References: <040e8c5c19f2401063bc180fac0b1364c6941ea2.1633486022.git.softworkz@hotmail.com> In-Reply-To: <040e8c5c19f2401063bc180fac0b1364c6941ea2.1633486022.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: [105vm2TC50/F5KnZNYKUX8aTx2T5JKW+] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: bd46780c-ebb6-4d9f-c9fe-08d9886e6383 x-ms-traffictypediagnostic: MN2PR04MB6239: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: KQG0yeZnZgACQpBQR0iBNUgKJ6IA90kgCunS96bIAMmw4pT97vADubf75BRN9eqTc0xAZY1lWkCl1CU0jp906CoGSQHcpadstR7VAfUfdnqFdPimSAg+227mUlAGc0pYe+f80jSAkzwacxbnp0hyYjkqAMQpnDYDl3WV/NbIM/XjyS+qz1AD3Jz0AKe1vJM8sjg2bfaRCVShYsUK+18ES1ihM2d537oarVM4SdTEwes3lBonHkifpOAYC5XU9Xy08UzTQXjH9xlxROliJ0ZS1tjAHGtDGm9fciMyrPC+MbvrNr3ZVCKrhi6Wokx3valYUDkHD3gkFM1r5+IJOkLFb2jZu/3KhoJ6RvF4BJ+dDW2U8cOIWLOnBIyafnLZc20jK7XYJ6mgw7I9HhtA05O5a3DKX58by7ecYkUBsPzgE7/KBWKI/+uPYGgf1To5TBAFFIwRUucZ8rhYxbR89BjfwsALszvDhx8t8XZKEnbaZEM= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: D7aPypaoWijR4naAfSn1bs98vT7etnJ3DfhIrW1IbbTgcI/IMlvSWGcXdPhXgF54CRH5WTqrAETcscKIG1LtkBVLG3/hCUH7Dmr+RsnYkHKAgm3dyJzDcED0zmI1ZwZXd2qTpDF1jhydKVo+npUXEg== 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: bd46780c-ebb6-4d9f-c9fe-08d9886e6383 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 02:09:54.6267 (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: MN2PR04MB6239 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: /LCuciR+i4E6 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 --- fftools/ffprobe.c | 4 ++-- tests/ref/fate/ts-demux | 2 +- 2 files changed, 3 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 90e895bbf9..f5c6335a13 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2655,9 +2655,9 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id if (dec_ctx) { 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", !!(par->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS)); + print_int("film_grain", !!(par->properties & FF_CODEC_PROPERTY_FILM_GRAIN)); print_int("has_b_frames", par->video_delay); sar = av_guess_sample_aspect_ratio(fmt_ctx, stream, NULL); if (sar.num) { 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