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 833734DD4D
for <ffmpegdev@gitmailbox.com>; Thu, 24 Apr 2025 17:14:12 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B97A687D4F;
Thu, 24 Apr 2025 20:14:08 +0300 (EEST)
Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com
[209.85.221.48])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AFB0687D1E
for <ffmpeg-devel@ffmpeg.org>; Thu, 24 Apr 2025 20:14:02 +0300 (EEST)
Received: by mail-wr1-f48.google.com with SMTP id
ffacd0b85a97d-39ee5ac4321so1380349f8f.1
for <ffmpeg-devel@ffmpeg.org>; Thu, 24 Apr 2025 10:14:02 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1745514841; x=1746119641; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=VHq1F+jOZrMkGX+9Ft2olZHywoPaJudqHl1sC5IkOYc=;
b=grQbhrjKUOMtoLEw0/yVHd8AAIoHn81IJYSQzgounF5E9ET28ODtOyCXckwvxfOOg/
InFuGcg1EktJkO+bpLLHqVEnM7ZmQk6qoZ3exEA/MSuozgCDv2XeAjKSg8sguunxGr2z
uQ5wpGbSAnuGuBZJjgFD8hW8Wjuxs/r5y4yi1Ti7ZBUFwTAbNZzlhL71cUu9vPFtoIkb
D32T7mMkAO7EKchEpX/QSU7HRrnN7C4/jgew6OIhbbPV6TKBr5ZXn1de9+opnSri+cns
5h0IO7ZQ1ua6dpxj6NlGBnuKrT33nilL7dKrkUePSd7wsj8ioH1sbf7iNteMQZ8R5gVQ
OZzQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745514841; x=1746119641;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=VHq1F+jOZrMkGX+9Ft2olZHywoPaJudqHl1sC5IkOYc=;
b=MZXhT1GHb60yXMk1xME7wPex0rvnWwjr9WFQiW+fA2lSsLAuUzl0BBje6w4X7HW+BO
V5MnjK2ua/yly/8+kvL7PMJAAHOT/WODKTMAP4+wSVG1PzOvp+lt5vxzhW5Mexv5owC/
Hf8GM2yqlP9q8L5Q8AV6BMySqCbSvTqO+wL7nDdgSeIDdr6sqq4gnQtPKLJW8CMvCzMC
RvAU0C0PE7m2/L4Wv1aFowKuOYTidIHFx2N+OpXLsdGOvNT8eZ6Htfwl3udwDhe0U49N
8zy2vR93jgn1zp9UT/2yeh+6AZmFPGpCWnJ+319V2xPuYX6EJT9EWRjHDrAvrobgS7iR
Aokg==
X-Gm-Message-State: AOJu0YwTrUYlrd4t2HAWGaOn0kLjTkBIyOi2riAubG3M+O//7Z1tky52
XIuIkFBsF1+TpJQndrn779u62BkkHlR9tw684yNoo2bHcOY+PNFAFVLXmQ==
X-Gm-Gg: ASbGncs62rucPRnL6161aNPEkNGb9QdUQHs1b1krp1ilXVdRblmiPkCMy4WpKsskyzz
Ex5GC9DyUa1HuwPkpCQCy0DzwPmxvn5EREIH4pYkv/VNIp8V20oCdO9Uh0+p9vNN9GTLqJNA34D
ilh7aHPhhkz39DSF0rmrbKwe0rnVoIjLoQAHDWB8ty1ujChRtCDYOOCKevDyef2tvmBXj3ZEJfb
AUw8FPAN5wfVIVs/uqHGLzGhVCgXjBMeKeKr0lXv0Mx1Uba6NdcT/8D4KsVJWuHwo2Oq1044T3z
RccN8iwOTiz6RDmAQmTcLPI/I8uJduBKyCO8jzT9W7vJxwPJG/TAdmk4NTS+IC1+J4PocbRuSGI
Y/ON9yQCfCtAzrqk7oxXpgqphs+81RXRvc68PkUVKuUwwqOC9LdiIWWgKQXOhF2o62p3P
X-Google-Smtp-Source: AGHT+IGtT0big5n3q9vDqYjP/s39jgPwOSjkaWnZjPOlGs0e4i14RISdy8aac9ujATEs7gZnpMtD5g==
X-Received: by 2002:a05:6000:1ace:b0:39c:1257:ccae with SMTP id
ffacd0b85a97d-3a072bf9f1bmr121834f8f.57.1745514841503;
Thu, 24 Apr 2025 10:14:01 -0700 (PDT)
Received: from [192.168.178.57]
(p200300cccf18bd008044ec081157f983.dip0.t-ipconnect.de.
[2003:cc:cf18:bd00:8044:ec08:1157:f983])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3a06d4bc3f3sm2646141f8f.26.2025.04.24.10.14.00
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Thu, 24 Apr 2025 10:14:00 -0700 (PDT)
From: Marvin Scholz <epirat07@gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Date: Thu, 24 Apr 2025 19:13:59 +0200
X-Mailer: MailMate (2.0r6222)
Message-ID: <F7DFA710-C9A8-4C8B-8F04-1F7F922A1556@gmail.com>
In-Reply-To: <tencent_34AB934E3D70622D659A94402D9AF39F7108@qq.com>
References: <108CDCB6-9027-4188-8D96-4C1F11953F4B@gmail.com>
<tencent_34AB934E3D70622D659A94402D9AF39F7108@qq.com>
MIME-Version: 1.0
Subject: Re: [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>
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/F7DFA710-C9A8-4C8B-8F04-1F7F922A1556@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
On 24 Apr 2025, at 5:54, Zhao Zhili wrote:
> 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
LGTM
>
> _______________________________________________
> 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".
_______________________________________________
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".