From patchwork Sat May 1 07:12:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 27550 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:cc:0:0:0:0 with SMTP id m12csp213205pxt; Sat, 1 May 2021 00:12:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrxOiCaqKC8pgOAHDE6DDpvUTr/1MpUOaKSBy+6C7tGYpA8oJPoWvMFvOPviKXpKRXd2qd X-Received: by 2002:a05:6402:4245:: with SMTP id g5mr10166667edb.306.1619853177498; Sat, 01 May 2021 00:12:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619853177; cv=none; d=google.com; s=arc-20160816; b=uRAHFBmOIUbmHCHrCmyhajrRI4Fq7p0EUtqVw7GZMdue7ccP+1UeD0/9La89v1UpVT 5UcHSf1Lr1gqGpNLhVTiHaP+rnWXUpd7EnNyESPIQ1B8robb6HfHbxnAQM4pbFp4qa0n 7TBTq6Ii6v3fnpSP3eltyDi3pzLpcA6DEFJISuxkIAG6ja7NBRzQrU6mTzbesVQLTdh2 vY9M8nG4239mxtfEoCW4qjUvemtqgwxLEncYd7rNx9cE3yCpvTdYnrwdM0CEtkYpN/kV Y9jtjVX/veLqVgOM+mCIYZw1TnfcinE4bi6DeCP6PuiwgL1iOWUmHz1Otfw2tmbTqRH/ 8DEQ== 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:feedback-id:mime-version:message-id:date :to:from:delivered-to; bh=42hg6HsrUakU+iBzec7HHjppcg5dJNqV1YuG4GIW6Tw=; b=tKT0/mggZUBjfYADfCPrNnw1GG1gAg29Lud1LEp0OTfcPZpBuUs+iql3KZK2uSTFxt pj1casaiJpGH07w9S2dbOYO7J9lpnvwhsk1eW1Zq8CS6gw9m/k/78ERts7tqG1Kh09Fn J0Gq8CXMox3seDsb6Itj6iooDpHBxrLF7o6N6FhmwbAtLyi2obYcyTCd/mNo9D0kQkOI 9MCLAsaj218hHVzAu1ccNH/rvOi5Po0SylcvSlM1aqntbIAXntOYJ9MTcXGkvBJ8ImCf 6zKBbk9Ngq2bXQiRQjMnfGdQciGam4vpVxBuB263PRmBvX++YgRS/bi8VFC2ofYO6Aiw NPGw== ARC-Authentication-Results: i=1; mx.google.com; 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=kuaishou.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q4si3747155edn.394.2021.05.01.00.12.56; Sat, 01 May 2021 00:12:57 -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; 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=kuaishou.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 821386806EC; Sat, 1 May 2021 10:12:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2302E6806EC for ; Sat, 1 May 2021 10:12:45 +0300 (EEST) X-QQ-mid: bizesmtp53t1619853156tnpm7qld Received: from localhost (unknown [42.238.153.143]) by esmtp6.qq.com (ESMTP) with id ; Sat, 01 May 2021 15:12:36 +0800 (CST) X-QQ-SSF: 01100000004000Z0Z000000A0020000 X-QQ-FEAT: D7T5Q+XploNDFWhYrLaYQuzkkSUqdHooCQZKCzqdadDqErM1uUeUFQ3vesbhx VTpeie/wCVNSQpbEOr6LXskdzCcOs6UCwxl3eHnwT9qlszXfsZZQbQhDl/zGqHd/Yjibd7C gNtzw8bQezt0NAslK7VJ7ysW7j/KEhKZ02pID7awYD7GuLm+PaB6sGjflYTcaGg7AGFJ1JI naAQzcdLQFa7s51B5/rsRWtd3hKVBq+PWTGe1Iqml2fxIw74VGvCBfsrvafL7d8cUjjw/RN iiu+A3Yu9gDwuXZQcoOUejzAnKkEGPECg685f/a5/nzQu3/Nmpl7VUH2KaZRpAPADEtA== X-QQ-GoodBg: 0 X-QQ-CSender: lq@chinaffmpeg.org From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 May 2021 15:12:34 +0800 Message-Id: <20210501071234.78554-1-liuqi05@kuaishou.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign5 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] Revert "avformat/hlsenc: compute video_keyframe_size after write keyframe" 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: H/FPlGkshqm2 This reverts commit b5ca8f2c66954614d81579082025f580efc0cffc. This commit will make new problem about tickets: 9193,9205 It flush data into file with init file context together, and it can get keyframe size, maybe need more method to get keyframe size. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7d97ce1789..e222b70ffa 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2672,14 +2672,13 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) vs->packets_written++; if (oc->pb) { - int64_t keyframe_pre_pos = avio_tell(oc->pb); ret = ff_write_chained(oc, stream_index, pkt, s, 0); - if ((st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && - (pkt->flags & AV_PKT_FLAG_KEY) && !keyframe_pre_pos) { - av_write_frame(oc, NULL); /* Flush any buffered data */ - vs->video_keyframe_size = avio_tell(oc->pb) - keyframe_pre_pos; + vs->video_keyframe_size += pkt->size; + if ((st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && (pkt->flags & AV_PKT_FLAG_KEY)) { + vs->video_keyframe_size = avio_tell(oc->pb); + } else { + vs->video_keyframe_pos = avio_tell(vs->out); } - vs->video_keyframe_pos = vs->start_pos; if (hls->ignore_io_errors) ret = 0; }