From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D54C74124A for ; Tue, 19 Jul 2022 06:46:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2D6A68B545; Tue, 19 Jul 2022 09:46:28 +0300 (EEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9605868B501 for ; Tue, 19 Jul 2022 09:46:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658213186; x=1689749186; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=gxQwXKNwPsP9Y92nPz3iTmNZE2x5UE/EwWG3ODzKV9k=; b=VhLPIUwZ90UCpTaEFb4r0UXnEiLFcMupuABoXoJcgrimLKkegNZg2XVu 2Icl7TKEkimUrQvi+V0NYtptkzh6F894g7aYAp0PMSi2ukmTW5/Rcx8f/ GlGORC+Y7J93P8o6XLPDbHLUtZ5cZ6gj9HOMte72f5UtLZdhwvDJhJpQ6 Dqv6GWYMIjHzM+FnPVGBXNiOlvSuZM52xcMUVVUf6S07XxfvkE3ZtTkaa bxfXEnBDvQk6Vi3LftS/vcdOnZppKB43CLH28a1AAay19HoHWtqGmw9No Ohzzpoxtw91AscR818hLZSDTbli76l0AxEud9FhYW5X18OJG7Nc4JzMrl g==; X-IronPort-AV: E=McAfee;i="6400,9594,10412"; a="372714890" X-IronPort-AV: E=Sophos;i="5.92,283,1650956400"; d="scan'208";a="372714890" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2022 23:46:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,283,1650956400"; d="scan'208";a="625051358" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga008.jf.intel.com with ESMTP; 18 Jul 2022 23:46:16 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 18 Jul 2022 23:46:16 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Mon, 18 Jul 2022 23:46:15 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Mon, 18 Jul 2022 23:46:15 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.169) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Mon, 18 Jul 2022 23:46:15 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fd5Du5XVRDzlRPbMNmVOKgyFxxTBI6AktgcH71QdZ56zGrgevZt43bgnGh16PbbSSQTcWRBwujDk1qXL6hLdTQHPXDPDcP7fJOlkIVPniepYI2mo2SCkRl32qA+AT8WOeQNIC7kFFVmxYC0VTxu71ZqDvIe/gpTN9jObTZAtSP+guLV97Omdg3guRkypzcE8uxMnzUgop59GHfB1MEKAu+w1+DJ+XKdzUq+pRekVl+wcxWQ8wpGsCtBhI+cgBR1A1X8nFxPDAhugtn5wUZ2EYdwWT0Uou9ZmcMtOo7hAKLSBaG/9mjkbnE6tYGMU0WWkSGkFYo+8EzTKgxvc9uMSfg== 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=gxQwXKNwPsP9Y92nPz3iTmNZE2x5UE/EwWG3ODzKV9k=; b=gxFGVKWzSEsc/+JTDOI+VOWsRESyZbnmTVduj0vGEfuKGq2z6n59u1Vf+A4Dgb1GEE8UqJnsY2NnKavXKdLt/zdGGaLAyqxgMEvCTWO30G1WDKGRY8SfWrvaF6j1xFgd3YiYgvGycPnag1iaISBv+nya0pjBd7CJ5dFY5wbb0WeBwrUy4N+Y62xBNmpQvHOPBqECU1UaBKd/TP2yY9x6RMBK51c2acRfXqBUc4EbeY83ryj6hXzKzlb3CTo2FfYFa22RIxOvP9KCgZrHAyv9Mi7VGFoKGANUpprjEhaWWhl4qF3vaTdhgHbLqZD/c7YHCUz/f65hRnkAF7SF2h5iAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN9PR11MB5515.namprd11.prod.outlook.com (2603:10b6:408:104::8) by IA1PR11MB6324.namprd11.prod.outlook.com (2603:10b6:208:388::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Tue, 19 Jul 2022 06:46:08 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::f977:9a9f:bad7:d3ce]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::f977:9a9f:bad7:d3ce%5]) with mapi id 15.20.5438.023; Tue, 19 Jul 2022 06:46:08 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH] libavcodec/qsvenc: Change the parameter log to be thread safe Thread-Index: AQHYkptcF/Wt7BdfA0m+g5Ob0KTFia2FUTuA Date: Tue, 19 Jul 2022 06:46:08 +0000 Message-ID: References: <20220708071451.133523-1-wenbin.chen@intel.com> In-Reply-To: <20220708071451.133523-1-wenbin.chen@intel.com> Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1fc5b01d-9322-4a70-d4f4-08da69525c5b x-ms-traffictypediagnostic: IA1PR11MB6324:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: h4bv62A02g09YUlUEtoCgyp8IBurZ2DSPEA84vOji3xBmXpfLH8JS4gtlugjfm7ZdeusTvbtCI9xAcVpxvD1OxT0otK3BCWdt4UH+RuD1blonUdm1PXYK8Ui160BQrQqkpSca5nIK9H31Vam+B/QRmeh2ZZm5PGOneJxuSI8u7RNqKn0u7gGAmirSQL4esE/G3G/sh81EUhYUI717WUFwCkABSL0/9l0zFl/Xix1tryX5O0hwYYz85Ix6bE8hhK0tqbKy4C3R4x2fWbvNQH/y7K+j4zDKBeDX27mb88HDTNo3qd2ICgb1PsHTABTPGASe6ClFCD49lW8b7JE9Bol5uXD0bHd3OcUOYDDtB1CLkHAgif+N9b/aIvwNcyrB/9ppunNr9uce4PKDIRcJN8qHzk/rVm7d8koyRF3bbPdB5kxKPxMTyLpXAOZgUIrTe2Ly73s14x1IIpOKNcwSFm7s8dGccfm83ykRD6P4VH4ekplCUrZchlHAjP/Rx/li/z9F7FZVDABe+8qlHR0XPZFpQB0eoKvh0ibP9SjrU22oeIfrmBMWsd9F/ic3K2ncpg7hQ8iANbwKB7Yoy2pgCUrUgoVR8Tr+1JPZdBYwKu74YEtUsC2HJ5jyDim+g6JXZq3qW8FpYUB8vZKVVPMAc/ChWUUIK9PvBmJHLJwpss9jzuR2gyVGCuFS4m1Uj7kaAYxAIbJzNuZzR5nPUieipn259rRFmlf2ADf03YNSJp/Bd5BPYo+3QQzt8Y3bhJveC0ViAQp2UR1xtt5sijQAL7OPGTCOdGUAWs2Vj24VkYsciog6Hzo7TeMBzoTI5UjOfRqziAKLXBM2fDfPlenUdF9oQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5515.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(136003)(39860400002)(396003)(366004)(376002)(346002)(91956017)(8936002)(66946007)(5660300002)(8676002)(66476007)(66556008)(66446008)(64756008)(38100700002)(186003)(76116006)(36756003)(38070700005)(2906002)(6916009)(71200400001)(316002)(478600001)(6486002)(86362001)(6506007)(41300700001)(122000001)(82960400001)(19627235002)(83380400001)(6512007)(26005)(2616005)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?aWF1VHNjYkVJWlVmdTFUOVBVZGllbVUyUUtyMGFvLzMrZTNhRnJWWVJuSEVn?= =?utf-8?B?dE0zNFBSSGdZdlRzYUZZR0N6SnZXUlp6c0VSVlRScHpicEhwZFowbkNVWUZq?= =?utf-8?B?dlJmKytOWVhsZTFpTlRLakxWRVFuRnJqZnp2UGtRd1U2emJVTndKdDlhdG15?= =?utf-8?B?TFdlWWQyZENKNGlKL3ZRSjlCLzByVndhemE4c2E2TTlTVUkxRC9hOWovWmNz?= =?utf-8?B?SFpFa0RGZ0FzUTgwS2RLK0EyRTFadnJkc0NWSXJia2o1ZGsxdVpkTVJiNDNq?= =?utf-8?B?UHM0MmViVXBIaFJ5dUJlV3doY3hCRHdPazdGRklzbkxKZVg2RzZRMWpMZTV4?= =?utf-8?B?b2p5dDF1WWs3aG4zNWtSNm11ODI3aWRwdHhoaXFJbmNXbzZWWnNYM3A5dWc2?= =?utf-8?B?UnNKWE5Xd2tPRU5kaGVmaS8rTW40TFhuTUJra093WllKS29Jd3RKaFd1czNl?= =?utf-8?B?c1Z4akg0QmY4RkM3aWVpZ1dYUTlOVEdUSEVLTmZLMmNHQ3VKL25LYk1ZNjY1?= =?utf-8?B?YkRCOHdQV0FVT0lOSGE4blBLOEY0b0RPandiZ05nNTFOK2tiN2V1L3I4QXR3?= =?utf-8?B?bGtvcytlWUV5QlFMV0xyMUU5c3JGS29NTVJ6TkkrVGhCK2ZwZ29qdWxiOXBJ?= =?utf-8?B?eXJCQmlGRm5Ga1JMVFVqYmM4bk51YlhwQm5oeTZlcHRZNThqZXAxZ2V6Z1VV?= =?utf-8?B?eW5laGdLZi9VRFlOaStpNWkyU2VCaHVEUUZkdXB4amJxVlI0L0ZLNTRCUGdF?= =?utf-8?B?ckowNk4rSGhUdzJmTlNUVUE2UWdzdGUyYkZOaVIydExUdFIwbTkwaStGaXp2?= =?utf-8?B?TmxaZmtiNkpIb0R4b21HUDJ6NjNrb0RlREswZU5VREtFbEVxT3ExQkhScFIx?= =?utf-8?B?QXpoS2EvOU85TlRIZWI2ME42TGxIVGZCYmkzMUNTQW0zbVZyRWJBaDJHYjBB?= =?utf-8?B?aWFhRExLZTBNSVVsdlFJdWd1OEYyNW5RWVpxL2MrYkdhUXpBNzUyeUJFS1Nz?= =?utf-8?B?aTFnN0tvYStNOVlkS2FsbFZESTB6Yk8yOEswVFFpVHRTeE9CSWRndDRyVEY3?= =?utf-8?B?UTlOQ2pCOTR6OUNYY1JReGtQVFB2Y0liUHBLOWR0QWpWM2VON2xMbXJQakhH?= =?utf-8?B?S1gvZDYza2hIVDNWZXJTbk5CUk10RVczUFAyYStQUjhjWmcvcTRJbTlqc2Rw?= =?utf-8?B?RFV5WkRONXdHdDVjMWROT3QyUUxRZmtsaHBEYlZiMFFXSk5ZSTVCU1pzOE00?= =?utf-8?B?T1p0RDFRRWloNlMvUzZnWkkyRGJ4NmNVbSs4Q2p0cHFYWVhBeURWSGZ4UDdo?= =?utf-8?B?K3hFdHo1akR4aWU2Q3hyMWp6ZnI1UGZkVzZCNzBsWFlFQnJlTkV6dnAzWGdi?= =?utf-8?B?cWRndk9NdU1SRk5GcXk0NHE4MWFXUFBKWTkyMnVlM2wwRjRQVW5FUzlyZmx0?= =?utf-8?B?Z3F6K0xhNUpTZFVWbGJCd0o3TlBYVWtCYlhDNUtkN2xDYWFnREhHdkZyY2pU?= =?utf-8?B?eFhGbDlWczZ1bEFFWndEc1pwT2pxRUpEMWsyZFU5NzBJdFkzdWk2Y2NkQ0NH?= =?utf-8?B?MjlSakNvdkFMLzZtWEozQ3dsTVZRQmZmb2l4M25La2tqRDIrZWliRFZtOXMw?= =?utf-8?B?U3Q5a0YyQ2RMSFI3ZHhJVWVaU2dKdW92S3hkR1ZJb1VlRHA1K2NaS2tRMXFQ?= =?utf-8?B?TW5LVzJvM1ZkRng2QUJOZnQ5ZkQ4VzNYb1pQZm1uaUluSjYxK2phTkZORy9x?= =?utf-8?B?bkQyZXlMRGwwQnpoQ3ljWHNmYzMvc0M5NkQ3bm1KcjdLRVhFOUVXMXNDNlZy?= =?utf-8?B?alhVWkoyeVBPcGo0ZW1MeTVwb0tzVUR0SHdiWjNsVTUvUXFoN00zVXhSWmFR?= =?utf-8?B?NGdBRXlzYWg2cnJRQ3N4eGRrMTJCTWw4SnhRandhVDZkNXZiSi9PemlPeW1m?= =?utf-8?B?SGN4U0txelJva0p4YTZWV1pMWjMzaEVxMlZKSytBZWVoS3hqRmFqbzk2ZHhN?= =?utf-8?B?U2xKMGRDK25BcGN0eFJFdUpncHZaSmwrY2RNaktJNFJSRmVJZjJtUDBVRHVo?= =?utf-8?B?dE1leGxkYnFoL01wK2tUdmxMZi9lNDBPWGFPS3phOTBuVHpuVG10NXFzTnlm?= =?utf-8?B?b3JCSjJoNEtVZUV3MFRvWFFkQy9ncnFFNHkvWnZPVWc3MmU1dk1ZaVUvV0xL?= =?utf-8?B?QUE9PQ==?= Content-ID: MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5515.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1fc5b01d-9322-4a70-d4f4-08da69525c5b X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2022 06:46:08.3634 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: cApWXzL6mBf3AFHjjo3pJVNZFZzHdu5CzRiWNVPX9OhBRh0/1sG0c4Xo7tRglOST8no1Pjs3kSNVqIsR5MmoOQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6324 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH] libavcodec/qsvenc: Change the parameter log to be thread safe 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 2022-07-08 at 15:14 +0800, Wenbin Chen wrote: > Dividing one line log into several av_log() call is not thread safe. Now > merge these strings into one av_log() call. > > Signed-off-by: Wenbin Chen > --- > libavcodec/qsvenc.c | 87 ++++++++++++++++++++++----------------------- > 1 file changed, 42 insertions(+), 45 deletions(-) > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index 2382c2f5f7..5729292f94 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -182,6 +182,7 @@ static void dump_video_param(AVCodecContext *avctx, > QSVEncContext *q, > mfxExtCodingOption2 *co2 = NULL; > mfxExtCodingOption3 *co3 = NULL; > mfxExtHEVCTiles *exthevctiles = NULL; > + const char *tmp_str = NULL; > > if (q->co2_idx > 0) > co2 = (mfxExtCodingOption2*)coding_opts[q->co2_idx]; > @@ -195,13 +196,12 @@ static void dump_video_param(AVCodecContext *avctx, > QSVEncContext *q, > av_log(avctx, AV_LOG_VERBOSE, "profile: %s; level: %"PRIu16"\n", > print_profile(avctx->codec_id, info->CodecProfile), info- > >CodecLevel); > > - av_log(avctx, AV_LOG_VERBOSE, "GopPicSize: %"PRIu16"; GopRefDist: > %"PRIu16"; GopOptFlag: ", > - info->GopPicSize, info->GopRefDist); > - if (info->GopOptFlag & MFX_GOP_CLOSED) > - av_log(avctx, AV_LOG_VERBOSE, "closed "); > - if (info->GopOptFlag & MFX_GOP_STRICT) > - av_log(avctx, AV_LOG_VERBOSE, "strict "); > - av_log(avctx, AV_LOG_VERBOSE, "; IdrInterval: %"PRIu16"\n", info- > >IdrInterval); > + av_log(avctx, AV_LOG_VERBOSE, > + "GopPicSize: %"PRIu16"; GopRefDist: %"PRIu16"; GopOptFlag:%s%s; > IdrInterval: %"PRIu16"\n", > + info->GopPicSize, info->GopRefDist, > + info->GopOptFlag & MFX_GOP_CLOSED ? " closed" : "", > + info->GopOptFlag & MFX_GOP_STRICT ? " strict" : "", > + info->IdrInterval); > > av_log(avctx, AV_LOG_VERBOSE, "TargetUsage: %"PRIu16"; RateControlMethod: > %s\n", > info->TargetUsage, print_ratecontrol(info->RateControlMethod)); > @@ -269,45 +269,46 @@ static void dump_video_param(AVCodecContext *avctx, > QSVEncContext *q, > av_log(avctx, AV_LOG_VERBOSE, "IntRefType: %"PRIu16"; > IntRefCycleSize: %"PRIu16"; IntRefQPDelta: %"PRId16"\n", > co2->IntRefType, co2->IntRefCycleSize, co2->IntRefQPDelta); > > - av_log(avctx, AV_LOG_VERBOSE, "MaxFrameSize: %d; ", co2- > >MaxFrameSize); > - av_log(avctx, AV_LOG_VERBOSE, "MaxSliceSize: %d; ", co2- > >MaxSliceSize); > - av_log(avctx, AV_LOG_VERBOSE, "\n"); > + av_log(avctx, AV_LOG_VERBOSE, "MaxFrameSize: %d; MaxSliceSize: %d\n", > + co2->MaxFrameSize, co2->MaxSliceSize); > > av_log(avctx, AV_LOG_VERBOSE, > "BitrateLimit: %s; MBBRC: %s; ExtBRC: %s\n", > print_threestate(co2->BitrateLimit), print_threestate(co2- > >MBBRC), > print_threestate(co2->ExtBRC)); > > - av_log(avctx, AV_LOG_VERBOSE, "Trellis: "); > if (co2->Trellis & MFX_TRELLIS_OFF) { > - av_log(avctx, AV_LOG_VERBOSE, "off"); > + av_log(avctx, AV_LOG_VERBOSE, "Trellis: off\n"); > } else if (!co2->Trellis) { > - av_log(avctx, AV_LOG_VERBOSE, "auto"); > + av_log(avctx, AV_LOG_VERBOSE, "Trellis: auto\n"); > } else { > - if (co2->Trellis & MFX_TRELLIS_I) av_log(avctx, AV_LOG_VERBOSE, > "I"); > - if (co2->Trellis & MFX_TRELLIS_P) av_log(avctx, AV_LOG_VERBOSE, > "P"); > - if (co2->Trellis & MFX_TRELLIS_B) av_log(avctx, AV_LOG_VERBOSE, > "B"); > + char trellis_type[4]; > + int i = 0; > + if (co2->Trellis & MFX_TRELLIS_I) trellis_type[i++] = 'I'; > + if (co2->Trellis & MFX_TRELLIS_P) trellis_type[i++] = 'P'; > + if (co2->Trellis & MFX_TRELLIS_B) trellis_type[i++] = 'B'; > + trellis_type[i] = 0; > + av_log(avctx, AV_LOG_VERBOSE, "Trellis: %s\n", trellis_type); > } > - av_log(avctx, AV_LOG_VERBOSE, "\n"); > > - av_log(avctx, AV_LOG_VERBOSE, > - "RepeatPPS: %s; NumMbPerSlice: %"PRIu16"; LookAheadDS: ", > - print_threestate(co2->RepeatPPS), co2->NumMbPerSlice); > switch (co2->LookAheadDS) { > - case MFX_LOOKAHEAD_DS_OFF: av_log(avctx, AV_LOG_VERBOSE, > "off"); break; > - case MFX_LOOKAHEAD_DS_2x: av_log(avctx, AV_LOG_VERBOSE, > "2x"); break; > - case MFX_LOOKAHEAD_DS_4x: av_log(avctx, AV_LOG_VERBOSE, > "4x"); break; > - default: av_log(avctx, AV_LOG_VERBOSE, "unknown"); > break; > + case MFX_LOOKAHEAD_DS_OFF: tmp_str = "off"; break; > + case MFX_LOOKAHEAD_DS_2x: tmp_str = "2x"; break; > + case MFX_LOOKAHEAD_DS_4x: tmp_str = "4x"; break; > + default: tmp_str = "unknown"; break; > } > - av_log(avctx, AV_LOG_VERBOSE, "\n"); > + av_log(avctx, AV_LOG_VERBOSE, > + "RepeatPPS: %s; NumMbPerSlice: %"PRIu16"; LookAheadDS: %s\n", > + print_threestate(co2->RepeatPPS), co2->NumMbPerSlice, > tmp_str); > > - av_log(avctx, AV_LOG_VERBOSE, "AdaptiveI: %s; AdaptiveB: %s; > BRefType: ", > - print_threestate(co2->AdaptiveI), print_threestate(co2- > >AdaptiveB)); > switch (co2->BRefType) { > - case MFX_B_REF_OFF: av_log(avctx, AV_LOG_VERBOSE, > "off"); break; > - case MFX_B_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, > "pyramid"); break; > - default: av_log(avctx, AV_LOG_VERBOSE, > "auto"); break; > + case MFX_B_REF_OFF: tmp_str = "off"; break; > + case MFX_B_REF_PYRAMID: tmp_str = "pyramid"; break; > + default: tmp_str = "auto"; break; > } > + av_log(avctx, AV_LOG_VERBOSE, > + "AdaptiveI: %s; AdaptiveB: %s; BRefType:%s\n", > + print_threestate(co2->AdaptiveI), print_threestate(co2- > >AdaptiveB), tmp_str); > > av_log(avctx, AV_LOG_VERBOSE, > "MinQPI: %"PRIu8"; MaxQPI: %"PRIu8"; MinQPP: %"PRIu8"; MaxQPP: > %"PRIu8"; MinQPB: %"PRIu8"; MaxQPB: %"PRIu8"\n", > @@ -319,14 +320,12 @@ static void dump_video_param(AVCodecContext *avctx, > QSVEncContext *q, > if (info->RateControlMethod == MFX_RATECONTROL_QVBR) > av_log(avctx, AV_LOG_VERBOSE, "QVBRQuality: %"PRIu16"\n", co3- > >QVBRQuality); > > - av_log(avctx, AV_LOG_VERBOSE, "PRefType: "); > switch (co3->PRefType) { > - case MFX_P_REF_DEFAULT: av_log(avctx, AV_LOG_VERBOSE, > "default"); break; > - case MFX_P_REF_SIMPLE: av_log(avctx, AV_LOG_VERBOSE, > "simple"); break; > - case MFX_P_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, > "pyramid"); break; > - default: av_log(avctx, AV_LOG_VERBOSE, > "unknown"); break; > + case MFX_P_REF_DEFAULT: av_log(avctx, AV_LOG_VERBOSE, "PRefType: > default\n"); break; > + case MFX_P_REF_SIMPLE: av_log(avctx, AV_LOG_VERBOSE, "PRefType: > simple\n"); break; > + case MFX_P_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, "PRefType: > pyramid\n"); break; > + default: av_log(avctx, AV_LOG_VERBOSE, "PRefType: > unknown\n"); break; > } > - av_log(avctx, AV_LOG_VERBOSE, "\n"); > > if (avctx->codec_id == AV_CODEC_ID_HEVC) > av_log(avctx, AV_LOG_VERBOSE,"GPB: %s\n", print_threestate(co3- > >GPB)); > @@ -360,13 +359,12 @@ static void dump_video_vp9_param(AVCodecContext *avctx, > QSVEncContext *q, > av_log(avctx, AV_LOG_VERBOSE, "profile: %s \n", > print_profile(avctx->codec_id, info->CodecProfile)); > > - av_log(avctx, AV_LOG_VERBOSE, "GopPicSize: %"PRIu16"; GopRefDist: > %"PRIu16"; GopOptFlag: ", > - info->GopPicSize, info->GopRefDist); > - if (info->GopOptFlag & MFX_GOP_CLOSED) > - av_log(avctx, AV_LOG_VERBOSE, "closed "); > - if (info->GopOptFlag & MFX_GOP_STRICT) > - av_log(avctx, AV_LOG_VERBOSE, "strict "); > - av_log(avctx, AV_LOG_VERBOSE, "; IdrInterval: %"PRIu16"\n", info- > >IdrInterval); > + av_log(avctx, AV_LOG_VERBOSE, > + "GopPicSize: %"PRIu16"; GopRefDist: %"PRIu16"; GopOptFlag:%s%s; > IdrInterval: %"PRIu16"\n", > + info->GopPicSize, info->GopRefDist, > + info->GopOptFlag & MFX_GOP_CLOSED ? " closed" : "", > + info->GopOptFlag & MFX_GOP_STRICT ? " strict" : "", > + info->IdrInterval); > > av_log(avctx, AV_LOG_VERBOSE, "TargetUsage: %"PRIu16"; RateControlMethod: > %s\n", > info->TargetUsage, print_ratecontrol(info->RateControlMethod)); > @@ -396,8 +394,7 @@ static void dump_video_vp9_param(AVCodecContext *avctx, > QSVEncContext *q, > "IntRefType: %"PRIu16"; IntRefCycleSize: %"PRIu16"; > IntRefQPDelta: %"PRId16"\n", > co2->IntRefType, co2->IntRefCycleSize, co2->IntRefQPDelta); > > - av_log(avctx, AV_LOG_VERBOSE, "MaxFrameSize: %d; ", co2- > >MaxFrameSize); > - av_log(avctx, AV_LOG_VERBOSE, "\n"); > + av_log(avctx, AV_LOG_VERBOSE, "MaxFrameSize: %d\n", co2- > >MaxFrameSize); > > av_log(avctx, AV_LOG_VERBOSE, > "BitrateLimit: %s; MBBRC: %s; ExtBRC: %s\n", LGTM, will apply Thanks Haihao _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".