From patchwork Fri May 1 15:24:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vectronic X-Patchwork-Id: 19418 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 8761944A998 for ; Fri, 1 May 2020 18:24:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 597B168C622; Fri, 1 May 2020 18:24:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44C9A68C4C1 for ; Fri, 1 May 2020 18:24:44 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id j1so11925767wrt.1 for ; Fri, 01 May 2020 08:24:44 -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=V0G/kvRHWNOngJGK0TfWpj7g+R9Gak7B92huy+M0vV0=; b=Camtr2A5GzFyywLtfKhpH8GmGfXH5buWFA7ra9gYB87oSffqNnema4tclwSb7ZcNzr hk0y9oYdAd7AMf1YU3pmxpDawT3R3Xag9GIuCJGgF8korUNcm3SxHKO/B+5l24e29eu5 xcKEMTlctYiSiaH04ldzUQljccJZWHef2zu8qSsnS8mQvQIZ+oC5KHcpc19dlBr9BdhP SWmIw9xD1Nk++HKGs/yX1DnVjY2eD/1G6z/8wg/nGvHeKMRY6lX7K8DsOrVL09QsGeAn yQQSRPmIpA4b9fbXFdjogAhbQRpUQaOgeBWZx89jrnVCDJh07w83uiL3pD4yLO74IiFQ 44Vg== 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=V0G/kvRHWNOngJGK0TfWpj7g+R9Gak7B92huy+M0vV0=; b=SRyxtOUeuLXSt1706QQC1oHs3VktdG39FJPFoCgUbOutXK0rFzcfdVUf7PwZ3egfkE HZKjOSD7KAVoK+mpxu5/BV1d2EolqSKIYfEFu+YT6NZ2S/U/+a2W2lIPLUENGmmJkaHe THtwg8zKaZFxCA3qVBwn7Q61o8e+M9xVX0pp0iGUgueky+vns19A6abi8/lFyt8fv0KN +76jM44pwbvwQm0y3u0f/sFNfEREQttVJ/MGFXBocg6gAkt2VscY3hrhSK8OtkFXpoV8 wmXVpdQNFzIXbBq06dQHT7UsmITCh32fYXzOSHM4K8ZMuYn5R4CF3XdgC5dDOONw43bo 6XlA== X-Gm-Message-State: AGi0PuZvM1FvqFuJZYeZKpijWZ1l2fak+iPUhvNJR+0SrEQVsDnxvlle b4EKCiZOOigjya/2nWT4DH7yRyEFXfU= X-Google-Smtp-Source: APiQypKguC4YQA6X3wkHSEP8O8QpWigXurx5lvJyaRg/r7+Cr6NtKkS0PEODOhSWSaFBPFl6OylQNA== X-Received: by 2002:a5d:60ca:: with SMTP id x10mr4600218wrt.407.1588346683484; Fri, 01 May 2020 08:24:43 -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 s18sm5330949wra.94.2020.05.01.08.24.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 May 2020 08:24:42 -0700 (PDT) From: vectronic To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 May 2020 16:24:36 +0100 Message-Id: <20200501152436.50352-2-hello.vectronic@gmail.com> X-Mailer: git-send-email 2.24.2 (Apple Git-127) In-Reply-To: <20200501152436.50352-1-hello.vectronic@gmail.com> References: <20200501152436.50352-1-hello.vectronic@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/1] avformat hls check discard state of streams always 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" The discard needs to be checked on a stream even after the first packet is read. The first packet has already been read as part of calling avformat_find_stream_info. This means that setting AVStream->discard on a stream after having determined the stream info for the HLS package had no effect and unwanted packets were returned by subsequent calls to hls_read_packet. Signed-off-by: vectronic --- libavformat/hls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index fc45719d1c..0740e9c546 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2014,7 +2014,7 @@ fail: return ret; } -static int recheck_discard_flags(AVFormatContext *s, int first) +static int recheck_discard_flags(AVFormatContext *s) { HLSContext *c = s->priv_data; int i, changed = 0; @@ -2041,7 +2041,7 @@ static int recheck_discard_flags(AVFormatContext *s, int first) pls->seek_stream_index = -1; } av_log(s, AV_LOG_INFO, "Now receiving playlist %d, segment %d\n", i, pls->cur_seq_no); - } else if (first && !cur_needed && pls->needed) { + } else if (!cur_needed && pls->needed) { ff_format_io_close(pls->parent, &pls->input); pls->input_read_done = 0; ff_format_io_close(pls->parent, &pls->input_next); @@ -2101,7 +2101,7 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) HLSContext *c = s->priv_data; int ret, i, minplaylist = -1; - recheck_discard_flags(s, c->first_packet); + recheck_discard_flags(s); c->first_packet = 0; for (i = 0; i < c->n_playlists; i++) {