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 55D014576B for ; Fri, 24 Mar 2023 03:34:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E996D68C1D9; Fri, 24 Mar 2023 05:34:03 +0200 (EET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9036168C0CB for ; Fri, 24 Mar 2023 05:33:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679628841; x=1711164841; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=kuBv2OuVrzwBnPx5G10Aecuk4wL9Rrv522vi80iAli8=; b=Cop4S176dsML9y6aJKqHY0+RhGydxYZX9+vx+gzJt9Odf1Jf7uf55HO+ RXVX7RbwLbyHKdyXEoMD/+9RI3iDgRlx1y2i0HrrNy1jtywzQOUVqhu+H gGeaFJVEM0cI8dMyFXT+fPhJ2yCAYiVbEkavyKUJWOBdRkFL/aMvGwX6H o4RoJ/V3m8X1ydcDNm1PgDStBpCQNuygF0T2AxEapHOfBIS7vEmF7crqq b2vh3it0fLHQZZqS9ITF69NLPt1HYo6GfOEgWCipXjh8Tt2B++dpMSGXT 5ayh2XGSPIuARPDu1ESBy6Kr9dqzwdJqjpvM3sdauGUMa/QSkPAdMQuJI A==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="404601621" X-IronPort-AV: E=Sophos;i="5.98,286,1673942400"; d="scan'208";a="404601621" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 20:33:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="632683648" X-IronPort-AV: E=Sophos;i="5.98,286,1673942400"; d="scan'208";a="632683648" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga003.jf.intel.com with ESMTP; 23 Mar 2023 20:33:53 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 23 Mar 2023 20:33:52 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 23 Mar 2023 20:33:52 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Thu, 23 Mar 2023 20:33:52 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.42) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Thu, 23 Mar 2023 20:33:52 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HdLf0YFcXlYXawtJpZx0+KCEItFyXk9nCUhkmzVvtA12udB7sTmuYxW8bpC/69kWKnY+b0ddkUOt4SAL1LDRhKK+VWUQeri3axYnwvVi6BSbqSx0lBynKg/VaxbcBXCJONjQdxbzjY9/EATcJq/H592JKTQ2bGfbYmtpxJQupcHIotgUxDhbHtZxHz34hJG30SzoIEEgX9WKbLpl+Sripmj9zsGY8b4adqXspmdxw8lGj43VD5M00moJCUVw2egOzQYHh/HZ/h8u/SLVC9wUhKt1ffHAsFxgd0S1FCY+VEMg3Xy7782rs3MSUI1tote8oKoZgfiOCGLJxrEDBeb4pQ== 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=lBtRllepny77PBDXxu57xSwmCYJSXzpMch7C9aMcNK0=; b=LzEyzpXA9JbRN6uaUGgvG4eFBbdrT1g+znok6mAPMkNfADfPiPf6HZPdA8MVDPsPeoToJdyQqG+dpUOPT+fdRykP0ytyuL/kPIm0ZAbDU7z7VXVhk/zUjG7v2LhRgkjFS8BRZ1hGTKON7QymWv3ffshagYky4WZG51SxghG97yrkdRhNtQuCBCWLVL3ThHYCGq3AkphtXn43yZ/SjXU0HEEmYOAIZwDSndOlLbRYSoputiBm/KvutYxqkBODrZeym/TVZKXQKqnFKRKQxpCPzRsQqxEybzIdD9Ef8PKIcdnYGn7EOCJx6+zcU5FItXBQUAmInz3XPlT2hl96YyST2Q== 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 PH7PR11MB5957.namprd11.prod.outlook.com (2603:10b6:510:1e0::14) by IA1PR11MB8176.namprd11.prod.outlook.com (2603:10b6:208:452::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38; Fri, 24 Mar 2023 03:33:50 +0000 Received: from PH7PR11MB5957.namprd11.prod.outlook.com ([fe80::c2bb:1b55:8ed8:ae9c]) by PH7PR11MB5957.namprd11.prod.outlook.com ([fe80::c2bb:1b55:8ed8:ae9c%4]) with mapi id 15.20.6178.037; Fri, 24 Mar 2023 03:33:50 +0000 From: "Guo, Yejun" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH 1/3] lavfi/dnn: fix corruption when TF backend infer failed Thread-Index: AQHZV7XVo5TRv97wNUy57hR/Q14lSq8JTzeg Date: Fri, 24 Mar 2023 03:33:50 +0000 Message-ID: References: <20230316030016.4096-1-ting.fu@intel.com> In-Reply-To: <20230316030016.4096-1-ting.fu@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PH7PR11MB5957:EE_|IA1PR11MB8176:EE_ x-ms-office365-filtering-correlation-id: 69b88216-e2b7-4df6-89a8-08db2c189598 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zOqc0K7/kak05Z/LalDq4Koor9BfGPjZkCHmw/xnNfczzt9zwh4A3FC5o6vOv5qTR1VCoOvDC/k20HiJVyL/4Zme3XdgHDW2bhbTXy5JePgnby07vBLiJQk66ECyLoAKXnOdstIm6RnCIybIe9MmBI1DlWk/zWDRErJAyA8UlDBQ7DlczwkYVpmGMyMeAnqZ3zngnXNF4Tc3bPpeDSfu7Uxe5T4D/SFZrMwdAqxGw7iMMWWXqzhxZa8nnoRX/jzzZYFe1I1+n0TK4XRNruU01/OHOu7SLVfPcbOzrnd0WQIJ8L3GPo7u7c4EZ2PEErwnUZdugoTceZ41In/B1huVdTW9IydXX/EnLw5D3lmYP0aGkw38a2666CRBFwZ08cmk6ZBKJHXPz9F/LwxfeSsUw72EFiL2PkXoWWHp2WYY3dm9Xo17t3E40/BZCwRkwjJ9ulTqb/k0uOS9zLyaDac8AVQ8NHMMNEJWnqv/Lp0ZgVqteTMYl2EDkwHCjQEx4hBD5D8hQr/k7v2ICnMNCPzEhSeLJJt6XZLJs1SUF7G652DTcF5pFZpnCRYrQ2hwE5qb7zJ+6382mmbAn26tMdOfnFGKgsdGtekxJ4Ui5ch5CfGbiuBLmHMr/dky07xJQCuX4hBfiRxGDrXaUcI04xRi9cgESeJXjLoVZLa2P31vCHWX76B1J6rIgLruOJC5yYVF x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH7PR11MB5957.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(39860400002)(366004)(346002)(136003)(376002)(396003)(451199018)(6916009)(66446008)(86362001)(38070700005)(33656002)(82960400001)(66556008)(64756008)(122000001)(38100700002)(41300700001)(7696005)(2906002)(5660300002)(52536014)(66476007)(8676002)(55016003)(66946007)(8936002)(9686003)(53546011)(186003)(83380400001)(6506007)(76116006)(316002)(26005)(966005)(478600001)(71200400001)(66899018); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?dwl5NBMx4m6xVKYavn6bX1BKpMDcdkEBZ5U79zV5CoGkpQq32YVYsiTqbLI3?= =?us-ascii?Q?BPzTakZpHNiDIwoD+gq9mApmQcoUUFt86jRJ8JQythn/fitEMXznd9ZWMUmh?= =?us-ascii?Q?/zxWbsiMQMhA0Cghzum7DLYvScVfiPGZ/fJUhesjcNDP5jM/QeDbItC2r/5Y?= =?us-ascii?Q?XszA93vDDJtzC3HQ0889PQ3tJE0442LlM5FlGsPP/UAkFjNyhfFboSPO1CeQ?= =?us-ascii?Q?OVpjAWeXCsVOU0FoEfX/dg3gcfOmIt2ZgKSGcJei2S6YHIUg+ICa6wCPj9Rv?= =?us-ascii?Q?W/I/xKw1GH8PHQ8c2xc9VJEVqsxHrVgffeUmEK6vemYrfxb2e755V7zBV39G?= =?us-ascii?Q?ZkZ84lWGFNF53LUF4+jRqB/Sm7FQfFijqMKKMwalgyN7eZnx9NN5klylyLa2?= =?us-ascii?Q?VEAEUEbXyKFe3krpoyqthBuIsOoQs/ywIzit8AAH0OBn5vEYhFzYxIDCHGPk?= =?us-ascii?Q?k2Ng2THhj6NLqRAU4/8H0vhA0H9AHVuA3Uu719FXtRAw5Ohf9PJsrzdx75EX?= =?us-ascii?Q?xjtNI8LLWhxJR8QHL5+9FuDpuRi+FMSaIk/Fj98P5vzPTg86BUPP7hy9vioK?= =?us-ascii?Q?g0KZh0Lvk/s+hR52dc2IYm6TadPvSGztmk+fmUFvB4T7Z15uYuWI6tQMI9+V?= =?us-ascii?Q?FtL3ckZqT7FcV5qAsjsdFKHcLhpLO0jDIeziZcBZ9eBb0h9NIArwRnW/X3bJ?= =?us-ascii?Q?x9sblM+7BrTdt/nkRgvFrFG2bB/B//iJDbDoT4OpjkXc6CZAZ6yXnxNIBmAN?= =?us-ascii?Q?uZarfUtt3eLBq3bx1dKLTxekFA/C7noSDggNj0ngi0iotN3PTNBQnWqNck3H?= =?us-ascii?Q?FQFgg52S/l0DSPjz96/AzetFHOKBgq+fCUIo95GQ5D2bYcdXrinOlngrkYOD?= =?us-ascii?Q?+ny4VAGd2CfPdR5GAcWfXrFdvpt7PR3IRsCwV5Xpx/CkEiODWnPM7i7GeJpj?= =?us-ascii?Q?X1ak8Fm8YSh2mOaC/a6rAslERQOA+CCYOVxvumFUEYHDZOg2Expv7xaJuwVy?= =?us-ascii?Q?wRgcMUx/OttiNWKEuSXd8upCXAbDMIbyFJzYy6aS63qjFc4vYvMM8y0+bUq9?= =?us-ascii?Q?ek7RbuvzpdGMYxh3Gg1UWzoxpNh3aPxliXacc5BmtOjGLOhTw3QF4XlzE1Yl?= =?us-ascii?Q?oE3vtUM+btJIkUl1KtYElBTOwLtUZKzmZCA5fLTHeUDpTGMrZP7dpH6j4oM6?= =?us-ascii?Q?q0VufQ53OZl0VmEo9kVeYrEMTGQRu+GADe11aWMqHdnxJdSiZtiwXxlx1QQd?= =?us-ascii?Q?PZ4YNsSmcXIFmKUqOKSaZVSKwNoR0acDTPs/49xrV5Xwzq2mGSgDQEmANHQM?= =?us-ascii?Q?g8Z/f3G3FIERNfTaPgfHWsMurKPz5KnmLONo0dWV+CKzC1ILeIMP3SaHRF2b?= =?us-ascii?Q?2KoxPYU/yiNpYvQQwnbgDhwLyJH6PKEKn3BnUvnxx9UghpB/i4We5rsggtDM?= =?us-ascii?Q?DHoC4iZ18uanEAA1EG2QBlzH3sYEl0Qja9d3GEDqFxGs8kX4erri2RAXoQfn?= =?us-ascii?Q?/I5pqrLZzkO0x+uJ4I7j8u2GlWSfJcgFIMa62BJfZQFZa2PMR+GdU44CRJ8t?= =?us-ascii?Q?8lBLKNBMN2yr6KgKQhl0qZtkcBaDQ0dUNE7llNYs?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5957.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69b88216-e2b7-4df6-89a8-08db2c189598 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Mar 2023 03:33:50.3071 (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: 2L2y5kxj2o+0O/GfpmfDKFjtHFYvBumVmMbK8WhUj6YHp8ktZS+29zrUxNxFiMv0pJMZ67SFI5nGblo76GGYbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB8176 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH 1/3] lavfi/dnn: fix corruption when TF backend infer failed 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: > -----Original Message----- > From: ffmpeg-devel On Behalf Of Ting > Fu > Sent: Thursday, March 16, 2023 11:00 AM > To: ffmpeg-devel@ffmpeg.org > Subject: [FFmpeg-devel] [PATCH 1/3] lavfi/dnn: fix corruption when TF > backend infer failed > > Signed-off-by: Ting Fu > --- > libavfilter/dnn/dnn_backend_tf.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/libavfilter/dnn/dnn_backend_tf.c > b/libavfilter/dnn/dnn_backend_tf.c > index 3b5084b67b..fb1a5f1350 100644 > --- a/libavfilter/dnn/dnn_backend_tf.c > +++ b/libavfilter/dnn/dnn_backend_tf.c > @@ -176,9 +176,6 @@ static int tf_start_inference(void *args) > if (TF_GetCode(request->status) != TF_OK) { > av_log(&tf_model->ctx, AV_LOG_ERROR, "%s", TF_Message(request- > >status)); > tf_free_request(infer_request); Please also delete this line since it is handled in execute_model_tf which handles the error case. > - if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) { > - destroy_request_item(&request); > - } > return DNN_GENERIC_ERROR; > } > return 0; > @@ -439,7 +436,9 @@ static int load_tf_model(TFModel *tf_model, const > char *model_filename) > TF_DeleteBuffer(graph_def); > if (TF_GetCode(tf_model->status) != TF_OK){ > TF_DeleteGraph(tf_model->graph); > + tf_model->graph = NULL; > TF_DeleteStatus(tf_model->status); > + tf_model->status = NULL; > av_log(ctx, AV_LOG_ERROR, "Failed to import serialized graph to model > graph\n"); > av_freep(&sess_config); > return DNN_GENERIC_ERROR; > @@ -453,7 +452,7 @@ static int load_tf_model(TFModel *tf_model, const > char *model_filename) > av_freep(&sess_config); > if (TF_GetCode(tf_model->status) != TF_OK) { > TF_DeleteGraph(tf_model->graph); Please also delete this line since ff_dnn_free_model_tf handles the error case. > - TF_DeleteStatus(tf_model->status); > + tf_model->graph = NULL; And this line is not needed now. > TF_DeleteSessionOptions(sess_opts); > av_log(ctx, AV_LOG_ERROR, "Failed to set config for sess options > with %s\n", > tf_model->ctx.options.sess_config); > @@ -466,7 +465,7 @@ static int load_tf_model(TFModel *tf_model, const > char *model_filename) > if (TF_GetCode(tf_model->status) != TF_OK) > { > TF_DeleteGraph(tf_model->graph); > - TF_DeleteStatus(tf_model->status); > + tf_model->graph = NULL; Same comments as above. > av_log(ctx, AV_LOG_ERROR, "Failed to create new session with model > graph\n"); > return DNN_GENERIC_ERROR; > } > @@ -480,8 +479,11 @@ static int load_tf_model(TFModel *tf_model, const > char *model_filename) > if (TF_GetCode(tf_model->status) != TF_OK) > { > TF_DeleteSession(tf_model->session, tf_model->status); Please also delete this line since ff_dnn_free_model_tf handles the error case. > + tf_model->session = NULL; > TF_DeleteGraph(tf_model->graph); > + tf_model->graph = NULL; > TF_DeleteStatus(tf_model->status); > + tf_model->status = NULL; Same comments as above. > av_log(ctx, AV_LOG_ERROR, "Failed to run session when > initializing\n"); > return DNN_GENERIC_ERROR; > } > @@ -940,6 +942,7 @@ DNNModel *ff_dnn_load_model_tf(const char > *model_filename, DNNFunctionType func_ > > return model; > err: > + model->model = tf_model; Please set model->model = tf_model when tf_model is successfully created and also delete original line 934 > ff_dnn_free_model_tf(&model); > return NULL; > } > -- > 2.25.1 > > _______________________________________________ > 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". _______________________________________________ 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".