From patchwork Fri May 14 19:42:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustav Grusell X-Patchwork-Id: 27779 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp772109iof; Fri, 14 May 2021 13:11:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxm54jNXQFCNEA0tXYl2hNE6uyV6/ppAoHiUn7Zj/YdmkJLyNjA5sleq9KlXBtjDS0tjPB9 X-Received: by 2002:a17:906:2b4b:: with SMTP id b11mr1795747ejg.379.1621023099661; Fri, 14 May 2021 13:11:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621023099; cv=none; d=google.com; s=arc-20160816; b=JnG+GT1u2ruru8wUjcTcZU2xuko3z4SuJqTJ5gGPs4gLpJuV/4ENQtZlb5Ele3RVKU QKDxpTJ3nGucR/vWlVzNKCLw0EPaMfCYmG/I5ixZ+j8SbvlIqkApA4as5y3f7fV6C7JI 0OCKnU7K0sUzLjj2LQktbCtyb/jcTKXY8NxOmPCdO9InSor/ZT1bHGPqtSPmsFY0EZMG ZmorgiuiukrMQllkGN/XbPQ8/9fvKRqkz/33wHgtNqxnsR28qNZvQWqlI22OpigrP+N7 dv6ROsiI7XY1roV3x8PbDzhbujInyz5+65SNZnKgIwUjr0/jJ/m8gzcJ7WTL4zVBp/R0 3Dgw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=P7a3OYzrG8J7GfBB/GeGXKxjYfEbQDLMBzXey2cwMZY=; b=CBgAP3Zso8FfI2FSn7PyVD4h6D114YkAJfDeWeXGR8vS/M1u3PAJko/Mkped3G5EIg c0TDvzajrHWAnQbCeo3q9K15o/Bu4atw8+bJEKTm3dxJO3RMNOs5sR7pvR6VVidKcx7l sfl0osi1iWjPTjLpCNJUuXZCgZM0kWTBg+SbmV0g+PugACdfhvydGY9PVjnKwTbKvt0E kN8t5/2VjuJAHzEQYOdUr49rq18B1BuruZW6l6LCUA5fdwdFks43Kr0KJv+hbMbFpw3T ungb8d/0Ndee0hEjTQckdtgipCfrMECWm5z3uY2p35xMQbXsFybbXFBQVjZH+SkVTx14 uVfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qsXDv71U; 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 h9si6612510ejc.653.2021.05.14.13.11.39; Fri, 14 May 2021 13:11:39 -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=qsXDv71U; 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 72131680C0A; Fri, 14 May 2021 23:11:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C609C6801A9 for ; Fri, 14 May 2021 23:11:28 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id h4so159034lfv.0 for ; Fri, 14 May 2021 13:11:28 -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=ED1E8KXYboYLfXsauBrGCqk/bodKBocJ1ludTxLAqlI=; b=qsXDv71UVIHyWf/D1VE9AtyKcYs3DaE53f9MkZHftfMTgcE6QeUCgrgvJE4QaB1PqO A+tkYR8yjIgDnIAVxGff7hmgfqB6okx9j2DRol11S7TIpFwNN2T+fetLtF6Fk4D53d91 TRYjub0ffmbxPQQFAHm4vytchg2sTXDLNZznEVfs5wKZWlqvsiJ9DHekjNzEQbpB4UnB AS1C2cHRwkzn3K77JIAdkojRAE+NJWXWSSWU6rSIbMAqjcET2tEZwMqJzNiEkn9vdBQ7 KId28RS3EcTYKOJ6leiIxwb+szY6uk1/A/HVu30r4n+HT5XZQh95paTW/Eqv5T/5yNii Bj8A== 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=ED1E8KXYboYLfXsauBrGCqk/bodKBocJ1ludTxLAqlI=; b=NIFRG9PCjUyyyLUO2JRYMEbW+Z8HcTHe2F47Wtu7cT0slSYePN3oJM75IH/KHLR75X pUrPjO3Stkvjk1eKR96y8TWut2k/9C5r+IFL4vpKBnOggGEa4aDdPHob+9eOPU46SuLF Qa/zUvCbVhSZihfBc8u8uHXBrKJu+E98jJHfoSl3EFaXNUSwblH2ukSFqpuI83acJIWA NwPOJjic5Dz3JzqkJbOYuDLsEVz1U303f1Kd40W4uPJPY+e6gnfLWzLvtvXw3fhYIqhd auTCbzXOrZF/KCMb8yL4PusXhO19baLY2xADpdQN10KamNf2jeVhMOImLHG4D54Hg8zw g5mw== X-Gm-Message-State: AOAM531A6xf7JVnoaMJHDxlbIzeXjrLeLha5uTm1FverTgth5jFP/9tf 12abKCAHEYIMNiJ1Vuqk1KLbDIWybKqSaQ== X-Received: by 2002:a05:6512:31c6:: with SMTP id j6mr33571381lfe.129.1621021350318; Fri, 14 May 2021 12:42:30 -0700 (PDT) Received: from localhost.localdomain (c80-216-190-179.bredband.tele2.se. [80.216.190.179]) by smtp.googlemail.com with ESMTPSA id i130sm904898lfd.304.2021.05.14.12.42.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 12:42:29 -0700 (PDT) From: Gustav Grusell To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 21:42:25 +0200 Message-Id: <20210514194225.412924-1-gustav.grusell@gmail.com> X-Mailer: git-send-email 2.25.1 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: J7T+V2Sp1lVO 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 #6850. --- libavformat/hls.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 8fc6924c90..3f1fd2cb70 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2199,10 +2199,15 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) tb = get_timebase(pls); ts_diff = av_rescale_rnd(pls->pkt->dts, AV_TIME_BASE, - tb.den, AV_ROUND_DOWN) - - pls->seek_timestamp; - if (ts_diff >= 0 && (pls->seek_flags & AVSEEK_FLAG_ANY || - pls->pkt->flags & AV_PKT_FLAG_KEY)) { + tb.den, AV_ROUND_DOWN) - + pls->seek_timestamp; + /* 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) || + (ts_diff >= 0 && (pls->seek_flags & AVSEEK_FLAG_ANY || + pls->pkt->flags & AV_PKT_FLAG_KEY))) { pls->seek_timestamp = AV_NOPTS_VALUE; break; }