From patchwork Fri Jul 29 04:43:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 37029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp660919pzb; Thu, 28 Jul 2022 21:43:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sUBHcy05qTxQOV2Fsc3chTmgG447Z2SYH9iSu2b5fb43LpuVw8GZjUAba1XhFZ8kZLr+9v X-Received: by 2002:a17:907:1ca8:b0:730:436:6234 with SMTP id nb40-20020a1709071ca800b0073004366234mr1435537ejc.570.1659069819661; Thu, 28 Jul 2022 21:43:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659069819; cv=none; d=google.com; s=arc-20160816; b=0jsCD1XZVsg/+rYBcZ8bZKNXa/2bTzbG4MU0rd9vGQouvpYypeChZ2H5nZSucvUqCh WoWZq7oIDVtjZpbyQNoROgjD918i6lmI/XHAH6YOWj2QAluFmDunbDU8wGyPBzR0WRIG pIYd0Z2yOGCc9SMh00SCnUfJBLqSQewnrulLZ41Q/XQ6gxUObySCrQb4MWBMOHmaom6C TDHE1vSbFAWhf8Z1bPLlt2q+ELwlkxhb1knN+2hQtaPFMOx5h/azC2Rm9E3UAEeGXKen qb1Cexn0WeEAY8xpvRXNB4ITBJMd4yoaTlonfqwNUGZ4KUo/U/F9tMWim/hpHaS7YcPS DJ/g== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=ZCi7zrbQtvmRP+cfCrjex2YVV19ZsaYAMAaSoRiRzOU=; b=S4rQXqXOZC7tMWl72p8I1aBCtwHuUcZbLagqKfeGrfVQs3UrH8Fga7vUJZKTVLBECB W68+bx4YIyDnTPYufeBTrut8BhGdpWLAqcKZf4as/014wy/ki2V+2iR0uu4ay97pjZ7F rbMMRWxCj4lpaq4pb2wVzBd5ZbWG/g4hVkW0jl6krLWiN1M6Hc+69CyN7Hnx073PSC3Y WP400Euc/GdFpy3yihozTbskSy11iHMvDQgVUR6wo7BiXexkYswm8j8JxjkrEC2J0Vwt Jzxm9Wbftjyz85azPkNlVyhnDCSK47amEnE5Ypd12usiPQ3aHr2DIMkgHki7ZHvaQ4Ai EFLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=PtRG1MOu; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x5-20020a05640226c500b0043a99ce7f70si2576106edd.22.2022.07.28.21.43.39; Thu, 28 Jul 2022 21:43:39 -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=@foxmail.com header.s=s201512 header.b=PtRG1MOu; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 020E168B994; Fri, 29 Jul 2022 07:43:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-239.mail.qq.com (out203-205-221-239.mail.qq.com [203.205.221.239]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A5EF68B6E6 for ; Fri, 29 Jul 2022 07:43:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1659069797; bh=FHP3kABg+iDZcd+ozf1NX+mHlEUE4nULPBCGq56RIAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PtRG1MOuTIlYSgXznmm5SCaCVMaKvZ0c99WxzdL3TaLjAgHhtTUiV88r+sdwC2oPP CxP9dUUslNOdG4B9fVvdcMrIMiLyZDDfHjU6AgFNaYJSEOxb2eS30XmUI127kY5/Z1 hlbPvqaICVnf12n00qGSKCqwUnVTkRQ2a6dVPeVw= Received: from black.localdomain ([113.116.29.125]) by newxmesmtplogicsvrszc13.qq.com (NewEsmtp) with SMTP id ACB228CC; Fri, 29 Jul 2022 12:43:11 +0800 X-QQ-mid: xmsmtpt1659069792tpjpwrsc0 Message-ID: X-QQ-XMAILINFO: MC9b57iUs2xBNdgnZcx2X0X9PxSxMnmvKJkd+lglOUljlXfszz5ocIlRuMCDcD n4KJlEYZWQ0pBSYVaB3xcYS0bvJxA96II+eN2ZLR7ZQjCVexuJFPX0sfarVcnNvzNKR607AZ/FTI kB+HVDE3NrG7pITgIJtdiuuCVLEcBGnvCUdaReLflgdcxlkj4SYxGXcqUg5KS6cA45l3u/iitBLN SgMzrjDfpeuHqtcR6wdkukgmCqB0aSsj3rKvWiyhElGI1l2eWvjiajj0IIEMHPlKOgOL2fBUdO5I e98QyKcXmhzzPYm3H7F3CWzarVUL1pLn6bENdS/GWswzj8mc2DygLngss4B597GhFTGE6j3dqJtD XphPQfzgOSwibfpRrL7Q7q9qdiYZ7CZZ2/0HZ4GrKmgtPa96goS0e2ITM9re/evjgphYEdAPRlAn Xm6epYaaoC5bxgtlP0SV4S0PZHZlKNENMXhOdzOFCK18OObuGiDEAYyqlvaay+JHhxssFg1x8tuD Llyqc3x+gRAkB2JRXFrfAygy4LVeOGklbx7AOWBehrawE+nv4x1zKHMKt97SNhn8Cdh3vKftEmF0 iMYfcJ4yeH3tq+eiPlqY7SO5xaaXmQsUB8K6N0VfYyephBR4HEsEFkVJrLb4xrIfkkiJkU383CLq cj7cBY9LIjNz+Ph8raFqjzL8q+rEbHofYnlI9mpdTOtSfDfl2cLt+k3tM0PUGDRCGejjzm4GAljM F2av2+b39xnjiKsCRWJ3byB8WkGnQ3UF3KTem4kUiHlBZQtSSbZCF91zT1r+OR+F/3nZrGDc/v9y xDRQUIMUF1UWJcwQ99IGFDvu0FXRL21zWmv6e9el0NPI62g4kU4ds2eFAPDeaSCcOFcRIF2iRplq kDkxo+wI/JdlmlzeVFQzhuQ7zf3QzTkxlzbf8Wmuea5a90TX+Zs/JZkKJEAI2cRfIrOb1v5l4D From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jul 2022 12:43:08 +0800 X-OQ-MSGID: <20220729044310.125-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220729044310.125-1-quinkblack@foxmail.com> References: <20220729044310.125-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] avformat/flvenc: fix timestamp of key frame index 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5wCSQ90wwnbn From: Zhao Zhili Firstly, the timestamps generated from framerate are inaccurate for variable framerate mode. Secondly, the timestamps always start from zero, while pts/dts can start from nonzero. FLV demuxer rejects such index with message: "Found invalid index entries, clearing the index". --- libavformat/flvenc.c | 5 +---- tests/ref/fate/flv-add_keyframe_index | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 770ca319ed..1c4ffb985a 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -104,7 +104,6 @@ typedef struct FLVContext { int64_t lastkeyframelocation_offset; int64_t lastkeyframelocation; - int acurframeindex; int64_t keyframes_info_offset; int64_t filepositions_count; @@ -391,7 +390,6 @@ static void write_metadata(AVFormatContext *s, unsigned int ts) } if (flv->flags & FLV_ADD_KEYFRAME_INDEX) { - flv->acurframeindex = 0; flv->keyframe_index_size = 0; put_amf_string(pb, "hasVideo"); @@ -993,8 +991,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: flv->videosize += (avio_tell(pb) - cur_offset); - flv->lasttimestamp = flv->acurframeindex / flv->framerate; - flv->acurframeindex++; + flv->lasttimestamp = pkt->dts / 1000.0; if (pkt->flags & AV_PKT_FLAG_KEY) { double ts = flv->lasttimestamp; int64_t pos = cur_offset; diff --git a/tests/ref/fate/flv-add_keyframe_index b/tests/ref/fate/flv-add_keyframe_index index 39c4bed85a..6549170a68 100644 --- a/tests/ref/fate/flv-add_keyframe_index +++ b/tests/ref/fate/flv-add_keyframe_index @@ -1,4 +1,4 @@ -5f38d76da3ed4a5be06ca604c53666f2 *tests/data/fate/flv-add_keyframe_index.flv +9f3d6de74f3329651a4c515c20cea00f *tests/data/fate/flv-add_keyframe_index.flv 630192 tests/data/fate/flv-add_keyframe_index.flv #tb 0: 1/1000 #media_type 0: video