From patchwork Mon Jun 24 08:49:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 50117 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1867514vqz; Mon, 24 Jun 2024 01:50:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+3X9bmwrHOIv4GSvvN9oCWF07TdXlrNBJqN6SOJB+DKNa7xN2S8CnjVt0W0c43HZDlSqrEft+vL3UkbTr9oWBKww8OaYlbS7/3g== X-Google-Smtp-Source: AGHT+IG+RrQvhqMDZXc2+Itttkk9f9obQcYJz++qPo/7I7gmJ7CM4uPzdo+DTpwlC34KrEQNUujJ X-Received: by 2002:a17:906:fb0c:b0:a6e:f646:6fdb with SMTP id a640c23a62f3a-a7245c7025emr227189466b.72.1719219020081; Mon, 24 Jun 2024 01:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719219020; cv=none; d=google.com; s=arc-20160816; b=MtU6ONOqm/YiQh4NuSqwM1pvl15sRg8ocLNMZbcGU70vtZr5BHwHKh9buHA8GAo71X OlEkEZvcKwLNLjzMCs1SYATrBEFtxWC9JICMYXmD832PFD2BOZNAYtWcFiicMiJT346R 3U/PYuV0GOu6wimW58zEv++zeSpozCrcAUxPqmNlIlZ3ZwVbsgCoZ3y5K9HzB8nlgpR5 UtM6aCd5KwUeHzV3y6+6QjxiClYesqOfe/qNwXJQQHBxjnzXwEHr8xpAtqcdE875rQWm af2M5Y2stzX3MXMN4HGY50k0U37DZIzv2ClLNL3YVjUx7FTBzjBHLvnY4RsxmncoyOBw wCqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=ndGSzu2Nf2mSGUdg9+ShfP1yge43e1Mkjx3F8YGa60Q=; fh=UvIsH30fhBXMmPtaePKJMeMspabJNvEuvy3Hi3mTDRo=; b=0wWkxmmrHZHZ2E79TSUpUJZITRUPYCycfi9VMZ04zy9+qn+9n/RFHPsdfHgrIj9yZJ iGnHrirftzuLvddxBQed+JUcjtUaMYWUbuRLMlEC2Nt52vinfQkbhnvNZkdENZVT5dsN N5N45SATjzR7gZRplBfr0Inv+k28KZfOnSCcPyx2Q0Anc6xNgC8sA0IYHURWEsBJnhSY u/7NXJg92ggdudSRGv5TqMuB1/C2Mqng5L+Z/IpLcwMS1RSLBar98+Zgpb4epBGEHTR8 oa1fKYcvrbHxbomZr9vN3NdiBir5prffMfzf7pdd9OpXbo2RSqK0B7fsBMLKskagKaYr Os6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=yXb35uB5; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a7254d5857fsi77605866b.527.2024.06.24.01.50.19; Mon, 24 Jun 2024 01:50:20 -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=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=yXb35uB5; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C1DBD68D641; Mon, 24 Jun 2024 11:49:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D35F368C0EB for ; Mon, 24 Jun 2024 11:49:46 +0300 (EEST) Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2ec1620a956so48328191fa.1 for ; Mon, 24 Jun 2024 01:49:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1719218986; x=1719823786; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HFDlmPBUQ6+4WP4ofzLQqYHg7nC+vIDhSRmyTz0HlHo=; b=yXb35uB5sbc1edTvDMnQXWgmTX+RXfM6qmOtuMp0Mj2KhOchz98otcvy3CcBOXllqF iRVZIe3fXPdBPjkkLrwLB8LKQSPQzrAz/ojbFKW8W6wCtbIr0dZS/l/8YHbDJxf8coS+ U3G/BuEm1N9GVuaOLYMpTs18phy0anWasVjeYeAXRKbSrNaw9gX3tVHtFGSgBX7kBQAA 2C0BOaMoxvMshTL2atrullETfq3oBjUO+c7CLTnc8qsZrEi3lutLTvN0e0TeWPxnj00s Ayp2ae5zSICFzbmMj2mPOJtE3T5cczcQIFwMgHp8SUQ+Tw7CpSG3e00NIuC2T4mZg/7W j3ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719218986; x=1719823786; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HFDlmPBUQ6+4WP4ofzLQqYHg7nC+vIDhSRmyTz0HlHo=; b=D1oq5t679ZNXm7rqVanAgKY6idCDgxYimorrisRJG+tVYy4wyaihbcKoPuBUqfE91w QLDIptq/Tb3b3UcwaL4hHbKw7vvxkNWmhb5zeILYb3sW1NOitf0EUSxOEwTpe/0y73Ma +fvRb4TnUYx7NkqyOt7eQKulSW60ddpLaltYsjErE1k7oaa7lsNEUwLSTvzWN+/afCA+ mfqS87NwTMtB2S8icTSdv9PZGgAFSuRO0r8QObFArPHb5wlX2X/4uTnEiOPsaMU4PYx0 f3QxibEejijAG20e8pcjx8Jyd+2IxC35Ra90bVnF8y+1M8R1DaFm1Blxfpqw/YGGaSag WW1w== X-Gm-Message-State: AOJu0YzfuYfo/U6k0bnlwC6zdAZTEfSJ07WNUcCcsci9HxsPN2ygoikh 0oTm7VtmgI48p6ahvLcrxHaUKnRJkywD0oT3QjwPEKE0jPTAr0/L7Fz8OAx8UXGr6j8pvRjPZBE 1Zg== X-Received: by 2002:a2e:2e0a:0:b0:2ec:6639:120a with SMTP id 38308e7fff4ca-2ec6639130cmr2379961fa.10.1719218986018; Mon, 24 Jun 2024 01:49:46 -0700 (PDT) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ec5b93e5fdsm4676811fa.115.2024.06.24.01.49.45 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 24 Jun 2024 01:49:45 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 11:49:43 +0300 Message-Id: <20240624084944.14276-3-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240624084944.14276-1-martin@martin.st> References: <20240624084944.14276-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] hlsenc: When not using HLS_SINGLE_FILE, set vs->size to range_length 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: lq@chinaffmpeg.org Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IPVcaX813Nw9 This matches what is done in the corresponding case for HLS_SINGLE_FILE. Normally, vs->size is already initialized correctly - but when writing the initial segment, with mp4 files, vs->size has been set to the size of the init segment, while range_length contains the real size of the first segment. --- libavformat/hlsenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 0c72774e29..3ca99abdbb 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2586,6 +2586,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) av_dict_free(&options); return ret; } + vs->size = range_length; ret = hlsenc_io_close(s, &vs->out, filename); if (ret < 0) { av_log(s, AV_LOG_WARNING, "upload segment failed,"