From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D823A40C4B for ; Wed, 9 Mar 2022 11:15:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E328F68B002; Wed, 9 Mar 2022 13:15:23 +0200 (EET) Received: from out203-205-221-242.mail.qq.com (out203-205-221-242.mail.qq.com [203.205.221.242]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B372F68AFCD for ; Wed, 9 Mar 2022 13:15:16 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1646824510; bh=sc90cREPHvdYUJkiBAzadojCjzO5LOduv7/LDxemawc=; h=From:To:Cc:Subject:Date; b=XhvQtio5ajcWhlE3zXR+DF+BQsNPBCdjcb0xCZ3U8H9bxaRLzNIUz+LPRUqHmsng3 ankqJObVzgMtF6bfCMOLectd+YjMmkTSULS+kj3t8K5rB82uf2EGPih6ASpMvvz6HV DvRHohudZ9lMBy4rtEtVDL5bTNqOuYh7fMX6XNnU= Received: from ZHILIZHAO-MB2.tencent.com ([219.133.100.3]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id 3C904280; Wed, 09 Mar 2022 19:15:09 +0800 X-QQ-mid: xmsmtpt1646824509tdi4pj5jx Message-ID: X-QQ-XMAILINFO: MGiYsCKeK2OAPlfzgZ3fFNuZ/wTV2Hy0mPGP1xcHQ16w71DXHG9BeykFxuwfB/ 8UXHKX5bt+LvrAAfDnWzHXVZWrqbS+DdslCB7Ar2RbdDyrPs48uKYgBKM6tW/lYLb7/0LKVNl+SS ldlwy5/C4+/7vDBAVEAmUsrihWR/w4PELpGg2xQiIUACwUTEQgiK9KuU3w9uPtK0D6bTSkrIodDU qIsy4DHVMJuMVKq0RI5FgXcpR/V39nZXxQ4eC5l9YX3GyTqplzL25MBY3B5kmfOemQn9Qz6mYclR HRnAezqSCqbmvi3/e+LSn8Wsl0iw4peQ3H/mtbSdAiIBQvss2EIq28g6VQBLiyTAItG4Y4z/J+Jm ZwB23v4717lhP8NiLOpTw9kquiZBUQag3f2faaE6iBy0MILnaMUYmojP7wu2lNdZZzDnl6mQmnC/ dBXpgPx0069QvuO5pvvhHKhhZbpPuQL0aD/b6k99sodeyQ2M67lMiL5+FJJts8TeJibNfIdKZa7x jNZazZPwo8zvUFLlFXkS72KeRkkm2pH3tmnLFM55JfoBhZtmN3Hkjdlh6Y7l7Q9cS53tG0ED1gPi mFilqFHUTEi0ruQG3B26kOS4RyP2I+Aincyiuaaed50U7ud62omBaf71cIa/CehpiTxy+dpqqFjk wfLnrUrkoSW7/PlefXUJ9uV2gZee+YnPaw+B904lUKrf8uFnvPyaM27vtum3o/nqEVIo//kpIofC rQr7T1QG8PY6OYf+ieRZzQD3557s5pSYj6pJZxqVbcv7bTN3rZ22C11FVlL7sA5sNfLymxIoNh6i YJBIQ8AviWk9uWK2bLs5OzyC7bztgMmouptWEbd4Pwdt3iswQ23NoJgn7pXQJhPwwbQOcf65Gsjj +b/JQx/+Y1vyTpCJ6LwQC988J9Imlfws/FUJaT5q3R From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Mar 2022 19:15:06 +0800 X-OQ-MSGID: <20220309111506.64176-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/flvdec: fix mismatch on timestamp wrap point 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Change the wrap point to 2^31 to match flvenc muxer. For other flv muxers which treat timestamp as uint32_t, it should be handled by wrap_timestamp(). For muxers which treat timestamp as int32_t and create negative timestamp, they are broken before the patch. --- libavformat/flvdec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b9e36b3ff1..ff5e6eabb4 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -184,7 +184,7 @@ static AVStream *create_stream(AVFormatContext *s, int codec_type) } - avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ + avpriv_set_pts_info(st, 31, 1, 1000); /* 31 bit pts in ms */ flv->last_keyframe_stream_index = s->nb_streams - 1; add_keyframes_index(s); return st; @@ -1033,7 +1033,11 @@ retry: size = avio_rb24(s->pb); flv->sum_flv_tag_size += size + 11; dts = avio_rb24(s->pb); - dts |= (unsigned)avio_r8(s->pb) << 24; + /* FLV timestamps are 32 bits signed, flvenc.c doesn't use the 32 msb, but + * other muxer may treat timestamp as uint32_t. We ignore the 32 bit and + * handle the wrap by avpriv_set_pts_info(). + */ + dts |= ((unsigned)avio_r8(s->pb) & 0x7F) << 24; av_log(s, AV_LOG_TRACE, "type:%d, size:%d, last:%d, dts:%"PRId64" pos:%"PRId64"\n", type, size, last, dts, avio_tell(s->pb)); if (avio_feof(s->pb)) return AVERROR_EOF; -- 2.31.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".