From: "Martin Storsjö" <martin@martin.st>
To: Zhao Zhili <quinkblack@foxmail.com>
Cc: Steven Liu <lq@chinaffmpeg.org>,
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
Date: Fri, 25 Apr 2025 11:05:53 +0300 (EEST)
Message-ID: <8beda1da-4ee4-d5e8-ee4f-64c914d9cb10@martin.st> (raw)
In-Reply-To: <tencent_30F74F81D579272438EA96114D00A048CD07@qq.com>
On Thu, 24 Apr 2025, Zhao Zhili wrote:
>> On Apr 24, 2025, at 10:24, Steven Liu <lq@chinaffmpeg.org> wrote:
>>
>>
>>> 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?
>
> Because I don't know why not return error when the code is added in 84465f21 since 2011, and not
> changed since then. I'm worried return error might trigger unknown bugs.
>
> Cc Martin. Is there some reason not to error out in this case? Does that reason still hold now?
I really don't remember if there was any specific reason for not wanting
to error out directly at that point - I wouldn't think so.
So feel free to add that if it makes sense; it's most likely an oversight.
// Martin
_______________________________________________
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".
next prev parent reply other threads:[~2025-04-25 8:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-23 12:59 Zhao Zhili
2025-04-24 2:24 ` Steven Liu
2025-04-24 2:51 ` Zhao Zhili
2025-04-25 8:05 ` Martin Storsjö [this message]
2025-04-24 3:08 ` Marvin Scholz
2025-04-24 3:54 ` [FFmpeg-devel] [PATCH v2 " Zhao Zhili
2025-04-24 17:13 ` Marvin Scholz
2025-04-24 4:04 ` [FFmpeg-devel] [PATCH " Zhao Zhili
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8beda1da-4ee4-d5e8-ee4f-64c914d9cb10@martin.st \
--to=martin@martin.st \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=lq@chinaffmpeg.org \
--cc=quinkblack@foxmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git