From patchwork Tue May 25 12:52:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustav Grusell X-Patchwork-Id: 27945 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3877562iof; Tue, 25 May 2021 06:18:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzICYBwraMggqE2Nu+UlYawtKpPwlrad38iOHW8oX2o46er7AXRqZPrzJRkvg8K6PvpuRH X-Received: by 2002:a05:6402:2548:: with SMTP id l8mr32473771edb.208.1621948690073; Tue, 25 May 2021 06:18:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621948690; cv=none; d=google.com; s=arc-20160816; b=q/QwAG5O/YCG1XonxuyBpXQwMZew7iFwZVd5kth0oejon/BbhLOnYG9XsL8u+w7y6x QrkrDP493QDdJdfL/peWL0blj2gf6/FwhIyqkkcc9PbLgWxX3SAkpdO9o6mlKyEfrHnS i81nIz28vw9Turvg7/xmz1uYfC4nb4FzwsjFCDDxMSHlX6rw4q4sMYmpH2Debm17YWy4 e8zl9yBkRyxuTRcd/RzhJTsiJvuTWt1nNAsLwGL/IlFuNTObldxBNqPjWxYWJGELaM4D hCWAH+uHFPnR0uJoSFic4V3sU5tnnyb9BABhLPxQSaWJvnHgiTE54QFtlFhSq5gmQE5m a2cA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=iQY8v8U+9Gmmbmto0eX2dxqAuy/w3pHaxaDMx77QmkU=; b=lOoRZxs/FPrF86VKoXMSHnIezJsd4GbqXKqBneJ3PsGHK3qRIaz2brw2yGMDrtmkrR GhHTVEUjIy4OVbPyk4hhokOE+LtvFLoJBgXpcRnUMdhNpTWScatL32mkDDFZMdyFC2mq z46OAjcRRu45DFiMrdkusPuw3v3UMZjxZ5hWuFFp0ROPA/bLru/24X98sVTpNmKguYBd XBC0jiCLuNsJ52Rqf/EPo+Fj2sDJ/FjmpwyZjM3aWFJqBNO4PFcqRHa6KFhhQ65IA3vf e0tmCMKyCCJW6XVvxONww/G+F6RqpaqOSrpm2ug4J2FcGRxZUJP7Vy3A/nGZJZBUAWH6 +DHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WcEUs7hO; 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 v15si16243642edc.109.2021.05.25.06.18.09; Tue, 25 May 2021 06:18:10 -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=WcEUs7hO; 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 95373689DE8; Tue, 25 May 2021 16:18:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18DE86891DE for ; Tue, 25 May 2021 16:17:59 +0300 (EEST) Received: by mail-lf1-f49.google.com with SMTP id q1so3609160lfo.3 for ; Tue, 25 May 2021 06:17:59 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=sUEE5IiK81oYi6vmzvXk3HL+Lv8xlpuMpFRzOmrzTGg=; b=WcEUs7hOvIMhmm716e6DU6+LDw44JqqNgagL4XAIw8LIvSumv1DMM96UQ/5galeoho fPm9icjfnmyZLK93DjofGhgvUwoPUwYhRS/1W8GSclgLRce34cgL+OsWKkCSAdaX6ERu EpMXK6D7P5q2oem7jpJbilyjymogUbwx/dxFpyhWw5bOsFEyo7PD/yY/TVnvbZqywRM4 THM6x7ySnBBOd7M4EGPJYDc+4u+IBA8KWAkAZXPyFMlne87YyK+2zlFiVthr6tO3USo0 wuL0x+srAWyHSVzkzsXWLYTp0R3M32NgxmtZqShfTeamV6mZOycs8JATgCfEYZQQguk2 hRNQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=sUEE5IiK81oYi6vmzvXk3HL+Lv8xlpuMpFRzOmrzTGg=; b=km2l/CscPw0s9PLpffBYjSkrE6m/yIWowP+BooIz126M3/U5cH0VjdV0YkYsJIbR5H p2IB5mnp9ZLyI3JuaURqlEAg5ry7Zso5nHZOgQw5Zm8CyRn72UvqjTJNYYEGpKHtnFO8 iYmzgW/YRSLZlqkoq64ifSbw5i3KKBM9eHRYOa+1PC1NaOOOc+ZFvRsp2Mzc9heQHg3q DsLAOd/rt1E13TIiaQfLfx3RzZFhkQH/hNkX9w4wsP1BaRaTCIVBUi9+RJc68wyqYppm USQbvQY8Z58zg+GF20U/G0f/Z09yiJhrhdjNLc3JuAwP7QUhFxMkn9uFj8tQatqWne5n hNiQ== X-Gm-Message-State: AOAM533TXHH7TV7jRHYwcAglKYrhlZpWfsO0ZONB5nPg9V1kfPOkRpJz 6pSUrhuSIYrf9JvAlWtyORsMUTXmoWizCg== X-Received: by 2002:a05:651c:1310:: with SMTP id u16mr20728177lja.210.1621947121271; Tue, 25 May 2021 05:52:01 -0700 (PDT) Received: from Lf16kxt2.svt.se (c80-216-190-179.bredband.tele2.se. [80.216.190.179]) by smtp.googlemail.com with ESMTPSA id b24sm1737609lff.93.2021.05.25.05.52.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 05:52:00 -0700 (PDT) From: Gustav Grusell To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 May 2021 14:52:38 +0200 Message-Id: <20210525125238.325548-1-gustav.grusell@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hls Implement support for using AVSEEK_FLAG_BACKWARD when seeking 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: Gustav Grusell Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QK1KpM3IWiUw Before, seeking in hls streams would always seek to the next keyframe after the given timestamp. With this fix, if AVSEEK_FLAG_BACKWARD is set, seeking will be to the first keyframe of the segment containing the given timestamp. This fixes #7485. Signed-off-by: Gustav Grusell --- libavformat/hls.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/hls.c b/libavformat/hls.c index 8fc6924c90..fb8c9b071a 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2197,6 +2197,15 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) break; } + /* If AVSEEK_FLAG_BACKWARD set and not AVSEEK_FLAG_ANY, + * we return the first keyframe encountered */ + if (pls->seek_flags & AVSEEK_FLAG_BACKWARD && + !(pls->seek_flags & AVSEEK_FLAG_ANY) && + pls->pkt->flags & AV_PKT_FLAG_KEY) { + pls->seek_timestamp = AV_NOPTS_VALUE; + break; + } + tb = get_timebase(pls); ts_diff = av_rescale_rnd(pls->pkt->dts, AV_TIME_BASE, tb.den, AV_ROUND_DOWN) -