From patchwork Thu Jul 14 04:48:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36788 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp137211pzb; Wed, 13 Jul 2022 21:48:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v90nOjYIrnjkUu5SErRN7872N5jQB6ffi/a4pxjyL3XKLK3a4vb42zT7fvQUm6yvsuH1SW X-Received: by 2002:a05:6402:5388:b0:435:71b:5d44 with SMTP id ew8-20020a056402538800b00435071b5d44mr9496659edb.364.1657774133306; Wed, 13 Jul 2022 21:48:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657774133; cv=none; d=google.com; s=arc-20160816; b=HXbGZ1jgYcx8FOWRoB+nRCB5fqa4UaM0Q5Pr05DNNqYBC7DnVnvyR8kWcwJ84yvtwL ZOcO0IMFup5RB2FGDwk0URMGB398LiUIBW298AP9GuhWJW8xySpjyyrUTH4Ec6aJDXrE K74lvjWAnv1v6QItsK7EPh9ug1rJJP0Z9ZtXrt4v9G4toaRZI1sWoY28NpLHWMHis0Xg kjhCFVQ33rdVvEmZo4XvKgBDIyZcGn3FTAfs99fYthYmpqTIejxw5iVD3mo6SlcMNRqf CR4C3dh0aoIfKueRqcNAxANvjIkdyUlrKf8unwZ/9k7UjjH+PUjwXly42v/D5TDv7noj lZJw== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=RhyWRK3LGJzibKLc2Rqnesfx3NLY4SsYD/aoi80fZZE=; b=M6BhQmm7y0VnSb6K0AneiVBg0zdzwoatcaal1I+Z3CJPEgepH+uRDcfKDtVHSn5B6q fBPu4z/tt63jxCoYy4M9fhKd8Y5UvmR8edq29Ev/KB8qPnRIJkVDuCOIQ6BR3GL7fkOi v7ghgyn2LgUndDh59Ic3fUqLGX+N+kgLSXBAUDN+8LmqIMPhzxITTbX63PWFd0cbbGh6 afrL+yBRT6PHbgAkfElkzJZYDCroYc98cyp5FV3wgSOPIGjjONOJaOrM+cPF0Capnrve +AA3oq8DgP33UxFMvmBeirhomJnnyyOn9qMCKdwzhprmzxd4/9uWkTpwnBP8IpfZmB9q c74A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=agmua9lB; 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 j22-20020a170906431600b00722e55f1eccsi13646ejm.198.2022.07.13.21.48.51; Wed, 13 Jul 2022 21:48:53 -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=agmua9lB; 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 B2A8B68B9B8; Thu, 14 Jul 2022 07:48:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-233.mail.qq.com (out203-205-221-233.mail.qq.com [203.205.221.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF1E868B947 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=1657774105; bh=JU+Dl0Js1+P7vNWLgvF/RXPTLMEgo9T0Rckw6RP5+ZM=; h=From:To:Cc:Subject:Date; b=agmua9lB8IlcPmj8Hsx95aR3obet/KhsmsF+ZzuYEceA3G64Lswovw4isTLA/5+wI ntszCkr5jV4RzcmpLdVguVs/cbOpvWs76gz2K1c9ey+M4w5fMHr4SNARnNSuKju+b0 RfoVkTpmELCUGY93hWhG10W8Ll89Utrge8BlB5tY= 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: xmsmtpt1657774104ta2xjmcdv Message-ID: X-QQ-XMAILINFO: OfkeHAqGKDFb/exY4R/icGPXSz10+ZtVTKLNZuSM8LQunciMe+zKcYk+J/iOhv p0f1GV/ZPYidyEpxqi9vTGliXNq496yjC+h5/jeBs+bB1HmKS1q3QbKStNfVu6fzGCWbCdVfQG0J g1AOdsNAPQEOjUoz11e98DvEsBQ62vADG/c1XKWNVk86BhGa2tP8s+rsGaJG2wCPD2tTS1F1yqmD zbi/QdyM5mkNvjU+pJ32lEmSh/Ml/3yuPxOI1xXdT80K1sAEfyqCfhLOXUXZa2VSG7Nq43PCAEVH sQaggE8dsOOo+BmJLWbAIPhErDilOKWF2lCUFNdPDGeViIkyB3eVbyTvF8O3uahvo2b9pCSDA+tM a1B6uc5S+br1NNPvLfQZJVoNlnrqo76gqnKQupIw9XEM2cDkQd8/y9fshX9fVskfWxh+uDu/Rzar LwPc5Vem+LlvLfC/tDGJrAb+YvuwoywmyvFrfjTdKNqESpFfO6H/w/hn4RMvhWVWLCagE41DByFM W7N07K5xEKC1iUxHbOygf97WRqtWZvjEGUiQrZ2ibNxkMVXqQFj6qOAwRXTrjuxS6M5hBIIFF47b xsxm1w6RN1Bf5uIcFL1PnM70FRpD5xHB6yrU1OPik+7Ep/s8bITtuZ9Tyk0P0IUni7c466lmMabm JIyuGVfqKFDI1p/ltV1Th1+KuQWsOLmhUDQeOpSyddILvU5Jkc0V4+q4zgG5RbJDtuSaIlRBWH5k lc+WP9eDRGDWtj7mJzn/KL+i7hdwS+nZqpap4d02EwMqO9cDESX556rUNrY8xJrQglvA1zIUqguV yOw3h4MeXVadkeXAtrhVa1y7OZn3lDtkmTYrJoYfmjJfW4/D515g8/ww7zYOcZw81UmLtDxHkT9t wMqx6Fwdg0dgYe5Yt0m9QTo0rEokPVBEWDY2csTETs1hOuWgO7xek0UUMxgwydhH37sK5wkm9G From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Jul 2022 12:48:13 +0800 X-OQ-MSGID: <20220714044814.72083-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] 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: lingjiujianke@gmail.com, Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GHiLEny2/1PL 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 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; From patchwork Thu Jul 14 07:00:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36789 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp186081pzb; Thu, 14 Jul 2022 00:01:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tv6BUIy1v30OZ5Zs9QNRQcAyD/ENJLrenaVtZshuZt9CDnCpnfFKwGgysEelDo9SUxk8sn X-Received: by 2002:a17:907:2cd3:b0:72b:5cc2:bc1f with SMTP id hg19-20020a1709072cd300b0072b5cc2bc1fmr7318656ejc.574.1657782075972; Thu, 14 Jul 2022 00:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657782075; cv=none; d=google.com; s=arc-20160816; b=BMhj3XEZZMirw4GAjF6WJqfRZcUEg08yByc56G1ZkD56BoN1F7Lkplh3c+wENEOzEQ i/v6fZOWAozDYs7Yiopymgw7f4TdkoyLPWp3WrpWDQUsSa1viRJy2Ytea8SdHELbHjxD JFxUnOZhvvBfRes/udH40VbRuI3Q0l3k9RGkhDu579++jcJwZXOF28fmNCVJnKNmnfUf ndgFTli06OPS4jabxa+Ozwa6AIdkFKxhlCUN1MsTdN9my0bbAhyVG7m8LSVlgw5qQaxz agsIMtPA+OwM484HiimtSRvieLIf0BaRg3xTZ96c+rkVoMGj8gmzTsmYWuhGHdI0/1xw 22wQ== 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=yNPZ0Crxpbp3tM8PefWQPXDYI4s+ednJW+gpxcwVyuU=; b=TimJXrr5Vr7wXzaKEntWi+XT5/qWeqmBkKfXgeuLa6m0WbaZiJwOASOBbzrq7Hxanm bt2LDzaXhcn7MuI91xEaE3DFSNBkixPw8o/EQu8vYiCvILd4tL/IzUjbxraj+wThG1+o wi/X+1eznH5Jm85bmWC+tq/TV0Fc2oc/L8wQPT3addsw72FYCDOO79SeRN57ccZ50Emz s4z8DEbkUlj9iuzksQmGGI2qjRffU+MV2gx0foQJdPxI4xGCd9+vj7ocwsI3dQw0vx8c yNyF+WhqPIx6bRWy5VUFR/Qf/sOLUTFMaFgTfTndCAsmNTVCI+AyEyivWzn2p7xCW3us wPKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=rUPT2ajE; 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 a10-20020a1709065f8a00b0072e6774afc6si998041eju.366.2022.07.14.00.01.15; Thu, 14 Jul 2022 00:01:15 -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=rUPT2ajE; 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 481F168B9C1; Thu, 14 Jul 2022 10:01:11 +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 9DB2368B8CC for ; Thu, 14 Jul 2022 10:01:02 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1657782057; bh=EnAxAee2+hQLmvEP8U2BRBAmjDahwqKmuCXxvlL0H0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rUPT2ajEiqB5TxGci/IgXFANmWEqzIlji+v8KGtHC7DM18B6bve7GehwrWNZtR1B9 bWEl46tFbPenHGu/fyevUxtKd3TtugptjANwN9PTPOSR5LXdloyc0gRmQKMs2rv5Q9 u6gKtE7cOMwALCLxQlJ9gG21VfknXHnbtZgeV8mQ= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.63]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 34A1200; Thu, 14 Jul 2022 15:00:52 +0800 X-QQ-mid: xmsmtpt1657782052t02f641jv Message-ID: X-QQ-XMAILINFO: Nfm/+M6ONQ5707tWFqItM+pkXhnV5Sv0HdmmQzOU1oUtIbdj/QkH7XL3UpW29t zJONuVD+X5nToJkS2xrjp6PDqdjhfFo/pLzGZxLWZiQZd8wRgJY2cRT30JQzW9ByVtRqNNFoHCG7 Wt+kWpxwCYnRLGd2XwSt+7SVJnitGQzlXdY9UoKR+9YUg15VvyJkv4uiaVAVgv7r6ekTcnpLOHAr DPEjKRs1iiR9ArGIlhJ+ue139iLVq8neA4cNrmjWIyCd3LHlNI9BGRIgqif0WWj+9tp2IoxmLTmu wDuxlsQ+AWZuHZtm9fK9Xjd4pbrlqgLYu+9z1l0OLhWfixriu34Umik9knwLkN0yx0/1U9zQaAFi Ga6kHqCXPJkXAiqsPl22MSRSCS+TzjO8K9CXhF+beivoS/TA5c10hHT4AdeZKw9B/xhNIa549BBK 1L1mC+2T3WCSaC3PPSpdoV7303Xcb+NTgC0ADn4INd052Ax/K7hf9MDogAjS25KwiarH835uFF87 fAH7dmAT34ECYYZreVQEKh/SUD9SB4Y1WTo9ZKorukpH9qPAstirLZL62T7HDdmIZ+JbEPetiKOR zHQ2tn3otlS8pdogQ8Sg6TRE8E0YT6IYwhwO+jucL15OO5nLVgLhz45Aw24OsjjEuKRAVk1xehCv +SGuFqqWCnFLdsKbSm0VHZWqaFT3qnJYq33BRdn+bNbAcqY0YqieexMQTv23gqrttTDhzQvTKasY fTX0OgmQHZONP2oHObirJGUhVC5rwNDHxSF3UbDjs5q94wMhoqI/DpsTMT9wzD/MV1HM5VpssWOl XS0SIHqUeTiEEAmLDEinNMbaNCfnw/5NFghpz76+vYeGs/1uIHnIrmWP7273SLjzvlMo1avnUicP LAfyosu+0tAl88Yh/Hpr10m2rodgZOW6yDBbSA9hJVQocwIBkUA9DC7BJrVZdeB+4qUSKvgJgaIT 02tnSW0rQ= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Jul 2022 15:00:51 +0800 X-OQ-MSGID: <20220714070051.80849-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: CyUSOggNthb0 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; }