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 1C1164DD0A
for <ffmpegdev@gitmailbox.com>; Thu, 24 Apr 2025 03:56:28 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97A1F68B92B;
Thu, 24 Apr 2025 06:56:24 +0300 (EEST)
Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com
[162.62.58.216])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9BB068B61D
for <ffmpeg-devel@ffmpeg.org>; Thu, 24 Apr 2025 06:56:17 +0300 (EEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com;
s=s201512; t=1745466975;
bh=IpJFZKkFpA7z8y7kP2bMyzbRx1IKOZE1oEnDPPpl6zo=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=yTfvF5Yk3WJatC4K+mUnnlw7DEy9Oh4C7rIDrhs5hbHPgsl+WI6GrIQQdUFYcnfHW
/oNol22unvBB2vPImUWrnxpMGarGfr0gsfgE4boDpRJsD0rsAN7YHgdUua5Qsb3vIp
5va2mWH+3OU9ze7yNImZKeyIWTIWxK/5CLBk0cJ0=
Received: from localhost.localdomain ([119.147.10.242])
by newxmesmtplogicsvrszc16-0.qq.com (NewEsmtp) with SMTP
id DBA0B025; Thu, 24 Apr 2025 11:54:58 +0800
X-QQ-mid: xmsmtpt1745466898tx3xjd7kl
Message-ID: <tencent_34AB934E3D70622D659A94402D9AF39F7108@qq.com>
X-QQ-XMAILINFO: MJf3YPW6EzbKlbAKlxJyBDy+rqyxKRwhhV1H38EJ6eGP0I9a2DkxN9cgvwTy27
Zo56SIFSPOO+3Iax4hfGphFcHh36ch1pCxvm8KuULNvDwpEkmOMqjQK1NBLmznGGh8m56mLFFuy4
GpM+ixJmOC6/WMb58Q8M7XfNLW/IU78or98EulLrqtGDKyBaisSX4D7UzSXe57aZh9DKhOGblreT
KAFi9vZOe0n5evIO2kUj6aWy0SEgvyAfLrrO4szO4+Plwy8qNGFKRVfiWrzt93Nu8LlHJQoKa0XD
kL2FK2olPCwzHawa29laW06u4kLy2LwgnF7ZLfT6oBdFHgdDInWkkf7qvY5GiVL5M+MX3hrXS5Y8
YwoCMBdsVDF0J8cMHXtN7h8U/lo6I0ds3xwX4vlSN+Bij1i6DcAlQNMaEyPY2l0+bBwUhj1tL2Bg
Mc6b7IBNep2of2IeQOHn3JMhEMIjuQz7YE9D8ngE+MButshC4qf53G5huOV3w0+v0ATzDoOGwtO2
wPpLqvV4EMiJt1wBeHx62OzQ0tNfqOBB0KG1J4IBR+7D7kyEeqK8/iKmoKv665yi3CHo5Sskzh+u
e8x4rct/L71ai7WPEw5+LHOxF38tGxXkrrABQ3uMA6wMtZYYc3n6mrkR1xFozMX2KxJix+ox4d4t
tN20w+XNta+oLgQXNz2c+FZw6uGmvsJui0lik9IRRBBsXgXndePfH+nYeFfgD0T4OsRbqFDyxbZ+
or/Hj3aBOSkRkKNXDfk/M+vb2UWB8xYSEqp3atep+2CEfAkxxRlIBMHtOpEp2uDJLjfe96E1ch/n
BugE8IQzqVlTQDMRRE7UDUjWGbA2S5C6uTNJPgbWXEaioVmNonKtOCCW8YMBOs5asXtE3icPcvyl
vAExZrCHs8CKILAC+bYZ6CIPtFt84v9+GDYJeqgH9/yd3BT7ZUI6+ooxUz+IHC/8jhqCMqTC483Z
twO0bTAe88rEKJS92TsRRTxAHjQfy2Fw5PXvcCKaFg4AvmGkcqvKT+BFF5UsxVMQQtf/6tsCC00W
B0fm09UuDoCxukjxprSV3R/45aJAM=
X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc=
From: Zhao Zhili <quinkblack-at-foxmail.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 24 Apr 2025 11:54:48 +0800
X-OQ-MSGID: <20250424035448.97808-1-quinkblack@foxmail.com>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <108CDCB6-9027-4188-8D96-4C1F11953F4B@gmail.com>
References: <108CDCB6-9027-4188-8D96-4C1F11953F4B@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v2 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: 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/tencent_34AB934E3D70622D659A94402D9AF39F7108@qq.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: Zhao Zhili <zhilizhao@tencent.com>
---
libavformat/hls.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 6623c80309..6139b8525e 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1353,16 +1353,22 @@ 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);
+ if (ret < 0)
+ av_log(pls->parent, AV_LOG_ERROR, "Unable to read key file %s, %s\n",
+ seg->key, av_err2str(ret));
+ else
+ av_log(pls->parent, AV_LOG_ERROR, "Unable to read key file %s, read bytes %d != %zu\n",
+ seg->key, ret, sizeof(pls->key));
}
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));
}
av_strlcpy(pls->key_url, seg->key, sizeof(pls->key_url));
}
--
2.46.0
_______________________________________________
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".