From patchwork Fri Jun 2 14:55:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kucera X-Patchwork-Id: 3798 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp237142vsk; Fri, 2 Jun 2017 08:02:03 -0700 (PDT) X-Received: by 10.223.138.204 with SMTP id z12mr5409024wrz.50.1496415723677; Fri, 02 Jun 2017 08:02:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496415723; cv=none; d=google.com; s=arc-20160816; b=ApS3W17GMk/KvmEYvR3YJahZ0t+Y+toS8e5FV4COQfCnJhODWI7MtKVWwIluGRwbl0 hQPCD7SNoc+Ko6R8t/WUG+tUuep8nDJIHE0cQpjS1kZZuXObQab/cS9/5TTT/Acl1CJB u55vAVAUR5B2hvc3pqaxEv2kmxqTovSWc12Fj0UnzE52ZVIfptpN+uvIsxPzrIEHqCoq ucUOhM0M3GJAgE/OAVnZiJ/SFgBbAZX22iyA2xN7otZJQti5eZOj6zhBpRAfyj6WHUx5 SmD8V1+99lNnXodAceGYNN2t2HvKp+wEg49DXou+FcZWSeMjDF9xmVip9Y92EZzYjC50 kiUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=SGq6z++wZ8Q85ua53Lcn0z0l3P8Ax+lCzJhJ2itKW6s=; b=zPxUhztJhyzd9/3Zt+0a34KtE8uf2xL2ENpJquth+sfzOlGmnUy8ZlbauWqfBLEkFq 7oOSvRKqcWZhLuKsouFB2QNMA9l3J1ZuLLgLPg/FVanPLVVAmDI/nh0hfTJWr5PLN9e+ CHTrnHzIaYUeuq3eojBozieQ7NA7YBbUENfXyh+H+XNoxKpdDz0vpZwYiGqWsNLZ2DLl IR26LwPGpWCVJnuurVKyApgyaKkHconSynMYrC43wzPhHhGwvJ2MN1hkfsSR+VQHV0b5 Gi1eEWFkq5JdBFnIkm+5jvd4jOsFzxBRWT7SRQx1R6I6BT0QQ4jS4LXXRNyCkGtOR/jH Q2nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 190si3030182wmr.108.2017.06.02.08.02.03; Fri, 02 Jun 2017 08:02:03 -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; 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=NONE 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 25988689B12; Fri, 2 Jun 2017 18:01:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C3EF689A62 for ; Fri, 2 Jun 2017 18:01:48 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id 6so1481112wrb.1 for ; Fri, 02 Jun 2017 08:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RV9TWrVs5WzYBCTig2NCFnqdktyR4oENLOKKnE7pQvI=; b=QL+MRy3WkehZow4CouqoELPdv2wmskABOqc/pHnnFEHt2eUFVg2BB69GrzoXGg6C7u zm5NfofR9ifXy0OkfB2Bf7ZBuWATO2yXxChitvoiwzY004wBVwvxLM+EZWBw210K+XaR 5h6BF/0ZV2HmG5uJgEO+YhFpRnLQ65bJHIUpoKPcb4ZPsrBHvrsweXwCZGXVW2EAS4RD zLNASKWqdan70LA7uJCWXU+uXcQdh//vsRT0K5hxBFC003NOPBmIw7/6KXP+krzlgXl5 JN94dE1AzxFJjEnTxu7wdXzei7LhJdhGU6/FGNqdcApsr5E9Zfkps97ChcGWvYjPDs9F 34QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RV9TWrVs5WzYBCTig2NCFnqdktyR4oENLOKKnE7pQvI=; b=bUvbSi6bAt+Ef0gD6NCnC79pZbVuhv3otf9pJzCzdd1TrXB0f9CX6CB0WJhcpQ6NNR JwfwoZf4FiJ0kxcx6vTYrQ18sd+SbWG1TJj1PBgIQdECl6Q07AWuVYW1dEX7Jp62DyRT 7QiWG7sb2GhMF3FzYG/Uiws2ng6cgY7uEHvZeaVd6zhSF1+qNVqMiZgfplPxbnuuTMq1 HQhA0V1gNVqAn+UnYI/wKELhVfu4X9P2UKYsgbO4HsRI8xuj2vuaVTckQixG9dfP8qpx xLTx0DpSqBheQu8uWlO2OSDdpqYtEdV/NuiO+uOn+m8HFTicG4pWtOC5MhJvIRrNUqL4 xBVw== X-Gm-Message-State: AODbwcCu4afBzCE7gbEc/dd9KQaHy8ia9OkvmvTNBHXl7emvmO7h7bCg +UNRoIGutKtBdFKZ X-Received: by 10.223.176.9 with SMTP id f9mr5302991wra.106.1496415338820; Fri, 02 Jun 2017 07:55:38 -0700 (PDT) Received: from localhost.localdomain (ip-89-177-134-12.net.upcbroadband.cz. [89.177.134.12]) by smtp.gmail.com with ESMTPSA id p17sm16361656wrc.66.2017.06.02.07.55.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2017 07:55:37 -0700 (PDT) From: Daniel Kucera To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jun 2017 16:55:30 +0200 Message-Id: <20170602145530.26342-1-daniel.kucera@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] libavformat/aviobuf.c: don't treat 0 from read_packet as 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 Cc: Daniel Kucera MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Daniel Kucera --- libavformat/avio.c | 2 +- libavformat/aviobuf.c | 18 ++++++++++-------- libavformat/cache.c | 2 +- libavformat/file.c | 2 ++ libavformat/wtvdec.c | 4 ++-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 1e79c9dd5c..bf803016b7 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -394,7 +394,7 @@ static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, av_usleep(1000); } } else if (ret < 1) - return (ret < 0 && ret != AVERROR_EOF) ? ret : len; + return (ret < 0) ? ret : len; if (ret) { fast_retries = FFMAX(fast_retries, 2); wait_since = 0; diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 1667e9f08b..40cff4dc56 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -556,13 +556,14 @@ static void fill_buffer(AVIOContext *s) if (s->read_packet) len = s->read_packet(s->opaque, dst, len); else - len = 0; - if (len <= 0) { + len = AVERROR_EOF; + if (len == AVERROR_EOF) { /* do not modify buffer if EOF reached so that a seek back can be done without rereading data */ s->eof_reached = 1; - if (len < 0) - s->error = len; + } else if (len < 0) { + s->eof_reached = 1; + s->error= len; } else { s->pos += len; s->buf_ptr = dst; @@ -630,13 +631,14 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size) // bypass the buffer and read data directly into buf if(s->read_packet) len = s->read_packet(s->opaque, buf, size); - - if (len <= 0) { + if (len == AVERROR_EOF) { /* do not modify buffer if EOF reached so that a seek back can be done without rereading data */ s->eof_reached = 1; - if(len<0) - s->error= len; + break; + } else if (len < 0) { + s->eof_reached = 1; + s->error= len; break; } else { s->pos += len; diff --git a/libavformat/cache.c b/libavformat/cache.c index 6aabca2e78..54a40d018b 100644 --- a/libavformat/cache.c +++ b/libavformat/cache.c @@ -201,7 +201,7 @@ static int cache_read(URLContext *h, unsigned char *buf, int size) } r = ffurl_read(c->inner, buf, size); - if (r == 0 && size>0) { + if (r == AVERROR_EOF && size>0) { c->is_true_eof = 1; av_assert0(c->end >= c->logical_pos); } diff --git a/libavformat/file.c b/libavformat/file.c index 264542a36a..1fb83851c0 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -112,6 +112,8 @@ static int file_read(URLContext *h, unsigned char *buf, int size) ret = read(c->fd, buf, size); if (ret == 0 && c->follow) return AVERROR(EAGAIN); + if (ret == 0) + return AVERROR_EOF; return (ret == -1) ? AVERROR(errno) : ret; } diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 3ac4501306..ee19fd84da 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -65,7 +65,7 @@ static int64_t seek_by_sector(AVIOContext *pb, int64_t sector, int64_t offset) } /** - * @return bytes read, 0 on end of file, or <0 on error + * @return bytes read, AVERROR_EOF on end of file, or <0 on error */ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size) { @@ -76,7 +76,7 @@ static int wtvfile_read_packet(void *opaque, uint8_t *buf, int buf_size) if (wf->error || pb->error) return -1; if (wf->position >= wf->length || avio_feof(pb)) - return 0; + return AVERROR_EOF; buf_size = FFMIN(buf_size, wf->length - wf->position); while(nread < buf_size) {