From patchwork Mon Feb 7 00:58:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp5361950iov; Sun, 6 Feb 2022 16:59:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwAYolEPPOaNRe5uWbtqqCJTDFD5O+zum5zcaccGuth5fyS482PyG7JqmnQDZ7qzEpQUZPi X-Received: by 2002:a17:907:216d:: with SMTP id rl13mr7757049ejb.193.1644195541093; Sun, 06 Feb 2022 16:59:01 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ho37si6376024ejc.905.2022.02.06.16.59.00; Sun, 06 Feb 2022 16:59:01 -0800 (PST) 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=@outlook.com header.s=selector1 header.b=kFthe3Vf; 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 71C8E68B205; Mon, 7 Feb 2022 02:58:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075106.outbound.protection.outlook.com [40.92.75.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E695B68AFCF for ; Mon, 7 Feb 2022 02:58:33 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QVFUer3c3+8nDbZ5FV9aV7oHFIYycb4Lb/3UM5ZlU/foBIZ+QuqybjPynn762g0UjTOBBI0ctstXkJuVOVwlmWykOttQaNun3G1AR6lEFa36nO5xyZtcFBfI09cKeFTIWvNdIObpf9I1UoJur56hqkasvmNLCkNa4tiLIUL5qZrXOo3vTUv03tTHOn+9pMjxSHd9lQyIxwjmdH/mklLraA3bV0uFHtcsCVAtVwdE8n0AGtSwREq5aMW8CsfkIpRclWDqeIMoCT3I0pyfOsRj53FuUhq8oRcQsC0G18J5LWQptWz2am12v6zkOfm1DoRGjp3JVnYk/ECAOVMJ3M/sSA== 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=xtbqBmldd+8iu2T7Q4KIGTJ37bQgklF6ppl+5YSTbTg=; b=SdlGy1EkTVG1SJpRYw7ADctUNKoxrLFao96O0xqnt6gBm9JDXboF1OiEETmut+nJFJIPUtipHeXUTU7TxDke1dpydd7LneRYVcqQF9JQl0iZ31aWef0JusPnAyNZeJwY6OpchqvBOlCr4uKecyLth1BTbRvYoTV/+11L3P8U6ugPuZ4Yo5cHikGZoRNJq0jHZ11TAWLgWUOHOGLIjO85yLbsOTcGz4SqRZOMVxS1v4igAIdmb6YOICKpOh1YHtf1WDbISKAZEhyueTObwncxRDSVCHyJVhTCcVzy6fvtko2KFEw68g+5oJtD209Cy+Wt50yffC4Kk27km4ldDgkunw== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xtbqBmldd+8iu2T7Q4KIGTJ37bQgklF6ppl+5YSTbTg=; b=kFthe3VfGp9Q4LkQQgcZqVls0xh6WvYs6D/p76Rsk43Y3f7omrertFcw6QSsDRbfkBxbjPXv1RujpuuCo0EOguzLzckIvBUPCHHraNxoIVB1Ge5yBq02HvDtxEQM3uyvXefQWqRPSxbnFnh7O76KGcC0m3TOS5JwhnkP0F2kzreSuYdefkzSHkGnH7HMYxDBH0tAiSYAWLX+I+X2d3u7312Z5WglV5Uc/IM6YZSaaIQn4nFdoZxqsdvbrPgXrOTzSLfp/ieW4dxVuFXyB469uAtAw3MtVUalSX5/a7iE5omGralzmOEBVrAIcCm01M17p8sVtgef9euVXSPLK6uN3Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5559.eurprd03.prod.outlook.com (2603:10a6:20b:f3::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Mon, 7 Feb 2022 00:58:24 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.018; Mon, 7 Feb 2022 00:58:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Feb 2022 01:58:08 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [JRmQ3OImtcPBQbinMD3OlsKCRsVW0sSz] X-ClientProxiedBy: AM5PR0502CA0002.eurprd05.prod.outlook.com (2603:10a6:203:91::12) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220207005808.635200-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ebedde1-86ab-4712-00d2-08d9e9d4f17f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSDApSgY9IItRoaJ3UYzLbjZYI+nQGc8Aqnjmjv6t+aigmwlQvpePJEpHZ+s1l1IbYLMhvbKzhOHiHjF/qBm2ClNPrOsiY99URh8V2Z3Cdh/LUY8w07BCgdg3SZ1/pB2Cxbl0rXpPRqGBXZgIaWt9vtmxtDDfEd4kXuqFhCkbngX3Z+pCaZrRThXj9GqU5EHIqmwHke6nU8rEKvmFmZwVLDdvJXutg1/TjSw4fofxgArgDZChid3/TxlBuc7no1FwxhS2e/5xMmx4kKRYtyc0ojW1Z9i4TimvVqTzHJFa46261zKqB+UNeqXfXXdevxOIqucRJcMw/W0D5qC6hVJpwaF/zTI1jG/+QIkJ4wpO3VFAX1fXrsx6wpk3eyWrv8c9h12XejelZfFCsIFaYYsCGVfJNEPzFdqMRxvjsggSByALlMqOBElmzSDxAS15l0uwKuK4fxQhcihbRSW0Dbn853iWAUBFuvHPqhGIGpGPYS5/nqWjyYPxahey2ZrUxXKpLZbkuE+u4uB9Kl/P900ObSv08SEDbreTMddzEzjpPT8j208DZdMWRG/f/rorNPozjQNWAmRPyjhAHbBMN1uJ/j1RHqKQURU/8ADpzP7fh392P2kCycRU4XSWPHghk6LZlo5P5pVXlsYl3eNRiaPocZCEadgDVij69GWw5a7hu4bfb7ybpm6z6WGJ0iF63Hqzuc8ovNSeroDDHZUY2Yl52r3fQpHo4uph0w2vsbuDzazQon4NHnTYmdSMjWA1EeBw4= X-MS-TrafficTypeDiagnostic: AM6PR03MB5559:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D+GIfqJTCjLPDflqUaeYPeld9U8IFRiSvvfk9dQzfDVq1r2nQNiTRW8VisVo2iK0oR9ZFTs7dmK8EUnBEwebGmszlFmte+lA0u74BMx613p1MWJhUL0h2xv56Y0MRhqrVj2CRzecIbhmiy6q03u9IXwtWbSil1o0xgrU/2rquygpKPqKhTkLudsHo9YJXkoD7AG6XqVG12dxa11FwuvGURcDUq2/IhkaLJp0umcVthYA/12asp6lu/YEO63X4ejXKRo420+avcuoqO7cqdTrAUUex7mSeEzk7lBn0iRYkV4P3LUtrBB9ncpytFlKYxsHIe+V3gc5YvwnCPxXpkXxglN4RgFNOyyzXtDGkEYvKKcGrTvXVvqPPNpgdJ86NUgzGeY8K670REJ9aUA7mr2MHd0OovItN8IviU4cFH1DsfuZgcctlHuooxis3+DU+7U20ZFo+hC+1fSFi4B/VRm6BCz2weHENQZLqNAHLrHrrm7la+8phvN5eV6ll7XYrIwoT6UK2zmfm7YhU3U4OT/JYXDvGeuZY/ASiAOTojZHYDfygK3D1JuuWYrVuzLYKPif9GLis+0xk2KcZ4xlYq95xw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hmDgY7atzDv1DXc2hnJWGPAp317mrO5dnjpwtMfD7KXWhh9OtSYeRILV/uGktpN6AHhSrO21j8uLFULnlt847DQifjbqvJiWtpWmTuecwGMFZIRO8su750ANVLeQDUlh8JWDuk6EJBDngrZ1sGVFfFw30qdjTga3W2UwBiYafjKZaGGiUKonSwPlEbC5y+O7HQQRfu7ZTQVGK7Z3B+f+/rvoS416LQQKxbax6QXQknNe2UJ+5LU9Ro+wY4x0IsfMrCq6sO3Rfyhhz+US2Ehtkr2v0Lzf+MgJvSAeC7cqfGMAtLRgWhdM7ykOgiC5ZRCsFLxaNCEQ2H107FTSEG4qy3Mttykza6NlDpBBSsNAoI1y+2Ots05qW53CCqO5RwO8S3+lNVb4BhVO1gzPxLWkKvwXRvobZf2fkrby4eX7D1lJ4GmR8jlWMgBU956Id2kj1LD3h/nHOWixzso82Y5gOfFuTbeL8GNdDIlnrZrylgfkWsvyYKod+QIQm1Qb/lForcKhl/948A+mx2xhRjuvnux/4aaZD2aPWZlXkd1zjOxyXz46tYENfBgZ7Z3kKBDM0CS4IQ2vHcT2yd5l45y0wip9yMwUgzNS7IIDozdMLSftuOkfL294obIqmyXXhrgr3kz4rmemjBDKb/4hJzh7J8BqG2ohlWPQoh5twHo+KOO8Tinb4R3YjD4MZ8ecUwpCC5IkwG1XYI/rEFwK6EX2EU8TnxT3oRd96LoQ8pFgenjnWsMmXfIRfHoSG8DZvQNbMdoTm/AtUskCYacAz1WCeXvIupUrHI5xTk64qv4zktbKC5skKRiSAsEEjlXCK0V4Mw7mLdSf0SkinTGItXoyzjbSzv6y9hyL82VOOa4/sAThBMPTOl6+aHovL7dYkuSE9nnefzIfviYg5EhttiiD+uYbG/oVWHWyoehFxl1asr9dS2TqfYcHn8kdyZZYg61qLPLWiiTJBFnJjuroLNEYZA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ebedde1-86ab-4712-00d2-08d9e9d4f17f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2022 00:58:24.5316 (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: AM6PR03MB5559 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/pthread_frame: Properly unref frame in case of decoding failure 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bQ6mjwWODmvH Use ff_thread_release_buffer() instead of av_frame_unref(), as the former handles the case of non-thread-safe callbacks properly. (This is possible now that ff_thread_release_buffer() no longer requires a ThreadFrame.) Signed-off-by: Andreas Rheinhardt --- libavcodec/pthread_frame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 75b70a17ec..27ed0b2cc4 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -223,7 +223,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avctx->codec->caps_internal & FF_CODEC_CAP_ALLOCATE_PROGRESS) av_log(avctx, AV_LOG_ERROR, "A frame threaded decoder did not " "free the frame on failure. This is a bug, please report it.\n"); - av_frame_unref(p->frame); + ff_thread_release_buffer(avctx, p->frame); } if (atomic_load(&p->state) == STATE_SETTING_UP)