From patchwork Mon May 15 15:28:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 41632 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1700967pzb; Mon, 15 May 2023 08:28:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4WdTYe4lizehwvehxwmvr2zbmKhoeUFR6FfBtrhaggYZxXr8y3Cg9lEPw3synexxsrr581 X-Received: by 2002:a17:907:3d87:b0:96a:d916:cb2f with SMTP id he7-20020a1709073d8700b0096ad916cb2fmr8083957ejc.36.1684164528484; Mon, 15 May 2023 08:28:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684164528; cv=none; d=google.com; s=arc-20160816; b=veo8h71LD9wiWzMOJtoCv6QnNGx7hFfha9PRIrTNAqB7GSHVWsnH7a9p9B0rxxN78B as5148QNirN9iPdixNSC/wcxR0V93MSgqTCIvSDB2r3PaADXTyaKGhlJmgzn68imk64P Gl9SyKANJHWG7mycX4BNUrB2cNgXTg65f1eCOBlmIspfrx6wejvLTprCSCXAyr29lEJs dussUQ0eQ4dplobdnxuKRW/lklnkLPzE+0t4Xk9c6DaVjjpEbMbG7qoRkVbjh2iSd3L6 E+PZh8MG8rmw2/vubLGzGVBvdUhavexyjuCaoxnhBiil0n9e3W6m8ZZo0YKlc2c2bPdI sr9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=UJc6F1pfbeycU7OhR2hlWTrsLYZCLiiZXw06OOBQ390=; b=Je8TPjlIN5dOlvEw8sYS+li1kVN5T9l1FWNO2MzK6/uyV0pQC15cLcewa6TOlLeO5r byXCU6XhnRpi+eJR7HF1MYs+aIxAE2VB6st0mFYePEQVLGww/prDSOnvNUvr1Rlcyp9N YJXadqZ82gnTPLPgN46PYzzL9f/OwH7rYNlQZLued1VZ7asaN34qRCzkGptDACjZnt2x N2+Y6WcDE50yzcnlxh3z/bRvJKP24pFrSawz/JNqX8IXrdyYpCeBtZL+GiQmithjx052 0pEtmkuON4/XtMMxcD0PK8oql2x+OnVVdW4l/4qaakiOlCGuoMY+DT5SVdN8f/0Uh/Mj Xqxw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g10-20020a1709061c8a00b0096600d49d58si11002236ejh.562.2023.05.15.08.28.48; Mon, 15 May 2023 08:28:48 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3191268BF1C; Mon, 15 May 2023 18:28:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4A3868BE7F for ; Mon, 15 May 2023 18:28:30 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1ab0c697c2bso119276185ad.1 for ; Mon, 15 May 2023 08:28:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684164509; x=1686756509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C7edYjj2fMshHjDBXHPkVKh79BcfLJr7RoumPMiBMV0=; b=cH4TrUvrfvP0pDP5TmDuKtdl0w8XAULQz+2PNPXsWpPT950/IBQoiud79tFzFRBIrw OX31gj6ej8YEn7oXt9H+LyWX2PKhpPVJx5kJeB/AZmlZkvJ7MLg5Thbvy7uSs6zInzMG J3Dn+q56XKUEoqFvDqNUrhnAlrBJnJri47GoKPXADxj3sDz11i2Q2DKQ845Wfe2Rjmxz raJoJUjciWR8SySoy0+BW8lP48s162zFLTViVYevAuTfqROWgAwzdqDKlCrixEwfelnm w07qkbYLavtHFSdAN7eYkgqczZRPigLAQu/M3Nm4VBo2m9GsTaFkMbopGBp7ERhflotv A1lg== X-Gm-Message-State: AC+VfDy/MNsUdeidPPq57djIP4imG1FxB4yDv7DmVfse0+D+PGDg5SEx FuATQC37LztzBk75ycIxmYyKnflhHIY= X-Received: by 2002:a17:902:f816:b0:1a9:3916:c2d1 with SMTP id ix22-20020a170902f81600b001a93916c2d1mr35207267plb.54.1684164508673; Mon, 15 May 2023 08:28:28 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id f23-20020a170902ab9700b001a183ade911sm4911807plr.56.2023.05.15.08.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 08:28:28 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Mon, 15 May 2023 08:28:20 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 May 2023 08:28:12 -0700 Message-Id: <20230515152812.23405-2-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230515152812.23405-1-pal@sandflow.com> References: <20230515152812.23405-1-pal@sandflow.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 2/2] fate/imf: remove redundant code 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iMSiNKmsBIgj From: Pierre-Anthony Lemieux --- libavformat/tests/imf.c | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/libavformat/tests/imf.c b/libavformat/tests/imf.c index a5bdf16645..a23b687c3d 100644 --- a/libavformat/tests/imf.c +++ b/libavformat/tests/imf.c @@ -257,7 +257,7 @@ const char *cpl_doc = "" ""; -const char *cpl_bad_doc = ""; +const char *cpl_bad_empty_doc = ""; const char *asset_map_doc = "" @@ -384,36 +384,11 @@ static int test_cpl_parsing(void) return 0; } -static int test_bad_cpl_parsing(FFIMFCPL **cpl) -{ - xmlDocPtr doc; - int ret; - - doc = xmlReadMemory(cpl_bad_doc, strlen(cpl_bad_doc), NULL, NULL, 0); - if (doc == NULL) { - printf("XML parsing failed.\n"); - return 1; - } - - ret = ff_imf_parse_cpl_from_xml_dom(doc, cpl); - xmlFreeDoc(doc); - if (ret) { - printf("CPL parsing failed.\n"); - return ret; - } - - ff_imf_cpl_free(*cpl); - *cpl = NULL; - - return 0; -} - -static int test_bad_resource_cpl_parsing(FFIMFCPL **cpl) -{ +static int test_bad_cpl(FFIMFCPL **cpl, const char* bad_cpl_doc) { xmlDocPtr doc; int ret; - doc = xmlReadMemory(cpl_bad_resource_doc, strlen(cpl_bad_resource_doc), NULL, NULL, 0); + doc = xmlReadMemory(bad_cpl_doc, strlen(bad_cpl_doc), NULL, NULL, 0); if (doc == NULL) { printf("XML parsing failed.\n"); return 1; @@ -591,7 +566,7 @@ int main(int argc, char *argv[]) ret = 1; printf("#### The following should fail ####\n"); - if (test_bad_cpl_parsing(&cpl) == 0) { + if (test_bad_cpl(&cpl, cpl_bad_empty_doc) == 0) { ret = 1; } else if (cpl) { printf("Improper cleanup after failed CPL parsing\n"); @@ -600,10 +575,7 @@ int main(int argc, char *argv[]) printf("#### End failing test ####\n"); printf("#### The following should emit errors ####\n"); - if (test_bad_resource_cpl_parsing(&cpl) != 0) { - ret = 1; - } else if (cpl) { - printf("Improper cleanup after failed CPL parsing\n"); + if (test_bad_cpl(&cpl, cpl_bad_resource_doc) != 0) { ret = 1; } printf("#### End emission of errors ####\n");