From patchwork Thu Sep 23 15:28:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30485 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp565633iob; Thu, 23 Sep 2021 08:29:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3t2bVl0OW+2TrioolcubxG9ujd96+UZwp8kDwS3++OQf14ZNUAawcvbCYmn4jwKZIN3ft X-Received: by 2002:a17:906:1f09:: with SMTP id w9mr5905633ejj.472.1632410972830; Thu, 23 Sep 2021 08:29:32 -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 i13si6511841ejo.684.2021.09.23.08.29.32; Thu, 23 Sep 2021 08:29:32 -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=FqyqIGHZ; 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 0E8B268A936; Thu, 23 Sep 2021 18:29:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065047.outbound.protection.outlook.com [40.92.65.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB9FA68A6EE for ; Thu, 23 Sep 2021 18:29:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O1JlvvX7f8MEH4yEqoIjbxmyPp6qaFjpC1oXruq/OTyt6GWxiAs7UopKIqu0EoYRbN0WDvoWwnVh1RFL16BN8C1oTuO6uAruyfDNZ5UnkCs3Xintrr0i2QmyB0aAKbu40dA20MG+CTeRDeXR7TDjJkn/0ak7x+NfOazybrC00SOX4EXUzKnHV74Gy4bLqkiyMFvg0cKezluWXWFemL2iBwAkw01JrkvBDPiINtZLFHrErqVxZCjGJfhaRVuyFAN5JIcnXxrTyPAjR4eDjr5LQU6CvjSCNb/tga8SXGjNUSHIHMh5UfTBxRFqVQC/NriCtF0F51JMWr9P/4ABtbEHFA== 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; bh=MMyp51oPh88bA5Hm4fK8SX2+oeb/x+xr0bSl5LL12ZE=; b=VK6zL6EqWI3PfgD8poMbk4w8J1hI/cWOhjbkPqtKoMDBWOSylhZ2CgG6NoP+H4yVhtg1cTGo9pWB9kPkV0lE8EY9mGJuw+boNsfkKCWOPla4Ldx94fBogqHxw0Wns8A1qE1fbTxwJEDVnSj5oBhA7qQguna+NeVMzC8cVoVjjhKMvAyLG6FXABZS2r6UXDWimYlJUAh7V7DhnF8WqvQGGeTeplpJeFQz7A/l+thiFxDo16Kpj33QW3nFFUowwYZSIzPZTp+KGzt/cVci7PRXtkMgDiwylwGLYIKqmBYgNoNr7MqwpLO90fEj9vIQ+U0NCAxNqTP7piaKAYf4Ci5I9Q== 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=MMyp51oPh88bA5Hm4fK8SX2+oeb/x+xr0bSl5LL12ZE=; b=FqyqIGHZSJLpqVFHWZijGK5pUChaFeklhD7+kbcb+x8YFIDQgWhEIN+35sKUkHXRE7VHqOIfPaS5qszBUO+rMfL8f6LqLA+6Mo6Z/3POOerwu59WTBJrGZ6TRF5hk45uyjAokdLs/hEjnHvCrdBE/sNmE18PzzZNErBITL51ctRRzqtAdkUIkUufv+Hc54LA02QPAzNi+0T1EHCXPJaxRpFthfCyTFpM0FqPhzSIeR5ozboPAy0c/mEa6QA4QP6QiTZPUx8r10NIQAOrjYPKPblSbxRBxlTidKsbWL/rK18J25GrcxLnIRq3YvopaYvtwAqmE/tqXBjPVRfiOztpPA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7061.eurprd03.prod.outlook.com (2603:10a6:20b:295::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 23 Sep 2021 15:29:13 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.021; Thu, 23 Sep 2021 15:29:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [oTKGRGxA28T4kn9x16t11wuc7sHV2huQ] X-ClientProxiedBy: AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210923152902.42865-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 15:29:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 997b1b54-30d4-43af-1ce0-08d97ea6e573 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWt8qMG3IjM1pM+gnFiFAdP6pBqN8o2M3s8S0mVmw3eTG4zFj54oiZbawbrfW1NYPjrMKpYcyYrOrwPSyK2X7KXsvsFxUToahKN2pg/gHKODfjkDO/EqTWulR/6iMa9I9iHiCWghueUE+03GlYSSe3LxCv+K4+SeR6+7KDgUa2Jkjpqdo12n7SnRXhHueE4BpjeA0MhXTmB7gpvR3zyIsZj+YyAsz1S/NNSUXYNI8MyvaotO+dScXjDhU+UI8fyO0zSsiXOX/nANKAgBs0oehAv4rQGSObS5PCwMknV+mKykS+lEBopgsn7wectH4N4VEQq29lQZogtLoAu3CuwjmS6xlzXVXFJVLkDHBzSOsUyyM1L+zsBZKsXHwgo4EaPnlWjxcgRRWGicCjkNVfCfMmNqR8jvYGd8j+UkuefCIqbGA1zqwu2YL4oN7RuV/CSZGshtQmtAgXdNcuLH482Wv3ZG6fPwhxspN57DQJ7UoU/5t2Up81X7UXlOQokhxZps1wITXGohlSoqt9r+ov1EEgrri6T/uQWrVhQVAz2msFyHdBS4SX+tTiiEWaOrWag1I5I2R9gqByWRA2Y5+RFF91X2FEiHaHvAq7MEyZwfqjXSNSr79qW3n7bhMZ9rCaGhqqFdWOQ+nEasg4x1fu8wJ6dHwPRibFExzCqDvHT5k5OxXPUkHpr/amkQaSd38eUdtc2c7i7pi/YPfW/VZvBRXd0Z6wC4zfRMo4= X-MS-TrafficTypeDiagnostic: AS8PR03MB7061: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v1flHeW7JTiXVT334ykytdydWAt3syiEONcKCVMB7GCtk0g1aznvdmb8mowNQCcuqw0MDKRR6IFLCF1zn0auooZaclqdvfgwWxyofOLyl+EUc+7LrCRbIgz1pNLuCcjI/lAB83qYdJ1hMuIjZmvBACmCRvO7UmbxaujeC/zlQ7Qxa/ztJwgYCahAX332JUHbhHl+y7zQBcHMyxH3/nRwt6ysjURkYgDVT/EUoKq8QV2j9fz8V2Mu4D6+AZxMJMnp98O6DSzEatf4IgGxpWjGT+Zd/9h98vbkwCyPumxxW/mFJMCxPIC/+GkytDZJdQ4jO3o29absfqF4SfTPOtiRn/eKEvbP/uSBDC9V1ipx0t1N4QMh07wB8qxux28MqA2RPDgxUNY7BTl3IgZi0XN26jp7PWhGN3QIc5eOURQQgBnmdRK4H4ggnIyVtdU8Yxvh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OvU8z30kS/yLOWDvIshivsjMKr0we9gAFbnxO6FnKFmPNutALEIC2i4NQb42jzVLgx647f+aI5Rmdce+g6Y2wvRmhuYYBl1X8wQl3m+MeqKtTSBKdec3/TVIAPdqB0zdZBN+vKYJrWKeWvvsMVAlVg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 997b1b54-30d4-43af-1ce0-08d97ea6e573 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 15:29:13.0814 (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: AS8PR03MB7061 Subject: [FFmpeg-devel] [PATCH 03/27] avformat/chromaprint: 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: ZMJhoO3JQ6ka Signed-off-by: Andreas Rheinhardt --- libavformat/chromaprint.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c index b7a943e126..e4882c8e61 100644 --- a/libavformat/chromaprint.c +++ b/libavformat/chromaprint.c @@ -69,47 +69,45 @@ static int write_header(AVFormatContext *s) if (!cpr->ctx) { av_log(s, AV_LOG_ERROR, "Failed to create chromaprint context.\n"); - return AVERROR(ENOMEM); + return AVERROR_EXTERNAL; } if (cpr->silence_threshold != -1) { #if CPR_VERSION_INT >= AV_VERSION_INT(0, 7, 0) if (!chromaprint_set_option(cpr->ctx, "silence_threshold", cpr->silence_threshold)) { av_log(s, AV_LOG_ERROR, "Failed to set silence threshold. Setting silence_threshold requires -algorithm 3 option.\n"); - goto fail; + return AVERROR_EXTERNAL; } #else av_log(s, AV_LOG_ERROR, "Setting the silence threshold requires Chromaprint " "version 0.7.0 or later.\n"); - goto fail; + return AVERROR(ENOSYS); #endif } if (s->nb_streams != 1) { av_log(s, AV_LOG_ERROR, "Only one stream is supported\n"); - goto fail; + return AVERROR(EINVAL); } st = s->streams[0]; if (st->codecpar->channels > 2) { av_log(s, AV_LOG_ERROR, "Only up to 2 channels are supported\n"); - goto fail; + return AVERROR(EINVAL); } if (st->codecpar->sample_rate < 1000) { av_log(s, AV_LOG_ERROR, "Sampling rate must be at least 1000\n"); - goto fail; + return AVERROR(EINVAL); } if (!chromaprint_start(cpr->ctx, st->codecpar->sample_rate, st->codecpar->channels)) { av_log(s, AV_LOG_ERROR, "Failed to start chromaprint\n"); - goto fail; + return AVERROR_EXTERNAL; } return 0; -fail: - return AVERROR(EINVAL); } static int write_packet(AVFormatContext *s, AVPacket *pkt) @@ -124,7 +122,7 @@ static int write_trailer(AVFormatContext *s) AVIOContext *pb = s->pb; void *fp = NULL; char *enc_fp = NULL; - int size, enc_size, ret = AVERROR(EINVAL); + int size, enc_size, ret = AVERROR_EXTERNAL; if (!chromaprint_finish(cpr->ctx)) { av_log(s, AV_LOG_ERROR, "Failed to generate fingerprint\n");