From patchwork Wed Oct 6 06:44:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30932 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp81350iob; Tue, 5 Oct 2021 23:45:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUW3aKCfbI/5Y+0Jq576IHJM1WGrU+FkSvGvpxqVxyZY1yooyZsar8J523yPNEVzAU3nqa X-Received: by 2002:a17:906:308d:: with SMTP id 13mr29815856ejv.570.1633502726689; Tue, 05 Oct 2021 23:45:26 -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 12si11504160edw.16.2021.10.05.23.45.02; Tue, 05 Oct 2021 23:45:26 -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=triHVh3Z; 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 252E068A3B9; Wed, 6 Oct 2021 09:44:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2080.outbound.protection.outlook.com [40.92.40.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B858568A3B9 for ; Wed, 6 Oct 2021 09:44:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aYD9XMT4NY2oTI0QQoDyf2fK3YaJFoWCbDYLWfzuX7O4TSnmkqch0T83P/gJess5SaEse6+ZyU4XMXJJRBPs3kHfP5OPV1HvZrm6fERuEmOFZoQ4YmMm2l57KDW+So4FDm+gagXRprtOOZIG+0IO1JDIS16koPUovtz08IAAtkRcl4S4nf0dse4CXD4Y+XLmylYqF0avub5jyEf5vGbwir1mTF2hyRki7Ic1za1DKqx+myD6f+cAbd2/KAmD1vT+RnQwY3OvC31clJ63eYVC10g3eI1g3v1tM3XnakgTSOY8cnpSAf1C3ZJstuPZE/gHE61cXxOnSOVexn61TGvaxQ== 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=1Q6oXgK2GOXfu4NdMfwhuBMdMSIFBnKfjtDlzyzGsBw=; b=Tf5/AsGUMdz7lIQJCwqP3pLQ3OcdndDVq26Iat2HfglA544THIBcY3yJCs7TX5JlzFTZ6l/Tp3EVxzourDqaVIXxZ+ynn7Xn4aRoC9MOEU+8O7xRsyEDZ0IETNnDlHp8NNY+TEVqSKquFdmUGYFCaTeMQT4U5dwrezc3nj/w3dYZTnrAlR6ultobM3eJYUF0pm1Kf+QmNSlKqwE6UA7R6q4TdskvPuO9zYrAYDW+X6Y3QSXK5usKm7TnMnmeBisBCGPhjP7gR6kCKS6+pNhbtQ8BVzBKfXRbOI4EY6vmHPPjzduttH8I07fIOH3Pe2ivvP6/HJi2aS915Zpf1uqzWQ== 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=1Q6oXgK2GOXfu4NdMfwhuBMdMSIFBnKfjtDlzyzGsBw=; b=triHVh3ZaiqLl/DEPWVjMj9oF2TbCbHS4Gm0V8V9IzabY9ot7Vdj6e1N++PUPVny6Rd7b+37uhUr61SV3IGUevf7seFJAiz+nOW8U/Q3C5MxEkNn0jqWRrisLiTKkRxKzDbCUZxCnupbzBtkca206U5jZ8TyqO9fxIbS/piN41rSvhDJGVN8lMMPz8ZAawLjQKyqViXfXll/Pw0ZzDCBokkIX+oYLWZmNSaUO2di4I02AcrgLPf4k0+vSmVSA0R+FBb+5xZMVqqdumDklrGfjYjTyPf2xjgyIUfbVNYEAz21/eCeZ6OHFmDc4El5rMYUGoLae3977CxcdPAUT0S5iw== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5950.namprd04.prod.outlook.com (2603:10b6:208:a5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Wed, 6 Oct 2021 06:44:49 +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 06:44:38 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3 1/2] avcodec/codec_par: Add codec properties field to AVCodecParameters Thread-Index: AQFGZFM6G74AKP63PQ9PaAGpDOyURAMHN/t+ Date: Wed, 6 Oct 2021 06:44:38 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [eqGFDKb1MEFkraTLOvfR7+Wt5kpg0r0T] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ef098593-6bea-4aba-8302-08d98894c4e0 x-ms-traffictypediagnostic: MN2PR04MB5950: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: lb5hP2zmKyM+5AD0tuuAtlXKL3gCkob7Fsh5gU46++W04RbWXvBFnaP+lLOz6Ghh9cAlQ57OkyWL+EROSCDy9GlmdzXCL/aW9miYDEiq+ULu27OvTGxlhaMIunokOgjgqBWkt8EHQmzFk9Tt2Tr59MC3YfS8m/RPE8fBWGzeObjwWaTWZX/WF+k7JmPFl/6aswpEyrRV1Nm2CrvxDxwde+kSpM0XUUl75jFrENE7R8aUShjL/lFTKggxFSlXZQLqjK0DmOjEVQiaTW3kOpFSDZAXCztC7J48yWpgzQtCJ5DtfJyFP8fn3E04cqGnJwcrNeBMg/N7uanSIVhAcrP5F2mxtbcIzkoufc2kYJAS8d2dP/X7/ytKT668VWf0bJMRSFfm+u5zjmKaDDg/+zinwEGax/KBh6HgI9e3cGBgduW8F9gPfJvPCxMQFMHUiLQQFeYoQ8YBYuYANiuKU3CumJ+Pt+2JC3I4aP39xJm5yxI= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: IGOc6Boeu0B8xkHrj+XlCZSvQr0BL8nkk/dzO6frO8crMFb6XARWUsqz9iRSaJRg8By69sLX50j4FGyygRilKX/LbncGjK8SzsHrcGDnhGHSSPwABzItCBulHg0k6u+IjPkrcnHT7qcIIJX63clMgA== 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: ef098593-6bea-4aba-8302-08d98894c4e0 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:44:38.8361 (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: MN2PR04MB5950 Subject: [FFmpeg-devel] [PATCH v3 1/2] avcodec/codec_par: Add codec properties field to AVCodecParameters 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: LKrc3Of/JVT2 This fixes incorrect display of closed_captions property in ffprobe. 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 included "Closed Captions", the stream data is showed: closed_captions=0 The test ref was incorrect as the test media file actually does have cc, which is fixed by this commit, so the test ref needs to be updated. Signed-off-by: softworkz --- v3: Moved test update to the right (this) commit doc/APIchanges | 3 +++ libavcodec/codec_par.c | 2 ++ libavcodec/codec_par.h | 4 ++++ libavcodec/version.h | 2 +- tests/ref/fate/ts-demux | 2 +- 5 files changed, 11 insertions(+), 2 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/doc/APIchanges b/doc/APIchanges index 7b267a79ac..2be3303efa 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-10-07 - xxxxxxxxxx - lavc 59.11.100 - codec_par.h + Add codec properties field to AVCodecParameters + 2021-09-21 - xxxxxxxxxx - lavu 57.7.100 - pixfmt.h Add AV_PIX_FMT_X2BGR10. diff --git a/libavcodec/codec_par.c b/libavcodec/codec_par.c index 1a5168a04b..f6c13f7d11 100644 --- a/libavcodec/codec_par.c +++ b/libavcodec/codec_par.c @@ -101,6 +101,7 @@ int avcodec_parameters_from_context(AVCodecParameters *par, par->bits_per_raw_sample = codec->bits_per_raw_sample; par->profile = codec->profile; par->level = codec->level; + par->properties = codec->properties; switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: @@ -156,6 +157,7 @@ int avcodec_parameters_to_context(AVCodecContext *codec, codec->bits_per_raw_sample = par->bits_per_raw_sample; codec->profile = par->profile; codec->level = par->level; + codec->properties = par->properties; switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h index 10cf79dff1..42ed8deb13 100644 --- a/libavcodec/codec_par.h +++ b/libavcodec/codec_par.h @@ -198,6 +198,10 @@ typedef struct AVCodecParameters { * Audio only. Number of samples to skip after a discontinuity. */ int seek_preroll; + /** + * Codec properties of the stream that gets decoded + */ + unsigned properties; } AVCodecParameters; /** diff --git a/libavcodec/version.h b/libavcodec/version.h index 4bd22f7e93..1c28fd0be5 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 59 -#define LIBAVCODEC_VERSION_MINOR 10 +#define LIBAVCODEC_VERSION_MINOR 11 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ 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 From patchwork Wed Oct 6 06:45:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30931 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp81246iob; Tue, 5 Oct 2021 23:45:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6TRQnkYyFyvAk5Ds20910LVPNWnU8yipQm3JyUnzSTPYeoXh9HQ6fYbg2nXKQ+WrdGk/v X-Received: by 2002:a50:cc03:: with SMTP id m3mr27248581edi.278.1633502716220; Tue, 05 Oct 2021 23:45:16 -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 c20si5825099eds.158.2021.10.05.23.45.15; Tue, 05 Oct 2021 23:45:16 -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=RcAJXY4p; 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 5097E68A88C; Wed, 6 Oct 2021 09:45:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12olkn2100.outbound.protection.outlook.com [40.92.23.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC92668AB8E for ; Wed, 6 Oct 2021 09:45:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OUwcejODUzRUNnt5VYqaf44AW3pAyQnx/jKJ6dDntLGypxHRh53fnwueQ9gWl5cMf+WpdjY7uT5rFMFHYxL0n6iiCOlZoeZukz6n2UHSYdATe+GyquSfhu+MsPwntaztX8YfX5YEUVzzzMii4vbjlmDI9mquJw/BTzUjWcT6juO4vopdesAjLeWvHqBHpyAppugGIIz1AvpdUjgz5AP5AyPcAf3RsYbkgLaYhUJcPgB2d66UK5vn6IiZvTKgo+/SHGfYJ4SPNIqn8cJqwjhAd/4QKfRurlzZK3klQUgTcUyQMiEBhXb0cx/VSS8HgASs3zaL23JcbMIA1y/ugkUb6A== 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=PEVQq9LGbcBA7ntADirMMrs55mJqaE9wKdh4eos2k8k=; b=NY9a0uDcPPKOEf8FzyAxICGmzE+kVLlmPsP0dav7RLfIDJWBnxibNbGp9EfPIUCEgHGkYWtLJflOgr0+RsgZRMgNOA1ZQ28VCUZ59/HDxGMScA9kbJY0cYnk7e7BiA34SrQZKvYppBNHYPkvMBe6FBwNx9EpeklINafLHIRVdB/RtlaObpANnc4PuBCHaeEMjOFRwcKU6gn925Fq+WxTDfAv7VErXx3XmvGsCq01cRgem1Xe4BVnuzdHqdxfIVay18QVWVAsI3aBSwji7xWFAmwur8h+6jOd4JvzSmFe+DveQCNYLSqJwhnQ2bcq5H68o+Yts7t7aCDAeTNppAPRxg== 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=PEVQq9LGbcBA7ntADirMMrs55mJqaE9wKdh4eos2k8k=; b=RcAJXY4pOnyDyXkVvo9j/K55vTYkS2hLgtbKk7L7GJsLF1oruBKo6+X5Z7kq8WPyeKfLE4I+Oo+sfJcqFmRbDbzLIVY3hfVgsoPWZaT+XcgP5c6EprTVTc4j45+zM711RrO1ird49F2KM1m3PFXa39NVrMb3S6StkFjq1ixvXZwgDm57FTl4/4JhI6339EKJkb/NpgoTqDQc4rBtcUGcK6bzdC7M7tF71PONgDkywqSZTYVS+RXCfeRI3BT9JKiRfmmfn2vq+N+0bXnlu/nBXo0j3mjIH5ylCcxcHuy+hOxmRr4PIgC/6KQ0mldfHCN6kEhAt7hFznvu8Y0Jn7CjaQ== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5950.namprd04.prod.outlook.com (2603:10b6:208:a5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Wed, 6 Oct 2021 06:45:01 +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 06:45:01 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3 2/2] ffprobe: Use codec properties value from AvCodecParameters Thread-Index: AQHXun2vXU8ufP1VHEKBDV110AiFQg== Date: Wed, 6 Oct 2021 06:45:01 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [prgPWe+QiCPe7UFwFFkBUJtlc5aEIZX6] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7b93906a-e89c-4fe3-4306-08d98894d236 x-ms-traffictypediagnostic: MN2PR04MB5950: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: tLFHll14LldCVzTpF5QFSGlYjIiQasDkhgZL1Z+gu1CVFYHBzj2nDMhGaqD2dOccBzG98SSo4GIIZj2zzhMXcybKGLw4UAOxXuzD3sZi3eb+pdnDamBUS+r2/kOfGn4W1x68cA1w8NsPc/5WbPBZ+R7K5ugK8dt8er4v0E0H/eVGmS76k78zFekYpZGI+IQ8UeGEclm/U4Wh4T3drQlUgmRlNA2XfuNPJxcv8MgTMc3RxKrRAgTW/+lcdIa0mbJKVcl+XAqdEbJqS5pPNyMIkQ5V6tnz75nkcJXqSXZcCRqjRHLHbsvxbPnJRcPZgalm2uhvbt5KJ4h0DV+0ReTphx2o/euUm/ZQm2gUBtGXgA8Avd56hVOrtXZJKg70eT1sznYmA4BBCTE4s7d7rY49PFWcYLnrBzdij8lE8Ej8PO3wnBm6yCwBmjHKWTHYyrUz x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: s8PnVK+Mg64qovZX1Pa1TS83j/bNWOf0sbwD5LfOp9h6eOLHW9wSFRMq+62vGjAlv+b6Vo//BQ350F74BAFMrw00QhRxt82ELZRTZqtBSAsUHr4DrY9gKmlLd+sRQQp5fasMYAOi2HXBgLr4XDsLzg== 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: 7b93906a-e89c-4fe3-4306-08d98894d236 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:45:01.2085 (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: MN2PR04MB5950 Subject: [FFmpeg-devel] [PATCH v3 2/2] ffprobe: Use codec properties value from AvCodecParameters 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: aHpXRk0XxcPg Signed-off-by: softworkz --- fftools/ffprobe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) {