From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 160D94DCE8
for <ffmpegdev@gitmailbox.com>; Thu, 24 Apr 2025 02:34:40 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF354687DBE;
Thu, 24 Apr 2025 05:34:36 +0300 (EEST)
Received: from mail.chinaffmpeg.org (unknown [101.33.120.246])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 087AC68B6AC
for <ffmpeg-devel@ffmpeg.org>; Thu, 24 Apr 2025 05:34:29 +0300 (EEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=chinaffmpeg.org;
s=mail; t=1745461465;
bh=Z10XtzWnnG1NQeEbtb5iMsVJky8tykc+kIl55dXsUBk=;
h=Subject:From:In-Reply-To:Cc:References:To;
b=h3Gcc7UtG9MTocVu19kEodvIbhm9gTh2OA5bsjxSXBPKPDWtqaGEN2UrWwRA4JWP9
ctzed1veCHQ7E7I679699Z4rHQ16VMY1fjvWDj2LBlWA1xxXTJCCrQoQHVFzARAvgx
cf7pn0wxRmiM7xmryCV9m+PdXtQ269xRRGGlBGNKI7yxld534oYbAU0cZ9DTdaeKdc
Kiz8GDqMvjSdHIU2NVNZTh5+cYGX5ovTaIFVZcJarmZDUBECsAi941J9YZpK6JHYoH
daT6X8emaYUZtfnzxv2BitFERj3vtpV4YOz4LeZNmsctntkbtU9JQ7djbyYpCDuLmr
kMaKsCjzuc5Jw==
MIME-Version: 1.0
From: Steven Liu <lq@chinaffmpeg.org>
In-Reply-To: <tencent_FCCD17A003CDE7CFD35572A73038C6961A07@qq.com>
Date: Thu, 24 Apr 2025 10:24:13 +0800
Message-Id: <9505F77B-E07E-4C00-B1DC-CB8215CF3DBC@chinaffmpeg.org>
References: <tencent_FCCD17A003CDE7CFD35572A73038C6961A07@qq.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 2/3] avformat/hls: Show error info when
read key file failed
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Steven Liu <lq@chinaffmpeg.org>, Zhao Zhili <zhilizhao@tencent.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/9505F77B-E07E-4C00-B1DC-CB8215CF3DBC@chinaffmpeg.org/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
> On Apr 23, 2025, at 20:59, Zhao Zhili <quinkblack-at-foxmail.com@ffmpeg.org> wrote:
Hi Zhili,
>
> From: Zhao Zhili <zhilizhao@tencent.com>
>
> ---
> libavformat/hls.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/libavformat/hls.c b/libavformat/hls.c
> index 6623c80309..45c1b283c9 100644
> --- a/libavformat/hls.c
> +++ b/libavformat/hls.c
> @@ -1353,16 +1353,18 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg,
> if (seg->key_type == KEY_AES_128 || seg->key_type == KEY_SAMPLE_AES) {
> if (strcmp(seg->key, pls->key_url)) {
> AVIOContext *pb = NULL;
> - if (open_url(pls->parent, &pb, seg->key, &c->avio_opts, NULL, NULL) == 0) {
> +
> + ret = open_url(pls->parent, &pb, seg->key, &c->avio_opts, NULL, NULL);
> + if (ret >= 0) {
> ret = avio_read(pb, pls->key, sizeof(pls->key));
> if (ret != sizeof(pls->key)) {
> - av_log(pls->parent, AV_LOG_ERROR, "Unable to read key file %s\n",
> - seg->key);
> + av_log(pls->parent, AV_LOG_ERROR, "Unable to read key file %s, %s\n",
> + seg->key, av_err2str(ret));
> }
> ff_format_io_close(pls->parent, &pb);
> } else {
> - av_log(pls->parent, AV_LOG_ERROR, "Unable to open key file %s\n",
> - seg->key);
> + av_log(pls->parent, AV_LOG_ERROR, "Unable to open key file %s, %s\n",
> + seg->key, av_err2str(ret));
> }
Why not jump to cleanup immediately after an output error?
Thanks
Steven
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".