From patchwork Sun Jul 7 08:49:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 50380 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5204191vqv; Sun, 7 Jul 2024 01:58:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUny5i9idVM5ejuQ7hZLlWwv/N8LRZsGV2eCtjIBsJzqDj5qzjARqBto2S6Hov6qKFbLeuwvY0rlLHQPLy8oB2PWoLyyajJZKhQbQ== X-Google-Smtp-Source: AGHT+IHr8pGd7qnMu2AbPmO6woY4cdA42+0XPKBf+DmgvgWqvUmtobivu2taMe9HFK+MWsYR3SCq X-Received: by 2002:a19:ae12:0:b0:52e:93da:f921 with SMTP id 2adb3069b0e04-52ea062d7a8mr5511611e87.19.1720342726998; Sun, 07 Jul 2024 01:58:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720342726; cv=none; d=google.com; s=arc-20160816; b=vcwhjz8i4F83PvD1ORAW+SwJXlPuNH40KsHZzR5ce6idDntvweUULDhmNOBxJeOvSx /nydx8HEhUfxd9ey0k4QOyiTH1424wrHqwcHkXZRzKYxV1dUY3OuGMfWT9uXrFq9w14Y BwS62foJP+s5OxKxLuGVU9nftzJnboXhnuoLUgUf12FAd2EPUzYXd9Mv6VUCUltpnmgp gfcbpDucfXZNJxLVIDlTkv8Rv7R1ozq4QPA6fKKADUymRSlqOvNYDDahpj5tiyeiipmK d4354y3x3MNhom6fBIVIdaGm9l2cUdC8ALa6cO1mSqYxs2Bpn4oWwehmG78QYY3GocSB vWrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=7v2bW09/evxRFQyPYCut6dQLZke1vW2nBAdbctjwGxg=; fh=w8JR1T/5WquwCqgnlKgniZcITMXOtCHDzF0NyyyGKZI=; b=EImU03AzRSBhp1PxagNa2sOm3tVfWXmXbnBvVy/Ig8MhsTHoDVL1qk/Bu7jR1IR/6M pHpA/LwimaVQs+NKVlQOJWVaDug4iMh+hUJQZpt47MpnpK6ixyJNruQCsp4qHnqZyShr wPj12rcJXrnD/c+S3DNk3Hoy5DNAyQJSfXO7phuJl+IhvBb1CyXtgbEDdWGMIilvEmgz IlLtQQ4DJwKiARbSJzY8IbVmStk0eKNRiIxHJL5zMG1WvzxleaXq3bEQ5QHtlFtT5+V7 +uuMlUYPRoNROrJG55bLwYbC2w2Ask65PhkmUwAIPReHbBorCnuMdeRW9bkT3LQ8kSyD eRHQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@chinaffmpeg.org header.s=mail header.b=imSDua7a; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chinaffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a77d6873251si221121566b.305.2024.07.07.01.58.46; Sun, 07 Jul 2024 01:58:46 -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; dkim=neutral (body hash did not verify) header.i=@chinaffmpeg.org header.s=mail header.b=imSDua7a; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chinaffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B193568DA6F; Sun, 7 Jul 2024 11:58:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.chinaffmpeg.org (unknown [101.33.120.246]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BF0D68D9C6 for ; Sun, 7 Jul 2024 11:58:36 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=chinaffmpeg.org; s=mail; t=1720342161; bh=0KfLeTRXy7r1yVSTmyGYkaBP/T2LMwiau6mbCw9b2KE=; h=From:To:Cc:Subject; b=imSDua7ac1F7G00TspjRKkKvgHbE5eY+KTDXxFUb23Tbra83Yrjh2abSHLoIkGG4n k5rNWG+6f92RDb4ujnDgd+fJgxUwNAwkwnFvChR3VbtWcYnDRvcenhfVVkGGWQoFNj ao+z0d2qCKxYp/eNY8rctU/JVDakiz6PNLVHHDHuZYI7+9PU1cCz6GfuEl/fBPOonT TnoTA0VIfK9UwHeUiEhHnW3klIntAf2aNos8dgAn4hTzui6F+AgZBShQBlKovwrgY6 2YPKDdaJsiT1nH036xX9G29GX3MKvtycDEdJPDTsl/gUCX0q9yw49O9LosEmxyswbZ ObzhRObBLMMBw== From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Jul 2024 16:49:20 +0800 Message-Id: <20240707084920.7880-1-lq@chinaffmpeg.org> Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: refine error message when retry with new http session 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BSs9p4Gub+VF Fix CID: 1609624 The hlsenc should give error message when hlsenc_io_open error, release memory of filename and options, should return warning message when hlsenc_io_close error. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 274de00f9a..494875bc3c 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2617,8 +2617,17 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) " will retry with a new http session.\n"); ff_format_io_close(s, &vs->out); ret = hlsenc_io_open(s, &vs->out, filename, &options); + if (ret < 0) { + av_log(s, hls->ignore_io_errors ? AV_LOG_WARNING : AV_LOG_ERROR, + "Failed to open file '%s'\n", filename); + av_freep(&filename); + av_dict_free(&options); + return hls->ignore_io_errors ? 0 : ret; + } reflush_dynbuf(vs, &range_length); ret = hlsenc_io_close(s, &vs->out, filename); + if (ret < 0) + av_log(s, AV_LOG_WARNING, "Failed retry upload file '%s' with new http session.\n", oc->url); } av_dict_free(&options); av_freep(&vs->temp_buffer);