From patchwork Tue Sep 17 13:00:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 1433100204@qq.com X-Patchwork-Id: 15117 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 25D7544869F for ; Tue, 17 Sep 2019 16:01:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 039D76881D9; Tue, 17 Sep 2019 16:01:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgeu2.qq.com (smtpbgeu2.qq.com [18.194.254.142]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6466688175 for ; Tue, 17 Sep 2019 16:01:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1568725262; bh=MPuxcgPGoLQjeDidzk48aJV0TjAfqE15zuSbua1m4/E=; h=From:To:Subject:Date:Message-Id; b=MEy7FLi797qR7uaywTUV9JGauFT0NJkVlDL9Tgn8E33DY01gc+E3rB2k6mg3krbu+ hr6rLoGlPyJzkul/poNZRJaEv+6Ng6xU9XofzuD7miV8jIJjBRAmXCeN9kbXzjI3Wh QUVuaS9UcqkIJuH5ml76V8IPTscB5Vm1UC+37FYY= X-QQ-mid: esmtp7t1568725259tiyisdbgx Received: from localhost.localdomain (unknown [123.126.70.234]) by esmtp4.qq.com (ESMTP) with id ; Tue, 17 Sep 2019 21:00:57 +0800 (CST) X-QQ-SSF: A100000000000040L0K00F00000000V X-QQ-FEAT: HCts+r7vQKatedHRRYXGsjAVBYjRNnXdl0mJ/nvRWB2yXOzOPwO+fKhVoeuJh fiurkHM9H8p7n+cPfylVCRuDjn2jFFPnOB1L1DXJ0E4VCN6YM/fAo6aM5l7esH2MgdyKoH4 18c8t5K88Ox+drIFmwi9B9p5O9RFSqxgHQW0EhsEfYAwNreA0J7zypw85R0TtO0CFtPHkNp y89NfTbsnlr7pN2d6rbXUJ2pFg8bymzj5lCA928QHr7Uh947WWYvnsHV2MppQIWw5DWcSEf uC6nYTxy4VbV9VVZzE42OJfKZQXXYnpkzU3a0BM/Z4zt4g X-QQ-GoodBg: 0 From: 1433100204@qq.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Sep 2019 21:00:52 +0800 Message-Id: <20190917130052.42418-1-1433100204@qq.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:qq.com:bgforeign:bgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] libavformat/hls.c: fix hls_read_seek return error when seek to first_timestamp 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: 1433100204@qq.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: leizhai --- libavformat/hls.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 0611ddc6bb..4525862ee8 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2237,7 +2237,12 @@ static int hls_read_seek(AVFormatContext *s, int stream_index, } /* check if the timestamp is valid for the playlist with the * specified stream index */ - if (!seek_pls || !find_timestamp_in_playlist(c, seek_pls, seek_timestamp, &seq_no)) + + /*fix seek to first_timestamp return error bug*/ + int find_ts_ret = find_timestamp_in_playlist(c, seek_pls, seek_timestamp, &seq_no); + if (find_ts_ret == 0 && seq_no == seek_pls->start_seq_no) + find_ts_ret = 1; + if (!seek_pls || !find_ts_ret) return AVERROR(EIO); /* set segment now so we do not need to search again below */