From patchwork Fri Apr 24 15:20:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vectronic X-Patchwork-Id: 19226 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:3c87:0:0:0:0:0 with SMTP id j129csp768224yba; Fri, 24 Apr 2020 08:21:15 -0700 (PDT) X-Google-Smtp-Source: APiQypKv5a4rZmM2N1ZDL+4Xv4ecRm7d1b7lu0HmxhrIPmkRM45yyyTz+QWkoliQmnFQ88LcxXSq X-Received: by 2002:a5d:6688:: with SMTP id l8mr12410758wru.179.1587741674959; Fri, 24 Apr 2020 08:21:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587741674; cv=none; d=google.com; s=arc-20160816; b=fSbcOBLTftAZrg2nH29sG+p4rGn2yOGMAzSvNr3VEMdXYJHuKxi90p0ooGIDMPdm9H 9R8Iexv2S+/2zIQl2mWgObg0AQ4qLdZw6T1oyWNefbroFRY2ED1iR5E+NOfZQuA4U2it mGsqhHgfgGgjR7l/+1f8Ind12VQ5P7/92UuEUZlzVDV3XNGHA06gsOvGTxbyNMJts875 8sgd2ONy4Tc3iRyomTagrZPXQ5L+CFuo9+xYnjykHd2CVqxvPSBICCfMY0XJOAFDumXo BZEuDUflzRDvJiK4dpYtfqevFfgOPK5J1nctMohroDdqAwVn0utTsf0fdJdGRzQ1SYDg 3jiQ== 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=OVk6C9eTYYYYxGgWSUiFbdT4kl4Eo9kdoNkAR1SH7Nw=; b=YTOma/qi5K8vDIXupc5UGnIJ+d7WhCvUhKFfwo/ahA5aR4unAPjw8UvTY7qUMUHDcZ QW8TL7nWJ/rqyee3cuQCUfzgwiuRoU1aJbDt4/xo51SwcibHIacOILRZoQjMn+Ta/e7U Rf7zp9cn/7drunhThqR2TC9BuH2+bDBA4LqFOfUezUD3gyizfmdpazsa8g4Gq2UqKr1V NDsZNy7p26cyJncvQzzFJXBIDANbF+OfnZRe1fb6v/Ntb6Kvy4b4r5G8w1RWMxnhjYkq Uw6ilOu6wMKY9fKXQbE0W8hcg2aep000PGQ58m0eWeC11BnOyp+GOdFBdL+etUtfC7mz hDkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rl8xnYUH; 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 q10si5893750wrv.370.2020.04.24.08.21.14; Fri, 24 Apr 2020 08:21:14 -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=rl8xnYUH; 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 C9B7168C142; Fri, 24 Apr 2020 18:21:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F13BE68BCF6 for ; Fri, 24 Apr 2020 18:20:54 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id e26so10922781wmk.5 for ; Fri, 24 Apr 2020 08:20: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=71Ung6ZSE3ItN7R5muqrSvsJl92UPlqGiBNZc1Zl8Tw=; b=rl8xnYUHUpwHG1edLMQQj26/ikiygNASlCgfAsRrm+lSqPQ9rV0XEPCc6UHtOXYPM5 J1lolmEpqeuFpOUJrhYgg8yIU6Cxade+5wEVavad6tWyuKj1Rptmefm98Ef9WF16FGg2 fsaFld7FqzpABcvND+1KuQPSRGf8Q/sM+5rWiDEj4CK2F1YdyFqfbloDdKGXnVEuK4lP o4JMBjC16RGlxch5Ik4EpsHIlWR8EDcjJ6weqRPpRYNUhUlbqDu4hw+sDw+aicAUHLoP mb806xpvzD44I+vRw9qeC3Spzy0PSTe4IroZaf41evXNLrao2PK9pZXL2xNxc4QDNmOK klaQ== 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=71Ung6ZSE3ItN7R5muqrSvsJl92UPlqGiBNZc1Zl8Tw=; b=Yz2TX3/WHHVEXIzAThu6nJUokp7rszzfTOHviSdKcXB+ppUF3Lb6R3jl8DCCEZrb81 R+G5VK/J6dHbeofZfb9Rx9Drs8ZrkTitVTuL+s5RpXhoOUte/XOJQwrdHiWoTjch7JSr YkW/nQEgfafvkQ/ePR3Hvkxog27S1YH73a6Lg0jIXTYSFAcKmfPVwThQVCH5DDmTE3d0 Gki3M3c/J3EGrt+B88Kyes2Tv6oxPwcZgqOeUeC7QoqdB51PXM7a1mZN4FMN9i5qOp77 L1upAZpn2U4so6Rz/aMhiv5JDYQHceNBHY9MEMmGBqQctZFaW+uJ0IfaWIAyDWsadaca VF8A== X-Gm-Message-State: AGi0PuYoFBU8lIN3AFqpw3TbTnTzCUXxKLtCVmVBBeBg/vNp0HqbUrCn uqaWZtUbBNueCZ1ODEP9u3y46D6zYzc= X-Received: by 2002:a05:600c:258:: with SMTP id 24mr10534265wmj.73.1587741654165; Fri, 24 Apr 2020 08:20:54 -0700 (PDT) Received: from mechagodzilla.chapatronic.net (cpc76904-dals22-2-0-cust471.20-2.cable.virginm.net. [81.106.45.216]) by smtp.gmail.com with ESMTPSA id l15sm3131661wmi.48.2020.04.24.08.20.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Apr 2020 08:20:53 -0700 (PDT) From: vectronic To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Apr 2020 16:20:41 +0100 Message-Id: <20200424152042.29383-2-hello.vectronic@gmail.com> X-Mailer: git-send-email 2.24.2 (Apple Git-127) In-Reply-To: <20200424152042.29383-1-hello.vectronic@gmail.com> References: <20200424152042.29383-1-hello.vectronic@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat hls fix to seek logic 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: vectronic Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ph6dZqpWUVTq Content-Length: 2732 ensure a keyframe is returned if AVSEEK_FLAG_ANY is not specified Signed-off-by: vectronic --- libavformat/hls.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index fc45719d1c..4e59142c99 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2146,8 +2146,10 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) 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)) { + /* If AVSEEK_FLAG_ANY, keep reading until ts_diff is greater than 0 + * otherwise return the first keyframe encountered */ + if ((ts_diff >= 0 && (pls->seek_flags & AVSEEK_FLAG_ANY)) || + (!(pls->seek_flags & AVSEEK_FLAG_ANY) && (pls->pkt.flags & AV_PKT_FLAG_KEY))) { pls->seek_timestamp = AV_NOPTS_VALUE; break; } @@ -2291,7 +2293,7 @@ static int hls_read_seek(AVFormatContext *s, int stream_index, pls->pb.eof_reached = 0; /* Clear any buffered data */ pls->pb.buf_end = pls->pb.buf_ptr = pls->pb.buffer; - /* Reset the pos, to let the mpegts demuxer know we've seeked. */ + /* Reset the pos, to let the mpegts/mov demuxer know we've seeked. */ pls->pb.pos = 0; /* Flush the packet queue of the subdemuxer. */ ff_read_frame_flush(pls->ctx);