From patchwork Thu Jun 20 04:33:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13639 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B39D8448B7C for ; Thu, 20 Jun 2019 07:35:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F26568A905; Thu, 20 Jun 2019 07:35:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 484B068A7D8 for ; Thu, 20 Jun 2019 07:34:54 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id p13so1447208wru.10 for ; Wed, 19 Jun 2019 21:34: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:mime-version :content-transfer-encoding; bh=r9eZUZCeO5h+Ah4P5wQPVmxuhjifyhUClJ5CksYwumA=; b=Vg1JN4UBQnfmvABFJ5a8+Qhl9bwXgLQ5RHP6WGonh6AhroQYjwc3LYP5YEp2OoTmZB UWwsdUbgynfuH7i5MHq6YRyPqUxLzgoy/vUnuVRtoB3HYVqAZLA4e3VbPyzYhvfDFXJW F1DzxiUeZ0HL5IKFtK3KTfc1lD0PLsMY/NfrFK792fxxnZn6XFJBgu9IF4UMBmChz+Wg oG677rzkZU/+yGmKUexbkX6fQhv3Ka0R+cEblCBoOC13GPXwSio7lgKK4h6Ldm3+ukFY A9Z37sz2InLn/QLCOsPfjvrMvWRvUV/1XjfuwGnfktZ8vxetqcxjcVGNboeLh/P9+oKH jt2A== 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:mime-version :content-transfer-encoding; bh=r9eZUZCeO5h+Ah4P5wQPVmxuhjifyhUClJ5CksYwumA=; b=e+Dm0UaA0Ys359QmIUL3+E/VAjX1CApUqvYubIqMTuAA2h4L0LRXm+4RljKEoGn1C7 dr09iDWcf69OwcsVBRCwhGxJjxRvGbTI+EOcNT3peMU+v2T4k4IpEkggjZuJY5DrUi+L 0rBgfe63dBcd6xgY/ty7XHOM8+pPYQf//Nxb/j4F0ouyGVUWxf2/PwaRarv8eRFJaU1q emy2bfPDKYYsCYmRGQKYWSro/dl/V2kChVmXIfUKiBx04OEYkajEdMLLKbqmzjjSlfTI W7OG1CB85jpCCsGb1pAWboZMnEasc0DNyUPeDLzlEWhPZzX9IDXw7BTXldnTC3iytrqF pZmQ== X-Gm-Message-State: APjAAAWoNkeAFLvBEKkyyg1tBSJ6sB0DdF4ayRfgfrqxAsI4QIHOYkcm KlkUVgddwZXkxsiIc7uOI5B8Vn/3 X-Google-Smtp-Source: APXvYqxYyU797A9ZN3C956tV2JhQwPmXRAPtZncsT056H0usOCYxK48jO9Xuk1koaIPdWS2nh4yn4w== X-Received: by 2002:adf:ff84:: with SMTP id j4mr11560253wrr.71.1561005293644; Wed, 19 Jun 2019 21:34:53 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id 128sm4369164wme.12.2019.06.19.21.34.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 19 Jun 2019 21:34:53 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2019 06:33:41 +0200 Message-Id: <20190620043341.3176-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/subfile: Improve AVSEEK_SIZE/SEEK_END seeking 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The subfile protocol treats an end of 0 as meaning "until EOF"; this got implemented by simply setting the end to INT64_MAX. But seeking relative to EOF or AVSEEK_SIZE seeking hasn't been adapted; the result is that e.g. the duration of transport streams isn't correctly determined when this option is used. This is fixed in this patch. Signed-off-by: Andreas Rheinhardt --- libavformat/subfile.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavformat/subfile.c b/libavformat/subfile.c index b527f2bee1..2f162e0a34 100644 --- a/libavformat/subfile.c +++ b/libavformat/subfile.c @@ -116,11 +116,17 @@ static int subfile_read(URLContext *h, unsigned char *buf, int size) static int64_t subfile_seek(URLContext *h, int64_t pos, int whence) { SubfileContext *c = h->priv_data; - int64_t new_pos = -1; + int64_t new_pos = -1, end; int ret; + if (whence == AVSEEK_SIZE || whence == SEEK_END) { + end = c->end; + if (end == INT64_MAX && (end = ffurl_seek(c->h, 0, AVSEEK_SIZE)) < 0) + return end; + } + if (whence == AVSEEK_SIZE) - return c->end - c->start; + return end - c->start; switch (whence) { case SEEK_SET: new_pos = c->start + pos; @@ -129,7 +135,7 @@ static int64_t subfile_seek(URLContext *h, int64_t pos, int whence) new_pos += pos; break; case SEEK_END: - new_pos = c->end + c->pos; + new_pos = end + c->pos; break; } if (new_pos < c->start)