From patchwork Wed Jun 13 18:18:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 9395 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp958990jad; Wed, 13 Jun 2018 11:18:42 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJD0PRYK4OsA8BYMgUkzWY0KElz5FHvKoBlY+d0/5io9aX9PfbUyPMJtyR7ahNN4GbowDif X-Received: by 2002:adf:fc05:: with SMTP id i5-v6mr5008879wrr.157.1528913922536; Wed, 13 Jun 2018 11:18:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528913922; cv=none; d=google.com; s=arc-20160816; b=rM2mKyTDRPNstQdIazhHXrD/xh7ZCxI1E+ROhv80x/S5U1NI2TapyvDyUUX5rKbbhL RxsHo2G/0hkcLiEY5YIeCWVa+b9jW4A0Guz6DmZp3T5IoziGpqW24gf+ROFtO+4WEVV2 2qAdHMTOygSHmR7HluqRQ7E6MOKQPbzqlbT1JI8bKoPb1oyigADsa61JpAgCWCe/qODB VdXctmF67Ao71ZCDtX3AX5yJi4yoMJd5plv8T4nACgs5jyTXlSRkLuQtA2XjiIgYtUEd rw3poDMm5Ij+n1j21sn2x/euCRBZJuIF6/vFloxQOnB383HyV9KqGKIg7ONV7+CrBxp7 uFow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:references:in-reply-to :mime-version:dkim-signature:delivered-to:arc-authentication-results; bh=9ltTI+rwteKEUONefcFxfsEKeAu5OMurdYjOoi7lWIk=; b=lTacRZP/h8IjgPoN/6xJ4a+c87UazwGCibari7ngE1qKDuAv/3HCXllCdQOPbBrFG+ 5MjJXDm62zijMr+FhbbV63AXeZD5f9V3T5YAGmFer6C+iKoy7dxnzP1xfdV3Mg6Cr5Ov B6Iiy9JsdV5+tRZE0WG0e6p5lrD2xK+Y4uM5dc8YHac782zModKGH9WmwZdhp35BaDdB qoRktyawcsJvVRLrsli9BZnATSJBVKmddMxKqkR+H6MDbVrt7QrnVSzPbRbgLdmPpxlo Jwlt57vt5AkPdlfZEL5/bz2HSHmW9QzkxNs6F7L6d1SYckHIhxQU2ay52N91s+YbHwCC nC2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ch8vVb7F; 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 h15-v6si2698651wma.10.2018.06.13.11.18.42; Wed, 13 Jun 2018 11:18:42 -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=20161025 header.b=ch8vVb7F; 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 2DC0C68B0A3; Wed, 13 Jun 2018 21:17:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6971268AE5A for ; Wed, 13 Jun 2018 21:17:43 +0300 (EEST) Received: by mail-lf0-f47.google.com with SMTP id i15-v6so5398949lfc.2 for ; Wed, 13 Jun 2018 11:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=kuvDtQpGCaw87m6bkce4hmuRPjNIovjzC6LajCf5CQQ=; b=ch8vVb7FLrBSHbyweLDFfdiySnAiX2VPbRyFG2yjXyBG1ISNsNjpHrOhpCazoXu2vo FmIsccnTIkdNkDiD0upG1pR7wQs3rog70pgnsrsb1kh0RSxDYorcDZ7vW3HePWgpTx5Q U1IA86sBxRSQq0c3t0W7sJ2yBTs6zS11lOsmA0fqtaYanRBTLGgEJ+bYlDfsc4y/qZnL FVvSr3hHJ1HQbSU1ouEks3E9HTe3n3/BhPN0+qyY+Aj7KevqBUQ/fSnrZYlJo/n/6Tb2 Dd3k2Ydz83wuuXm4766PeBxGTtdY3W2eUcKbe4FIWfK5gwVTyfo8NOpMTSq4QNsYChzd cRNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=kuvDtQpGCaw87m6bkce4hmuRPjNIovjzC6LajCf5CQQ=; b=NfwkrbaqIUPGaaGsirDn6EJgvum0T1+4Pw8s+mH3ZNvpbJZ7Qf1e/tg18nv0IbzRO7 9AdyyWUVhZPGYnodHfyByPvO7RMouPmwcdffBYxzACHixRjSZY8TtxBDdLCHrn3TFluj yIZwdqJMzauOAvcyEI/nRZilADMfrk/Oly6JU0gf4epzp5ca0xtPwFyxUpHaE8uKHSyo KSSaWkl7dC/a3hdU0eMLl/DDu0Yy35zZNqS4KNGwXUJNCtGfzJNISW26SP7++Z98iHWN jiQPPEp2IChOrVViPt1onqzjliu6xziE8RtlFj05vkCwkZZtEO6iisjwom91jpOla78Y TfLQ== X-Gm-Message-State: APt69E3TPH8B3pLtuhqdF62+QRRUw0PQkEf4O9dqqr0Ne0SdN3EtQhtM ZYq3gXTcxOe4RiQ6CpNPkN+i6Ti2k0ugUL8Zc/8agq3y X-Received: by 2002:a19:7402:: with SMTP id v2-v6mr3677648lfe.97.1528913912921; Wed, 13 Jun 2018 11:18:32 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a2e:96c4:0:0:0:0:0 with HTTP; Wed, 13 Jun 2018 11:18:32 -0700 (PDT) In-Reply-To: References: From: =?UTF-8?B?SmFuIEVrc3Ryw7Zt?= Date: Wed, 13 Jun 2018 21:18:32 +0300 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] fix ftp hang up because not return AVRRROR_EOF X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On Wed, Jun 13, 2018 at 1:27 PM, Gj X wrote: > fix: > diff --git a/libavformat/ftp.c b/libavformat/ftp.c > index 9aa7a45629..3474a0adbc 100644 > --- a/libavformat/ftp.c > +++ b/libavformat/ftp.c > @@ -777,7 +777,11 @@ static int ftp_read(URLContext *h, unsigned char *buf, > int size) > { > FTPContext *s = h->priv_data; > int read, err, retry_done = 0; > - > + if(s->position >= s->filesize) > + { > + ff_dlog(h,"ftp protocol reach file end\n"); > + return AVERROR_EOF; > + } > ff_dlog(h, "ftp protocol read %d bytes\n", size); > retry: > if (s->state == DISCONNECTED) { > Hi, Thanks for your contribution. I just looked at that function and it seems like `ftp_read` needs some improvement. But staying on the 0 != EOF fixup topic, probably something like this should prod it to work: } @@ -823,7 +823,7 @@ static int ftp_read(URLContext *h, unsigned char *buf, int size) goto retry; } } - return read; + return read ? read : AVERROR_EOF; } av_log(h, AV_LOG_DEBUG, "FTP read failed\n"); diff --git a/libavformat/ftp.c b/libavformat/ftp.c index 9aa7a45629..f07e9fcdd9 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -783,13 +783,13 @@ static int ftp_read(URLContext *h, unsigned char *buf, int size) if (s->state == DISCONNECTED) { /* optimization */ if (s->position >= s->filesize) - return 0; + return AVERROR_EOF; if ((err = ftp_connect_data_connection(h)) < 0) return err; } if (s->state == READY) { if (s->position >= s->filesize) - return 0; + return AVERROR_EOF; if ((err = ftp_retrieve(s)) < 0) return err;