From patchwork Mon Sep 19 05:22:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guangyu Sun X-Patchwork-Id: 38040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1021322pzh; Sun, 18 Sep 2022 22:23:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4lEu76CLK3HqaTjYPrj/Dxym0/rhROI3+nhIqZq+ULBpz7cjgiIfvYulJXnjqHIccuMCqp X-Received: by 2002:aa7:df84:0:b0:451:1c8d:59ba with SMTP id b4-20020aa7df84000000b004511c8d59bamr6533031edy.295.1663565031012; Sun, 18 Sep 2022 22:23:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663565031; cv=none; d=google.com; s=arc-20160816; b=GgaHS13WfUv909bSyGA3EvjNBZRS1P1Cwik2RnbOQEG78EAxalk1y++gFpo2Rq0wkS udqO/fAsA5JApGE1h6n0mso0mPdW/0ZHlcDBZEYWSWq43jjmxHJpVopU/t3iwO9bYfyT zYBu4C8sep6bo7rmz2UePROeaOI1TjZOB9uM3/3yGL1cPThKBCrc9BCd/wVo0r9eaOIz u4YLBTQi1sA9wjTgTeC+0cCW7wcVcIMGx7V/U7WjVGGMHf3zbOut1Qs6oJvtcRfpLAwP 5h0SYjOmTVTmjv4OTnThj2QcB/IddsWOJwqBiZN7nJbUN/e9S7Pzi7CFViaaMWTkPKsz iAkw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=HNHgjDIqV2KPX4tCVjm3LBIOwU80sVhXpapuzdmHt8Q=; b=IDJhRX/3DaGbP0tPRNOkCPImfuN8oQDPuV/emmXO0d0udZcxeppMSZrEkiVBG4HNBT eSM3sp0kq7JnbyvJwuTmuQOMviT5putQqZqFeMirtS8YQA70HJdhacm7td3PMRzYPlz4 d/+R4RVNmkagohzXjMtxbypdKGRlou1JUdn7vS42MRYTvvpJaLXP1RdIHmd7A/WvYc8z Uo2oxULarAX0t4/sxsbL8K9wjETgGBK2LcHBj6Rp+UjF8kxu+TFrxBaxVjP6VswPUYJV I36pyoCOPl5lqNXaSKbEycBlV9cAdygl6yirDi38dKshXiEsjiu5zxtmNgMT4faXZmw0 W5sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ifnTGcLs; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id du18-20020a17090772d200b00778bdd1bc9csi24842459ejc.396.2022.09.18.22.23.50; Sun, 18 Sep 2022 22:23:51 -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=@gmail.com header.s=20210112 header.b=ifnTGcLs; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7B7068BBBC; Mon, 19 Sep 2022 08:23:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7800668B85C for ; Mon, 19 Sep 2022 08:23:39 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id x1-20020a17090ab00100b001fda21bbc90so5820207pjq.3 for ; Sun, 18 Sep 2022 22:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=FshvJ5XN/l5/Im1BmLSyao55zPIxdTP4CximR//YcrQ=; b=ifnTGcLsaRIBG/aws66HpqfnssS3XksnddRQ6qWbwH/MGmjSOO3nl45aSIfvjBlcjB Tma2wkCE5ZkCkyMS8L1gzbyhzFk/e8r2bYN87bpCKiH9HkpEbAxzY5AL3Q/SQ+yKVueL kN1krvFIZoBnFq1Of7gcySmg9+XN3YmAxWdozW17mfHYkVc486FOnjpp/j3DcSfeZQs7 ri5FeOeBFvfLut7OWRzgiIENiOg4BC21E9Yxy4i5Ocihc90jO2Ah15+S1pKZZG7dzaSC jEf1LeIIHZY+Dw6umVBy97UbRz6IB4rEgPGLrW56ywg+1Ze5aQI3B2w4HNkPd4FHDlYw Lygw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=FshvJ5XN/l5/Im1BmLSyao55zPIxdTP4CximR//YcrQ=; b=IW1Yi/SHe7vIJnWj29LTqM3phx2vewT01CZuuxzdrjZ88sLPtaP3hiX/rsNxP7RN6u LAnablRHSNysuZT4FghLhoi3wKKEpz+7NqJlqUENb9my0w21pK9jMPu3W04iDBXSLAYv u3QmI2AMeLCzqIahgv6VkKxERbteMCq9LICQHmuSSetPsFSDgodZm++G48t7B7dZuu2I /xgh6aNRfxifplWx2GuqDYx+q985fOiUC4pyMubShSOHUw2PCFhw8ezwqm4VUidizZ2D +qZK1jTcRGfQAk6FOjUq8v8AqGXqDB+yx2e3w6QRFnVRZPqCAstR9z6y02g6auAp3csT BHbQ== X-Gm-Message-State: ACrzQf25TThIPRXvqHGlmcgneBcA5Uk6Bn9lB6NSQueHn/JdknTnNCjd qAJfRRnlBGS/2HSQ8/uc/ASn2vuJFf0= X-Received: by 2002:a17:902:f68e:b0:178:3ede:a147 with SMTP id l14-20020a170902f68e00b001783edea147mr11061661plg.136.1663565016496; Sun, 18 Sep 2022 22:23:36 -0700 (PDT) Received: from localhost.localdomain (99-106-168-104.lightspeed.sntcca.sbcglobal.net. [99.106.168.104]) by smtp.gmail.com with ESMTPSA id 68-20020a630547000000b00434272fe870sm12792531pgf.88.2022.09.18.22.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Sep 2022 22:23:36 -0700 (PDT) From: Guangyu Sun X-Google-Original-From: Guangyu Sun To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:22:39 -0700 Message-Id: <20220919052239.2080-1-gsun@roblox.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/async: Fix wrapped_url_read return value 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: Guangyu Sun Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9HNJZkNb3Avq This fixes a regression from commit 36117968ad. wrapped_url_read() used to be able to return positive number from ffurl_read(). It relies on the result to check if EOF is reached in async_buffer_task(). Test case: ffmpeg -f lavfi -i testsrc -t 1 test.mp4 ffmpeg -i async:test.mp4 Signed-off-by: Guangyu Sun --- libavformat/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/async.c b/libavformat/async.c index 547417aa1e..a929f4d16e 100644 --- a/libavformat/async.c +++ b/libavformat/async.c @@ -139,7 +139,7 @@ static int wrapped_url_read(void *src, void *dst, size_t *size) *size = ret > 0 ? ret : 0; c->inner_io_error = ret < 0 ? ret : 0; - return c->inner_io_error; + return ret; } static int ring_write(RingBuffer *ring, URLContext *h, size_t size)