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;