From patchwork Wed Aug 4 02:41:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 29231 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2993252ioh; Tue, 3 Aug 2021 19:41:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8vpMY3y6S82AFh3On1cTnW5c4M/UHr/ym1+ReOG9M8Q6nMzqhwsD0TpHRYwGQdF+fYJ+8 X-Received: by 2002:a17:906:4d94:: with SMTP id s20mr22872994eju.152.1628044918803; Tue, 03 Aug 2021 19:41:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628044918; cv=none; d=google.com; s=arc-20160816; b=f8fQ2Yf5MjwhCMo/a+ARJwvU635tbtBM1/NSXtRhhlcN8lFX0N5zR08825mrJtdXBz nzNZFUb2kc0/Fpnk8QyVob3PxyJvJFrymJwERjoSM2S/UCw0E72STcHB0xb0+X7RO+ZO U0qeSM8d39h4JW1LlveC8z4Iz4z9UJIz1jJUvCgk8hVLLOXGwyeI5zRMRyfmNM124IaH mDjNPKz1KqHrn5OJc+TdN0duueFD5vYSzYWgF9pA/kRjZxE+WIDA9K3vDdT+yBJybBO8 +vGMTKKX7fwzuHvLwOQaNTc3qFmqCXEZoVvmmL8x+rgjFJsqMJSBjrNGELw2/L37gQmN EMoQ== 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:feedback-id:mime-version:message-id:date :to:from:delivered-to; bh=/SI71rZ641uPbuoHLuc3t9saJGjrWCKa54tsOYtXRa0=; b=zdHGLgSPd8xL3zaWzuwH98CDm6dT7J4UPTP6EgdSzsgTFQVL6kpS9A1ZPxIkn9r8OO lzjggx01XkQY2rBh2yZYBbFk3cDxIZtlHCOcrSwofkAi9aSMguyI1O2F/jQFHNWliiPN aCkdcmpiBgrR/j/0pO+1kHKj5ObkfSKyb0+4AsWB+5s5iOAdJRfq5aLwAyrMPdczOubN S5UV3cGIsT2lt+nV8CHrnzrXLVkZ3fNAE/Rd497tRm7vFAYhCGgZMVs8Mj5Z45IRQftP G6XjTrFIGKd8RVYEB7W33ri5nHA3sxHIzmo97MzrA7nsY7oAwp2EbYkhaYLZf9IKmw0a P+WQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ss8si717578ejb.212.2021.08.03.19.41.57; Tue, 03 Aug 2021 19:41:58 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C1AC26891F1; Wed, 4 Aug 2021 05:41:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg.qq.com (smtpbg127.qq.com [109.244.180.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39476680730 for ; Wed, 4 Aug 2021 05:41:45 +0300 (EEST) X-QQ-mid: bizesmtp34t1628044899twj6fsdr Received: from localhost (unknown [103.107.216.225]) by esmtp6.qq.com (ESMTP) with id ; Wed, 04 Aug 2021 10:41:38 +0800 (CST) X-QQ-SSF: 01100000001000Z0Z000B00A0000000 X-QQ-FEAT: ugnP//+K2OqFgMCtfl65C9qeHPd++/FhKLE04U1oZ9or9FDaC8Zhx+ExW6c95 P00wj7QfUXrjFE1aE9k4fAfFWC1rzfi55DPZKqEIE9ZbOfgRGWYvWlgPEfQhFvLpR06JsRN v3MKkll8x+RgtLxEEbErgQu0ehDWZZVTbCn1+yHE5GR37Q4OfyNJ3b5j94zXnI74mjP3wuN e4a9TBztgxKEmo5rDqK5W3nP3e4v4Fw+TJCeq6r2Z5CoFm4VfUvWypLnRdmiJaK3JODeQDf vyTAZO7RSJHxFsv78E/JwBDYofwilWM32CL6A7qubETKuw X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Aug 2021 10:41:36 +0800 Message-Id: <20210804024136.72626-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgspam:qybgspam1 Subject: [FFmpeg-devel] [PATCH] avformat/hls: return ret when read_packet get exceptions 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: Steven Liu , bevis Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WsRco2jmTJPg From: Steven Liu Should not modify to AVERROR_EOF value when get error number. for example: return HTTP ERROR return value when cannot get fragments from http protocol, for user get the point of problem. Reported-by: bevis Signed-off-by: Steven Liu --- libavformat/hls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 3c1b80f60c..21a939cef2 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1461,7 +1461,7 @@ restart: reload: reload_count++; if (reload_count > c->max_reload) - return AVERROR_EOF; + return ret; if (!v->finished && av_gettime_relative() - v->last_load_time >= reload_interval) { if ((ret = parse_playlist(c, v->url, v, NULL)) < 0) { @@ -2283,7 +2283,7 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } - return AVERROR_EOF; + return ret; } static int hls_read_seek(AVFormatContext *s, int stream_index,