From patchwork Fri May 21 09:17:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27864 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp341457iof; Fri, 21 May 2021 02:20:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4r7aXPfayLq5BgR9HlT35AwtmB3ZuYcOFpBa+Fv/vw+ZRdMcpghjQcoA5Ixa4qwEbWDSt X-Received: by 2002:aa7:c359:: with SMTP id j25mr10009132edr.171.1621588858129; Fri, 21 May 2021 02:20:58 -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 d24si4601269edp.529.2021.05.21.02.20.57; Fri, 21 May 2021 02:20:58 -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=pTQaEQlO; 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 69885689E41; Fri, 21 May 2021 12:18:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073084.outbound.protection.outlook.com [40.92.73.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41764689D84 for ; Fri, 21 May 2021 12:18:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BuEe75jmwDPTI1bC3qblbxf8VJ6JTqU4r5aijzBHrny940+NcxwX2ZgsUM+9it5TfdI9t+McZvwld8WWh14Fb+syeoZrhxizq5PwWmcY92CVspvRQ9tH+jmJEO93YVX1nD0dvBCfprCmZbi1mBiUYrxZRu+dAnkNiJ3caEsAexcGDbyIr+loEWCRYlfWcJNJX6P30nmstYSnSpRwT03YWwtJGwW/67nXL7DA+GLjTevUagPeVLFoXh5I9S2ADGdnZVst2i/uGU9ncOfG6YW6cyU0j06Q9gqPRz1TpO60EpG3FKkcW40u0NZElVey5R/JZ5am9lnFpw0+beGbajD1wg== 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=QwD7lyZ+lSFDLWueHRfqsOQ8YWeFPy1q3LKAkrzyj9A=; b=mIA/lHAkqBDWSI7VwaoF2aENcywUm9dahik4zcYL4QBf2I8GSNELCBmUddrbGS9nM7WIP2Qy2ZiY+dzoTiu7mD9WdQhY8nhzJjmTXp5+KZO/0qQ5SsBzuTsQfgNHpEimk1BxuPY4E3jb/GTzSKQ9DZdKLgulvKD0LIMfBHaS7YAfsqZg9ZkZuxbBXjqrh+En0CrcH1N1pJ/2voAtbkxAJkbGRrxXwMihAh9qHuS464tQzKwinCVfRQCJfniIES7QiLEAcToIvIU8OdM0wGr+HgD4BH4tzhKGCg2NmjRH4zkdgGDPB3BXdVpY+73sx2o7c51ZYif2G1wn8lmZ5iQSjQ== 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=QwD7lyZ+lSFDLWueHRfqsOQ8YWeFPy1q3LKAkrzyj9A=; b=pTQaEQlOug+uG3My544+mM/JnzkKdKr1hzLNfW2M1nmTSDKHyc4oOmAnxumZaulW9UCDIlx8L0/jFdVdImYXfNAhau2+dJ8qCeEHneet4LW+qF0aVZRJOxAz5m0NEBkS+gFfMdS6uKx2GdMyGYBZfQqFkKhRfCSNG43ubVMp6sJZZNd18PtHR4ZgbwWe/iG4NI0LlOl9iQNooFF6BcMhGJAxyys2silBOLoivNyCeoHplCJ0GdnoM53EDuNdUxrRlTvgrTRxg6oFGtxG4CQQUE45NCpeDGtMx+FCXNIv8Hp14SUYfHcX65Dmw9JwM1DgATnu5VlpBHH0XrNh8fyECA== Received: from DB3EUR04FT030.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::4f) by DB3EUR04HT059.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::194) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Fri, 21 May 2021 09:18:20 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::41) by DB3EUR04FT030.mail.protection.outlook.com (2a01:111:e400:7e0c::99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Fri, 21 May 2021 09:18:20 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1323F0FBFA8F2BDD377F1E8CD3A63AC569D3584E4A1FCCC5C52ACCA55F0345AC; UpperCasedChecksum:C24F458478BD26B505CA32428EB5109CDDEF8575F7AD7B9A178D5053A85005DB; SizeAsReceived:7582; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4150.025; Fri, 21 May 2021 09:18:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 11:17:21 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [wDffnm0ZojiR+ZK8TkEsfmMmzhlsEzPC] X-ClientProxiedBy: PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210521091742.184902-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.27) by PR0P264CA0070.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1d::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Fri, 21 May 2021 09:18:20 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8e470242-6e13-4fcd-e5bd-08d91c396041 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIohmq9k/yScywu9xPSfiUSTwcrfMdrbIAPANbrxbqUIIiKa1x2o9zri6dI28Vdn9sGFVDUkjE2rbMoYtpXrEO7YT3FiXzNfuE8jrQeJxk0bN8AOovy2w2ZD5i0aKXO4hihNZP/BgU1c5cB9f380y/n8F2mDwRgeq7S+Gk3a3yfjKdR6bWds+JuQ2SZmjkAXKiqFMa3PYrjQd+ApnBtDd1sfS0MPrBs7zejWVJialsaup37J2kMvInCUjx1vhGXEeSH4EZ0/1FkZpfJp0MGL9pPsF6E0DDoGh4JkesExaaKvONHA1vPhhs7WjAbddPnXwTz+8l7EwKyC01y7YPcJOddRMyKLwKIIwcrISwnsIYUdsvN9VL8Dc5zEb2nkVLc8tWC2hz9+17igTfDvaYHs3nz+7Lya2alXoiepOuplM91q/p0OldNoXvdowQBmiOJEv9FilDnQmsjkE6+EXKGMRNdM3skivAqiS/B4jmpx/aEg5WBkuKDIjjQM2/eGUZns09ihr33hoKi/BNx4tEyePPCYxZAtSh6CrqoL4StU4wb95VB/r+V2tm5wdGb6qhCCdB4aB8Hfcq93Gg/hrISMCQFd3YziSE3IGXQvmnOUQUIIu1U6TbxgR/RxvUreRrK73v1QtND060XkReNOGSRs9yoQfPVHWs7Fr/foLmYTDXVmNAj99Bvd5oOP9Q+WzQ207DadTGOt6RdOA== X-MS-TrafficTypeDiagnostic: DB3EUR04HT059: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iQ3ht6CNEuG47mGVlMYcNqU5k5Z9nwQB6PJf0eOxMNmPx89ddNitwVingMwrDFGqQ+1MKv6T16oRpZRBUgmVXXMfe06vWbbh+q4Q2lwyvhp/ykyUEbM3YRda7TmpNpvAT/PmLeS75sXZOMppZ38cxwplcUWvUPTVk81CBFdqKuxRP2axU21kOUgbmaJJ61ovhrjScu3PGXfjeqFR3I+UEHHRcucImKtNRfj8/yN/6tf1Eb7v+kJvSUd1jLCxM06qm0GQEIW45QO6kZ+uSAjtUxhqU9yp06DoYrwHU9PD8KulsQPdKkTAmWrXl2VQ4mvEFOxQay17mndh9XbPxnzgY0Qpa8QPQat30JRhgw6fyzbOw2TxoQbmFOjFrbCW/LhvXVtceUbM6DzY6SnNwgv8fw== X-MS-Exchange-AntiSpam-MessageData: 0ZsrxVf5+0CF6gvB8aOcnXfyclXR4kelVmQqNLmy2CvLzLGbdNDuLp3zLD82H95I8bPQXrc6iYh2iIlzLhKhFIu5DGKxFJ5IWYl8Z67UwSC5+cT8SK2ENNlHuYpdVPGojY6QgO95UHDWuVVR5akIOg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e470242-6e13-4fcd-e5bd-08d91c396041 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2021 09:18:20.5789 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT030.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3EUR04HT059 Subject: [FFmpeg-devel] [PATCH 18/39] avcodec/libxavs: Improve returned 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: aBVv+HDkoJ06 Signed-off-by: Andreas Rheinhardt --- libavcodec/libxavs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index ea53c49d38..88f674de40 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -112,7 +112,7 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, int size = p_end - p; s = xavs_nal_encode(p, &size, 1, nals + i); if (s < 0) - return -1; + return AVERROR_EXTERNAL; if (s != 3U + nals[i].i_payload) return AVERROR_BUG; p += s; @@ -146,12 +146,12 @@ static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt, if (xavs_encoder_encode(x4->enc, &nal, &nnal, frame? &x4->pic: NULL, &pic_out) < 0) - return -1; + return AVERROR_EXTERNAL; ret = encode_nals(avctx, pkt, nal, nnal); if (ret < 0) - return -1; + return ret; if (!ret) { if (!frame && !(x4->end_of_stream)) { @@ -345,7 +345,7 @@ static av_cold int XAVS_init(AVCodecContext *avctx) x4->enc = xavs_encoder_open(&x4->params); if (!x4->enc) - return -1; + return AVERROR_EXTERNAL; if (!(x4->pts_buffer = av_mallocz_array((avctx->max_b_frames+1), sizeof(*x4->pts_buffer)))) return AVERROR(ENOMEM);