From patchwork Sat Jun 3 20:31:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kucera X-Patchwork-Id: 3822 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp735914vsk; Sat, 3 Jun 2017 13:32:05 -0700 (PDT) X-Received: by 10.223.164.23 with SMTP id d23mr9101879wra.54.1496521925274; Sat, 03 Jun 2017 13:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496521925; cv=none; d=google.com; s=arc-20160816; b=CU7FWXgiSUQrRdFvV5xBVudIudxXWVg6UXIEsdtv3LNGrwPTxCVEUYIJwypSM+9F+j 0SW/zKpEbHocP/0bDc+a9ZaIPKfAGR+2VxDH1F+Fxmkj7CKggwCBN96A24KAfYb6YT56 SiWle4t1oLquNiCTn9tX/0dsOADXzSvjVh2W3QRfIFNbOB1Okeh4gT0xYpWf08CX1r2R +9sBiLu6ifF4ORCY6dTe/SmelghPdTdUf1wkv5zMiWL95oh0tqS9d0T8XLx04uhpUmu6 42z6pA6NHkNrHGo82sTgP/3VM1hSC7Zd0sT8t8QZZ51eyTVM7UZKJh0CDgbgikGR3Za8 3PLg== 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=nzcj5JEXSOUuXM77sYvG4pM9P6hX1UXrtMhmksC87D8=; b=sibuZpHD273u4QB82Jd1UG0+szJ2hifBN3pF6BwbAZYxuQ97NRR1q62EBf0++2noBw qpoOORJns16cus3K6jNNCYZCaWdpfpN5psmx5uI4mV3SF7JpP6qlqKYkwefPJpcOkrnk K5rkm50WZhmBj+yVBwpKBKO0AByiy33yOtLr8iTDKTKAmFiO4RM9byN7TUygz238trAn l1gQsdcXjuR+H79IKvAyGI7SSo0WhNM7R7At5NKP82bxOF1JDQRCT5ZetjZ9wxmhIWgC v6Ywh1ZYZRsjdWBUReXm87BleIHKNRI6pcjvFMrOyGiP2uXVfNPeP93U/IHT8gDDD9Fo DulQ== 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 92si2413750wrj.58.2017.06.03.13.32.04; Sat, 03 Jun 2017 13:32:05 -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 92D3B689D4B; Sat, 3 Jun 2017 23:31:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A779689913 for ; Sat, 3 Jun 2017 23:31:50 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id g76so4059904wrd.2 for ; Sat, 03 Jun 2017 13:31:56 -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=Q+yC/D78k9wsVI2nW1Bu2CyZ5SDguBczCOljkgA1Hps=; b=pl87ewx1pIPuoUWBrCP1745UBFMWEUaMuAuOgnptKU6lvmWr1RXbpHJ8OLfD4voeI+ VOAW5RTmViRG8cdmLhGhPJ0fw+6SJZ/hrB+OgwfHFgCwcJcmxpsLnehkbtm90yRHDAP4 cg6IGBOcqhSe7TWEY2atmtWhvRSy8GzwfcCkFQL+DUwBe3QfROTGckOENWRw3V6nI2hY MxQlNh8bPsUhXkEad+39L+im6FWv03Bq4SuTwJAKMdFSlqtV1i/PewxzTK/iIVv4fkXK FvLAweM9ifh+ZKu2uforyivt3u/U+zNGOsdUFX5jxBuM6GYKFv2Dr/PjfpQUcHC2bmRw IFsg== 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=Q+yC/D78k9wsVI2nW1Bu2CyZ5SDguBczCOljkgA1Hps=; b=rDlPnDgCfqqjyYM88dY1zrRlDdx0svvTDBKgKUuFZCst6Xz/ao0FGVYftz7/NKQVcG df6lGqy+v3kUcaSfhu+vLxmN2oFqC6V24lyXbNi9HWhvcWZ1rtdQYaV3veNlEWBHfgbA U6rugZB6Z6vTXAbHI5pmICKamV5L0m1TfXTY4M+0YWJhrM8rxM7tSH88+o6DFC9fg9a4 sm+6WahsmSSK4Lyivd+oIE52vFCgcbT6UI9IK2dxNKTMwRlFqFrEpAm1MmfDLfa3Wyn2 oEVnh5qo0NPwRP+BjQs2RVXqVhGGCa3cehj3Xek60v8W14S0Y5moq+n/mQdGjkUQDu34 Yz5w== X-Gm-Message-State: AODbwcDc/YmKMKFrzoPOqv/psJusZEWSVrxPggKTL4bEwVck3YAErzo9 NZ1licb/9LdDwi9H X-Received: by 10.223.178.68 with SMTP id y4mr8060303wra.196.1496521916030; Sat, 03 Jun 2017 13:31:56 -0700 (PDT) Received: from localhost.localdomain (ip-86-49-3-62.net.upcbroadband.cz. [86.49.3.62]) by smtp.gmail.com with ESMTPSA id z12sm35055564wrb.41.2017.06.03.13.31.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Jun 2017 13:31:55 -0700 (PDT) From: Daniel Kucera To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Jun 2017 22:31:47 +0200 Message-Id: <20170603203147.8081-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 | 20 ++++++++++++-------- libavformat/cache.c | 2 +- libavformat/file.c | 2 ++ libavformat/subfile.c | 2 +- libavformat/wtvdec.c | 4 ++-- 6 files changed, 19 insertions(+), 13 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..3705e406d9 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,16 @@ 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) { + else + 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; + 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/subfile.c b/libavformat/subfile.c index fa971e1902..497cf85211 100644 --- a/libavformat/subfile.c +++ b/libavformat/subfile.c @@ -102,7 +102,7 @@ static int subfile_read(URLContext *h, unsigned char *buf, int size) int ret; if (rest <= 0) - return 0; + return AVERROR_EOF; size = FFMIN(size, rest); ret = ffurl_read(c->h, buf, size); if (ret >= 0) 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) {