From patchwork Sat Sep 18 21:29:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30362 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp194765iob; Sat, 18 Sep 2021 14:29:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgdOhmFaXDfyIaomzdVCGsHbW427NTwJfBfcfYRVjtQS3c1MznBdHiT0McU7jFgCuDYIMQ X-Received: by 2002:a05:6402:1c95:: with SMTP id cy21mr20493094edb.397.1632000576993; Sat, 18 Sep 2021 14:29:36 -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 25si3451543ejg.15.2021.09.18.14.29.36; Sat, 18 Sep 2021 14:29:36 -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=VtbmC9S4; 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 D0A6868AE3D; Sun, 19 Sep 2021 00:29:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12olkn2049.outbound.protection.outlook.com [40.92.22.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C745968AC48 for ; Sun, 19 Sep 2021 00:29:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JqraFqw5mQC4ze0Z1XNU6zPzbhaIE2EiIP09xxdqpSrJg3M2y/maaL2XKVspnSOxcfoiD6oE/0BiCno3nH8TE3kmislsKDVVWU89h7t/Pg8i1WjvI9QJklZzy9TV93mzDguw+JIk76g8ern4jfu9XVDOpxQ3j/ds7zPGIijKr+xk1FhCNRO8xvL1zXIyMNrU7UUn2dUshBGigpN1z40cbBXO4dG1rnz71k7tXpJ8ZeDfszGw76PKu0kZYkE/QjHbsv0xZb4FjCeMwqwDMMfuq/asrrH1OgCczogj7XtksAMApY0LYpdGA/Zk7izew39LsPelnc/nt+tdeJDpCWRytw== 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=3BG7Y3v9zbsLaastbXfzPQ9llu9rT3atWvWYDeS7JzY=; b=dyKLH7WKShLD6i5jZIaRnYckE1L0NB7+MIIESMN6tQy2BqYoJXH6wm5btyhkdBe05/9KkoZV292GTv7KNXqJ9EQv18LoHQuTiUETDmOSPWDam01ocgwSA7nM7VTd/OF9psj3i6isBo3oA8WlV4tgh0vPzraqDvt9dSvgoMHr9s0Gl5PcE1O858mkw5bz1PgDztatdi3NTi3XFFqdvmB+/lsr5wcd/XrJZOrBaK/EOF31SFduABlOPxeiIwFsAdWFhdeEncICd8Nm7PDSJJZi6Bi6KZhr3JkTREOdZiDHfxAbg/CuXbQ9W1PVsGwjZ+9J8hpycwzymHDEy4BMxqGrpQ== 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=3BG7Y3v9zbsLaastbXfzPQ9llu9rT3atWvWYDeS7JzY=; b=VtbmC9S4kBL4wCedLMjfUh9Q781E+sgTqx43atha7CFIbfDbGjqv2gICUPRPFvpJArmr6FDkjXZZlfuuo9KSLjBKI/sJiHu3aNXeTZtzq27OyVITKuNT6J9CS7OrhTGh0mJc1LW9PPTuBPNXjnuLDcTMPE0spIq+BN86AL8cuHO7ClTXVlv7ni1mJsh5JB8vmelbxPullOr7d1hSCz2eGb7Q21U3Xp2Q72KQH8YxsRKmPaMzKKVBF3BN7HH/bplWQnJjbOGM5CAWrq+kkRDnTNmqrmUkIxx8COvVLAXvuFcdpmJ2xq2jvvCWMBDIcdU/aVSBkl6wLow84jYLXMSLYg== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5807.namprd04.prod.outlook.com (2603:10b6:208:a0::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.17; Sat, 18 Sep 2021 21:29:20 +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 21:29:20 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 2/2] ffprobe: Fix incorrect display of closed_captions property Thread-Index: AQHXrNQ+rvvFhlBfyEi2ZXmN7fqJMQ== Date: Sat, 18 Sep 2021 21:29:20 +0000 Message-ID: References: <4ba51d5721808c3d286b89b4d31193c2dfd7721d.1632000456.git.softworkz@hotmail.com> In-Reply-To: <4ba51d5721808c3d286b89b4d31193c2dfd7721d.1632000456.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: [DrwhNSKPfPRI8r/AmnW5yBrE4r0SaWxp] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 77d8d992-bc00-4dbb-ce43-08d97aeb6098 x-ms-traffictypediagnostic: MN2PR04MB5807: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3xYIi6U8atPwsk3npJQg+bwwI/jq5Rsc6Ic2UePdKjPkFcKvnHRb2/OjfwaFrPrSUa4UjuFMNmvEOlHiq+WYdLFAmyuwZ4DfyryFkaTBT9HuUFOaAAGz3s8OhbpqL2W2LUxa1TiVv6KZT8cnhZtV7eZQnqy6hmwU8/Mn0omobfLSrFDIlQ6nQNU5R39G+0zG7s9H3kD4wgMhgRlgE6AV8mjTT0r3HonSXEE+3vMz56hSWv5+ByZWPZBxDhbVXLa6TFIILroS5B8pfd2fHSENPOXRnVjQ5oUiye3odREIBNex3TooVl1mN5HOd3PaZWATwSi76beONRW4ZEkU7WKlK+Yyy73ZTuG8kVvrMa08id6SA0guLolagb3WMKDJliU0ZZGlRDeGeXsFXDWqoH9PhTSlXwyFjiD6zEM+Gr1N9OaeczK3pvErdWGOJuX0++fTQzjmmCU7ZP+trSvY6538C4YwSpy3WaZKS7I7+BNsAq8= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: YfhnXp1EOmE6sRu4bl2hfLXYA9QlIIS2gT9VnV7HxFURHA1UKMNSKAnPrNo2o5QvTQBI10yyzIwleY+5z9j/XE6UI+jm0kwyF4IGgrEsY7L0pP/mY1JyHy95ZOYOr8HjyIx3UckisywJVcZtMoqcVg== 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: 77d8d992-bc00-4dbb-ce43-08d97aeb6098 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Sep 2021 21:29:20.5906 (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: MN2PR04MB5807 Subject: [FFmpeg-devel] [PATCH 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: dRmnmSLqEI8K 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 Signed-off-by: softworkz --- fftools/ffprobe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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);