From patchwork Thu Jul 14 04:48:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36787 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp137160pzb; Wed, 13 Jul 2022 21:48:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sUD446g93cCQbKJcAJZuvo6j09Z3EacUv4YUMaqX+TjlpXRWOdG1/+15XcVRnyqnUSKKF0 X-Received: by 2002:a05:6402:d54:b0:43a:7044:e32f with SMTP id ec20-20020a0564020d5400b0043a7044e32fmr9710808edb.140.1657774123018; Wed, 13 Jul 2022 21:48:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657774123; cv=none; d=google.com; s=arc-20160816; b=z+P33FanZWq/pCUc4RZZoesFC08RjhPR62rL3qLzlO2UVPvkOw2qP9WVLDY0ynzK7q 1XU5u7IiHkyFH6Cc+M0tHAAHBczXk3qUcgu2OtdSHHpE/xAtPrsKc5E072xQZwG7Sscz 4cCgxIBXRH5Q0mpQhP3eore0BG++4Jpcf14XpWlMR9Xpng+om8v/IsDUfzBJlGgqaxl4 7Xg9Da0qZH+01MN9g9BVXHoyoPBESSfclmoiIBfIwI6JPVkCZ669YC9wJfVl71ZyRXWj +Py1qPGiq3k/TLqhE/vBBQzqdenYiEaLLKsHSxUgiJivUWkWh6sbW5qYnISvieJSg9A1 qpqQ== 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=QiMG5MWwOe7SpiMa9S9XmGXVFjGDhX2Olidw8SX4Qqk=; b=dna0fhAwCZtzdtOHM5GNChuNmo1NgijvmindwdOWiY5ShKNcAWlWwq85N67abozy4p 0aqxtgACVMyqrEdGOGxvzMNpqfk9r42XM5+/st4kLCBn1OMwPF1FCuJCfLcF2+da67lQ 1H9QRn/23aIAzsGN35SYigm8AY5J4me6d/Wwn0oTmBls5k4XyLQzomAK4J/6XQc4DpVz e38qmwKom1eXR8+jNMmpJyIfKLoHgOiZFxjz3Syl+P8USyXToB5ru7N8I1UhbHicH3n7 Y/GsheXvpSotK187O/m2eGVDmaEmL/SmHUc8GAvKT1U592XjndSDH0/W9b4yDDy2ecAN kn6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=wbBLj2qj; 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 e19-20020a50d4d3000000b0043a0e3729f1si795362edj.493.2022.07.13.21.48.42; Wed, 13 Jul 2022 21:48:43 -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=wbBLj2qj; 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 B27D768B9B3; Thu, 14 Jul 2022 07:48:39 +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 C7AC768B78C for ; Thu, 14 Jul 2022 07:48:31 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1657774108; bh=ZKncVmY357Ed+If1I+U7FLY22R5aoJwZayU1AemcFOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wbBLj2qju2tAVDzNC8EZbSxErKphYrYPjh6m7Fx2FD8tYJ89qjznAT74j7zsIK3Bw HuTmbaPr6LSp23uV4awdM5tkz6h/zN3XrD6IjPp/djJZPs1S2oXmOPRYjRTxZIiS/Q Al+VH3tbumzKGe6iUew5CmpGe68Z8whGlQ05pUnc= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.51]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id C189D885; Thu, 14 Jul 2022 12:48:24 +0800 X-QQ-mid: xmsmtpt1657774105tguvwb52n Message-ID: X-QQ-XMAILINFO: OQhZ3T0tjf0am6k8MhBC59zZ21/clfABfZN4rRXV7/w/Iv3vwA52TVMmcolrZy OR6TVe9pmIusG9mlisun/8KvhGhsZk4S7avGriaQ1NBwv53rDXWUka9CFQsEzOKtX6Fxvk5Ayc+r coU3T3Smpplnr5tjgsup4NSdFibpvKaG4VzWPiAivDUUZgG8uqtjlttAL7QENZghSUc7KJVmDGL5 6CkVUacXSnq5O0vSaHbexgOatdM0EMxulcsB0+s+4wmixW0AKFyjOMvWZX7v1e13A6eJZd+sbb/s 7x8E0UzqUXdhkzmst+ZhxKb9DKHlAJIh10d18mpSDHXFubjOLzvc2YiiHbG/LeyiL3sv9zNxq5r9 NBj56KMVCCiK+ugm55oRt9Uj2BPm9aF6RXs5UUBsWZNoI/Q9M35vyQwaJF94RaY0u297aw5sSTia fHK4Drdt2qxlYZyyjviUt6CwCFPSNd/bLqM2sHuScJFqEYNHQSaKvqrxp/MeE9tvoawAhmBTC42V oJ/Sgazx7ZY4qrXHl45BeyakAHKgYO+R8DGiXzU6bUCrLHM4DKGxbVWgescmKQuvQEI3mgoxGYob 7Q1VAxtCmijhEdOjZc1Zbb6O60Wr83U9ON7aLj3OUGWwxRQH0DFWHURlQDHroLJrgrIccX6VdTPC lOshllZJig6fxXIuHsx645G+4xayklHETwn/3muJgY0SKl80TlRitp+ZvOufyeF1A6btXI5NWSqd 94Ze+zhv+zU7HqXCKvNIX7qXjpji4asXXIuv2tF6dreLFVnHYobu3iXDhYp3aNA4xTtdlu7dEND4 tGUcHe1gypR03UR2sRDxY5zsVUhOIZqkh6PJitRNT44aNZvMCBSJhyebnQv/lluc4R7qdgGKiHKm D1Tl1bbVnTixGQI1i+nc1DJOyZdtaY3z1sSXhFf8RdOIv6gd/tKlkjoXairGsT6OQgitrPJ9BiuE XJz6n4BXY= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Jul 2022 12:48:14 +0800 X-OQ-MSGID: <20220714044814.72083-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220714044814.72083-1-quinkblack@foxmail.com> References: <20220714044814.72083-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] 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: lingjiujianke@gmail.com, Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: N6eaY9dMJ367 From: Zhao Zhili There is an implicit cast from double to int64_t in time unit of second. --- libavformat/flvdec.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index c5d3c63bd0..a78d720295 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"); @@ -461,9 +461,13 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m d = av_int2double(avio_rb64(ioc)); if (isnan(d) || d < INT64_MIN || d > INT64_MAX) goto invalid; - if (current_array == × && (d <= INT64_MIN / 1000 || d >= INT64_MAX / 1000)) - goto invalid; - current_array[0][i] = d; + if (current_array == ×) { + if (d <= INT64_MIN / 1000 || d >= INT64_MAX / 1000) + goto invalid; + current_array[0][i] = d * 1000; + } else { + current_array[0][i] = d; + } } if (times && filepositions) { // All done, exiting at a position allowing amf_parse_object @@ -476,7 +480,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;