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 From patchwork Fri Jul 29 04:43:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 37031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp661000pzb; Thu, 28 Jul 2022 21:43:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tuVUEBAOotSalIMcp/RVtvTNEhrTwONbNkcY0VaArk0O1jmV5KYVtOAucJV5X99IiQSbGf X-Received: by 2002:a05:6402:358a:b0:43b:ce8f:df00 with SMTP id y10-20020a056402358a00b0043bce8fdf00mr1818853edc.219.1659069837492; Thu, 28 Jul 2022 21:43:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659069837; cv=none; d=google.com; s=arc-20160816; b=wdKwlcp36YRXIeiNL6pT7M7OFR4VasbjmA+DKSOC4+ujIUW+gY8f9VLUxUqp5EBooG S5E4M0e10Mk/eovWCxXqXeIiFe4N6N4/Mn/OedztFt84AMF3jy9i+ywuhj1SB26A7lB/ 26y55VDP21PyHwbf3BudO4LUzQhArCSyXtkkvyqdVqMexaI1K+T6SKfnnkkjXVqzxLPF C/MJcUjDqp5HjCj+cNSk5emhmJvopNfYel1GE5GJcz1oRwKa/Mo/4Pz8MKEZnLc/ffWG 0gBJ37JVm+vUjH/l+3PRh4c0TD61LLey4yynpaGnIadCA0j+CcEeOmunCL4SsO8vcHh5 Xk+A== 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=NAR65hIx471l6YE/ssSrdqbBAhC+oB/HD8l8wGxgwWI=; b=NnewB8GRPd4CFv/Y+0rZktRnxoteP3oIzWHMXzYcwf43z/xMMZMijetF5/bIz0AH/F NP/hgTAQ1ZuZ0uiPG9GCeinmTIuBZhdaoofqb64YhuS5AYbsEfFjqDfYtrmxliqoqCee e43v3W1695tj0cEBlRtA4GSsS5lrw6mOduC/UMaPRLlOlVtLxhaZzwE6WPEiTQCKVOQo 1YbBCNsGyoIbqJcRBG5J5EvAP923PMFV5kI2hiGauIbIOfNOZHDbYIyxcXbtSehaK30c OBZJ0n1tsK/ZmAbkmmXJ7hLk4i9fSURAPMw4evIHSoV7MbtHK3qZR3+QBeV70KD5xXtA G2aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=eoJPTBDw; 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 y7-20020a1709060a8700b007301c7b1e61si2011343ejf.365.2022.07.28.21.43.57; Thu, 28 Jul 2022 21:43: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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=eoJPTBDw; 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 7058768B9F2; Fri, 29 Jul 2022 07:43:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-84.mail.qq.com (unknown [203.205.251.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE55868B6E6 for ; Fri, 29 Jul 2022 07:43:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1659069799; bh=mEDCX2BJUUH86A3J7hT9vDJsO8nVuP5J0chyEuOnMW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eoJPTBDw8//7r2gwAkwVv8TDFIlqBPW5NNf2btzhjHlDY9EY7KTLajEXodl+amSF2 g7h6NsE6BIhLiCZnnfLGj4q4oLe5hADdQvHz8JifUv0/zdqwl1p7k1d8nwqUkE2Bwm fxye6Fj5KiULqrRlWYpM5P0ydGV6CyR+xNZ+m6JA= 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: xmsmtpt1659069797tonpmdsn2 Message-ID: X-QQ-XMAILINFO: MtZ4zLDUQmWf9sA8sd2/gPUebjsfpwOvdUtGzU8RvYCaEgEkLKM3U/YEUGhhHU lPsaAl6zXhZQIq74h5r0+Qf6lmvpbDRyEUQQjrVgbLuM9Tesv1a70kHhOJVkFrf7xXIV9n91e09v +bC3CRZ6O7N/R35SFioGrO7k4STQD5+0cEM4jgsl3OGG/kS04PYi06o1VLgb5h4e0kXWI3Xf76LO ZF8u33m8uk3vYsxbelDmJOzCOUd01kVyTT36LMpvHIXbvNsS3JJ+WhDLqCGfde7kB6uxMhm2i8O8 pn+oj2fPC04UAn8Q4MCN7/HG1APhvUeUWf/xA8tyU2F2jgiMPYTOgHBoUpWuwrouj2t0svRperEK NaFGcZO9u/uCk8FXIxF6G1TXs74LE0Xbqcsn3Q6OGHC0SsOErZCFHH2E/+06ZO0GHcNJyFvmEtZj IWsxt7aaH+UGHbw6TZMcbXfzyAY0MaC1VebnYbmlZeDbSMU6boCc6R4l5/z9vi4hTudG8Vs7rlm4 lL39pPpLiRdr+hBawYHN0BSgwWCcd9e86sP7HAq1GQU6zhyBDtgik6EN3SPtZcBhno+G6Dm25wdH CZ2mRVbHIYI5rekkEKRkhlmDw/tE0kOrTG54FTH6jhSK2ng0pG/CeTHNV8IUnamAiqilOFjFmENL Ky2KxR0XqfLOZCFA/BjM+hpDlNdR3ksINSb+kdEhMXNE48im/9vyCJlL1ebVwAJSZL5A+2CR3y/w ICNTSHIaveuVJybi/FAVayc7Lc2XdY9Y3yK86A1sri4+VzFYVx8b8e7BDIe8P2iAZ1SgIizaZFwM HgJfFPV9aJT9BnOILCBnlGhWZMzKOXW53QHf6qDldOEMCf3h0c/2TQRAMiPy1awyyjWeMfSBT6B+ 4rrivb50YGhm4dVDLHPyGTNFdgjs7Lokfa3e2w/VAFWXuFi+LNifunLz+eJJsIi40FA91FaNg0ho AYCd6KgPridxNVrRGqf6DOT5N4lpM8 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jul 2022 12:43:09 +0800 X-OQ-MSGID: <20220729044310.125-3-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 2/3] avformat/flvdec: make key frame timestamps more accurate 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: 5M426VIEApCy From: Zhao Zhili There was an implicit cast from double to int64_t in time unit of second. --- libavformat/flvdec.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 8dba92661b..10f0ea7736 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -146,9 +146,9 @@ static void add_keyframes_index(AVFormatContext *s) if (ffstream(stream)->nb_index_entries == 0) { for (i = 0; i < flv->keyframe_count; i++) { av_log(s, AV_LOG_TRACE, "keyframe filepositions = %"PRId64" times = %"PRId64"\n", - flv->keyframe_filepositions[i], flv->keyframe_times[i] * 1000); + flv->keyframe_filepositions[i], flv->keyframe_times[i]); av_add_index_entry(stream, flv->keyframe_filepositions[i], - flv->keyframe_times[i] * 1000, 0, 0, AVINDEX_KEYFRAME); + flv->keyframe_times[i], 0, 0, AVINDEX_KEYFRAME); } } else av_log(s, AV_LOG_WARNING, "Skipping duplicate index\n"); @@ -428,6 +428,7 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m amf_get_string(ioc, str_val, sizeof(str_val)) > 0) { int64_t **current_array; unsigned int arraylen; + int factor; // Expect array object in context if (avio_r8(ioc) != AMF_DATA_TYPE_ARRAY) @@ -440,10 +441,12 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m if (!strcmp(KEYFRAMES_TIMESTAMP_TAG , str_val) && !times) { current_array = × timeslen = arraylen; + factor = 1000; } else if (!strcmp(KEYFRAMES_BYTEOFFSET_TAG, str_val) && !filepositions) { current_array = &filepositions; fileposlen = arraylen; + factor = 1; } else // unexpected metatag inside keyframes, will not use such // metadata for indexing @@ -458,11 +461,9 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m double d; if (avio_r8(ioc) != AMF_DATA_TYPE_NUMBER) goto invalid; - d = av_int2double(avio_rb64(ioc)); + d = av_int2double(avio_rb64(ioc)) * factor; if (isnan(d) || d < INT64_MIN || d > INT64_MAX) goto invalid; - if (current_array == × && (d <= INT64_MIN / 1000 || d >= INT64_MAX / 1000)) - goto invalid; if (avio_feof(ioc)) goto invalid; current_array[0][i] = d; @@ -478,7 +479,7 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m if (timeslen == fileposlen && fileposlen>1 && max_pos <= filepositions[0]) { for (i = 0; i < FFMIN(2,fileposlen); i++) { flv->validate_index[i].pos = filepositions[i]; - flv->validate_index[i].dts = times[i] * 1000; + flv->validate_index[i].dts = times[i]; flv->validate_count = i + 1; } flv->keyframe_times = times; From patchwork Fri Jul 29 04:43:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 37030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp660956pzb; Thu, 28 Jul 2022 21:43:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sFOJxtXVGd2IyjlL+cvpRdMy+D+RMpRPeJod3dsIBJm+tr4/2VgWiwEIP7yynGQGRaG/dE X-Received: by 2002:aa7:d49a:0:b0:43c:fed4:c656 with SMTP id b26-20020aa7d49a000000b0043cfed4c656mr1812372edr.312.1659069828556; Thu, 28 Jul 2022 21:43:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659069828; cv=none; d=google.com; s=arc-20160816; b=H/Bx6J3vziTIUbdK47FVfd1TfUDauC6PuqgLPQgFv1cAL7iY/pNwpfshVl5y07g2Y9 Uh55bA8+78kdXiSzcjcQOVUmR0VZoyUMYi4VDcqDtfYpdRimhBaXY0FkfvE0dT4aUqmI FZkVPmVn0nR7xEcIVuNhX5rKaOMBC/wbLF/MPGUgwfGsb8x2izTnApknCb0ihWk13G3F U652KYmCpmsvLUHgcdaY82H5og6h4ZUqb9suz3dOTeI7QOHw60cxCRA+cXF0PlSDKy9R gifs/F2zKyWtRvh1lW3LXm6rcPTfSDC91F76lIyUJI9foWG963nwEkiqppd/sYYnZUEf 5XyQ== 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=A/3ehBEjrejNEO0Y30VeSnP3p6nTCM910Bw4xbY2xZk=; b=iXmjIaBQ6uwNpLagM3mRC0LeiaJt9DyYzAANfqWJujFozB7qZxtMmfMec8S8RzTHnc jhpgE6N4cvOKf4J+Ok4UQ4l2wp/zyczbKGjHUNpYuyEIfF1m5Xm6xNbH/9w/4zA3REFR pX+q/wkgivqjAa2Ue0HbOgngtubKihLnyim8EpwLZCQZt06V1CDbdPLi1Li6LONCEvhd gS73oGXUaXARwgxXLyvzLRcizOBjABuBEhZk4YQmfba/d1nQaYb26j15xNlsTH+Cn0EX qf2w5vkTfw9yLsCE1qXQcrbbCVKj1jGudlUgBujzCbW/T67u30HIEEr4/9QI9SrSTMOZ qHwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=jgb2hEw6; 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 eb9-20020a0564020d0900b0043be542b956si2834116edb.262.2022.07.28.21.43.48; Thu, 28 Jul 2022 21:43:48 -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=jgb2hEw6; 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 837AB68B878; Fri, 29 Jul 2022 07:43:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F1E468B9DB for ; Fri, 29 Jul 2022 07:43:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1659069800; bh=USc8iUczaY3FkOOoL8fg3puWLR80H+0lFv12sL2kJYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jgb2hEw6TucyiQuveYT8BCpDNoP4i3o7MTVkZ31ushFuyNHRzanjmg9BVkdQ7FC5Q 59K5uckUPqiocXghVvFsfvmMXYJFfRlLfLuYswAcj9IukhMpyDZgGHuj42FINYDkmd GRTpwnSm8oLkYMFXTg8wPtkgw2f80mc0WndSK5ho= 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: xmsmtpt1659069799t5q0lyj24 Message-ID: X-QQ-XMAILINFO: NMmJpeSXIGQNFd4HxjAm7esfCQy+gucBlpVeUkh7zr4tpjG5bM6UhSHabBE4CO ZM7rV5rZ7Vm91h+6aSta7gmLIrzc+8qaha+W2qqZ3ckXaMkN8FVywNbIvleqljgyjdMGRwLNz2NR vq6eKHISV6a8uM1rDLxhVfRiuqvUxismwvB7pqB9F/uQaw4pLZ8E/fxCjMr6LSz7lOYEFM+dDYi1 wMPX0nd1Oj8r1jiNYdlMn/Gw+wNP225exdiOR8PNe7TuN5Lex1RhrCjthYHtEj2CY/qI5cFnMkHx c77PwyLohQKHH83xRr4lA3yCBcPuAaPpCfUHJxkz9ktuzkWA8uAVu12P3/41RuqtekVGZ+bmdn0c WLA3IO1O6MMpjefs0C0uhGOAMFBTkG+vzMHAhnVsMup6FiJ/SMy4gnjhH1Vy6ux8KL5hCUWzmmWU cvqhs+cJGLGqO4tPTxqzQfEerNSETVCscuBemT6z5cSabt0vMMd+oItn9xtsYqTSbxa3eyKVS7j5 FIS6BSMipDdkv9BrSu6FwDPCoT/IDx3bK38/aQxuIiINHAnmEuR7lC0ZjH420erFxWGMrVHw7Hu7 nw7BrNp1gWj/BWC7s5HDcoR3MG6wd208OgvCcWSUZ9j7o8TLOn5ff5vgL7ooKbIYcIeMP5jDMdtZ 3dznmk7utcgioRg3HQAmg7pJ58C7MxiqJsurXRAIwksPb2XLzwBWJ2ROZeH5KZopytfviFaunQ20 0eHp8El+ZOMjQlZpUwumkjvsxVG/YokLAjymvio4oWRP6pIUHWAKu/t7pFPCVgkIGX2tU5T5jc7h /BZe0f3oYBcCMzmViwWoByKHv0Qr9Z3mthDWLv4iq0TUW9fM0UtrnUD10IpqMxzymt8p/NiCR8y5 wkTVRlqzBrTD9n+E7w+rMi6ARtaXyswpBVNNLuErurQ7KaWU2GkKWOAvJRnslznpdjJYeQ48TKuW khm+iTI5o= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jul 2022 12:43:10 +0800 X-OQ-MSGID: <20220729044310.125-4-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 3/3] avformat/flvenc: fix shadowed variable ts 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: ZH9P2QNYirtM From: Zhao Zhili --- libavformat/flvenc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 1c4ffb985a..5d574fa790 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -993,12 +993,9 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) flv->videosize += (avio_tell(pb) - cur_offset); flv->lasttimestamp = pkt->dts / 1000.0; if (pkt->flags & AV_PKT_FLAG_KEY) { - double ts = flv->lasttimestamp; - int64_t pos = cur_offset; - - flv->lastkeyframetimestamp = ts; - flv->lastkeyframelocation = pos; - ret = flv_append_keyframe_info(s, flv, ts, pos); + flv->lastkeyframetimestamp = flv->lasttimestamp; + flv->lastkeyframelocation = cur_offset; + ret = flv_append_keyframe_info(s, flv, flv->lasttimestamp, cur_offset); if (ret < 0) goto fail; }