From patchwork Thu Sep 2 15:41:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29966 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp401444iov; Thu, 2 Sep 2021 08:43:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPadsdChK09AMQzxTw4uqVVxWixwfUTUhduxDnzymek0BXcHU8N9ENUISP01e+K5T53NyM X-Received: by 2002:a17:906:3708:: with SMTP id d8mr4578999ejc.310.1630597435083; Thu, 02 Sep 2021 08:43:55 -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 z26si2691563ejc.230.2021.09.02.08.43.54; Thu, 02 Sep 2021 08:43:55 -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=@outlook.com header.s=selector1 header.b=WbtQIxbK; 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 C1C9568A6E7; Thu, 2 Sep 2021 18:42:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064055.outbound.protection.outlook.com [40.92.64.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CAB768A628 for ; Thu, 2 Sep 2021 18:42:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n/TVYxgquYhbAgjrLUDNKv/qJAxLcz0HARRnXo2L6yXTc45Mc3msXSC4Qis1ikn/iPSogQqKUzEBabcPv9BtBK5a2a03nqGKMB4O8yI56l/WSvoSYIms8LbFjtpHjlmbhchhqqcgisdCToOwwWOgrCFG72IWJEBAip6H6yzmxVW7OjMi8x89q99ucC9noDFJ9Ve7IOQU9ykh3hOXXBjP1Pf5Nzve0Rqd9p3XslUVoTZE7VgaAM5BSc20ru3ZZbZu3K1if3L5UQhjkcAdYziCI0TG5VGHByN10UAm148xF4tbKcp+9/OY7td9QO7bdDN1+dctA/BTun1Hl+VktSbLTQ== 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-SenderADCheck; bh=JcmskCyF4GP3XGiQ3YDq2guJhXsANNXS/qlwL9hQA+0=; b=DcTAYQuoJq9VQy6oXslFjNJP/3R4DccwbQtVcn8C+ZgEnEfaHNlE/EY2U33kuPYbmGNuWCQCNmsKoQTV+o3PxUy9GbUuFpjMHeaczCMl/ROcC4slfv+IqtJ+RZE3OcHhKzVzYdSZ7710PurHaR9xNpFixr79+xg1OoI5nZWk7wV5L6aCOd5OPzoqjXdKiGLScfkgb9sPc/OaANbq5oIbd1/XQRPH/der8kulP3Y7rlXRsPYXr9fuD7xS3AR21//XpaFqScQh1wA2eAyR+Luz96dYHZvSKUz1hO8C0UmTFZZQ1fZhqvwOMy1sg/ZxyHhtDWL8hlsLuSLuCp7aI9MjXw== 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=JcmskCyF4GP3XGiQ3YDq2guJhXsANNXS/qlwL9hQA+0=; b=WbtQIxbKzI1PiNuevl14rNo59OkSm+moSQRdTh1s5ewwJBDvY4U+xsJOWAS5TAwBH8NH4HxeniXuNpkdKXYP86qXBUJYMZexzist1wlFjY+7+fpy0YLSo2ct2VH4FAKW/PP8O2LjAoKL1PHuUKOYEvM1JKZkrg6vi+aWBRRFiKE9TTuuEs2eETervTawHPh0gySoZfdVPf+dSTOfdFUWclG0QTIWkkTf8nJK3QKENPKQZpHqCNV2rnBr5HzJqUqny9Bi6TheoMN7gvnHdce8cpqQj2/XyVlR2gxy4utUAMMf9XWiJ0ZLy7CIEdVJBqdlri674oMRq+lP6h6Xxq8XLg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6532.eurprd03.prod.outlook.com (2603:10a6:20b:1c3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17; Thu, 2 Sep 2021 15:41:51 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5%7]) with mapi id 15.20.4457.024; Thu, 2 Sep 2021 15:41:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Sep 2021 17:41:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [/3yEpt1edN9Pgyhe4rwlMZrsGx9ZOzla] X-ClientProxiedBy: PR1P264CA0031.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:19f::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210902154127.2571616-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1P264CA0031.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:19f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.20 via Frontend Transport; Thu, 2 Sep 2021 15:41:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3461d32-14ce-4b16-f8e9-08d96e282f01 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UI47HzvBIDxi1MyuBlz6AIUMLYT2iYSqZDHGmX5QmQght46p/pEA/2xMGW1nN53w3Eyfv7Pp0pkJJuVJu0tGyLgdf8ppyDKbaDeySduRrt5ocNyaW7k//n9YjCNJEr4NWRro1gXxWzLFsmQg148NizAiO+nBgkvQRP8iVVyPynNgF/NLppkrZCVJmyOjGnLbYAI5cxHAr5qrygHTFm4flcq4xlbCmP/darY0K0D+1MD3FJRI7e6torM+lQH1GfrjDsywOtPt+T4r0L2oORiYVpLlhu/Faygpq1crv5GAeENxuP3qcmQU8qYKGEDwYLt9C+DA3HKSjoOHeKRtwhnPcvnl+emuGriqVkmajqYfQMJx/Jxf0UEtt/lupKl2SvwEuX+zs4dp5OHQaUP7hC4cAFv0ui3Nmr9I7dYJLUpTXzmgvCb7fdXs3RUDMJjox8AIQdcwarNukYZNmbW1a+IXDLyZOfFR7FpU4jXWdWJCUZlENcpNxADoS1npotkS8BAFtFh92c3MIeMXvCe8S4hzYS8qimgoIyfXhH6rLbrPxiQst+HXcpxPmWIDbmuSh57ZxUC123tST3b7k4W4zQksvC1qMghkGk8n8IS8ED8YUj4kKWDsaVKcQ0+/mLxfS7S6YQEYc8Ijtfh9Kg9m72HMr/fnnHzUUzlcV01pd536uvq9a3wGss0jGKlyyoNDnCK9TjTxhADoKHRGQ== X-MS-TrafficTypeDiagnostic: AM7PR03MB6532: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gpkyxeIdokr9nxQF0satD6KgdOtecWhBsGUzKVJ+iXPGn8joSyZ5jo0O6nJ1uJSkLIXH0YEr143zarWb8PHfCJhPZhS2x/CESDVbQwzHsFZnDHzL/Eb6ThI8/j7WahF4GEdUDbD2QldIAx1Hr2c5vX/A7mBXAljY+HNqm+qPVR22hZoIKbKFy7H2p8oYIddFikdoVZspei11rkGjvImrkSZinYiWHbG7aGUkKrCrEMsqruxl92Ii9XiLoW3FrughmSI2e2xtz97jZuxh/900GipODQzZVrgczZ4GRFEUDLwdm4qPyLVuyBJXV/S5nQL6bAB1hdbmFpTeQ807glPbPfZ+8TpeWzup5ScMbO2basIqaRL6+VRMFN/xPs5LQQM4L24A9524x3gc6OoesAIvkh+ghCAitRe7wXiV2/vSpTjZJ+CivlIdPKAqkX1iSlUb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2ICvfTTnfUeguYaJnIC70BQ1U+dGytv9r/xy5Go4YK7ERWbH/JK6TKRz+XBF1nKfc1quUQvI5M+I48cfQ5WPfl4GICljM2rXAc9FtgZ9u9ad8R3hi9hOnBjmOqecEU0wYGJQre9JREMq5UsZbSzu/g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3461d32-14ce-4b16-f8e9-08d96e282f01 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2021 15:41:51.8958 (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: AM7PR03MB6532 Subject: [FFmpeg-devel] [PATCH 10/13] avcodec/frame_thread_encoder: Return proper error codes 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: J73GWFN3zFjq Signed-off-by: Andreas Rheinhardt --- libavcodec/frame_thread_encoder.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 219d65cce7..e9a5a146ca 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -202,15 +202,19 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) c->max_tasks = avctx->thread_count + 2; for (unsigned j = 0; j < c->max_tasks; j++) { if (!(c->tasks[j].indata = av_frame_alloc()) || - !(c->tasks[j].outdata = av_packet_alloc())) + !(c->tasks[j].outdata = av_packet_alloc())) { + ret = AVERROR(ENOMEM); goto fail; + } } for(i=0; ithread_count ; i++){ void *tmpv; thread_avctx = avcodec_alloc_context3(avctx->codec); - if(!thread_avctx) + if (!thread_avctx) { + ret = AVERROR(ENOMEM); goto fail; + } tmpv = thread_avctx->priv_data; *thread_avctx = *avctx; thread_avctx->priv_data = tmpv; @@ -227,11 +231,12 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) thread_avctx->thread_count = 1; thread_avctx->active_thread_type &= ~FF_THREAD_FRAME; - if (avcodec_open2(thread_avctx, avctx->codec, NULL) < 0) + if ((ret = avcodec_open2(thread_avctx, avctx->codec, NULL)) < 0) goto fail; av_assert0(!thread_avctx->internal->frame_thread_encoder); thread_avctx->internal->frame_thread_encoder = c; - if(pthread_create(&c->worker[i], NULL, worker, thread_avctx)) { + if ((ret = pthread_create(&c->worker[i], NULL, worker, thread_avctx))) { + ret = AVERROR(ret); goto fail; } } @@ -245,7 +250,7 @@ fail: avctx->thread_count = i; av_log(avctx, AV_LOG_ERROR, "ff_frame_thread_encoder_init failed\n"); ff_frame_thread_encoder_free(avctx); - return -1; + return ret; } void ff_frame_thread_encoder_free(AVCodecContext *avctx){