From patchwork Tue Jul 25 00:01:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 42960 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp2259471pzb; Mon, 24 Jul 2023 17:01:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlGXL9I/7hGaA5wxd3Qy0EBq+XchXeGD+DDNRPr9BCG/AziGnlKVpfEOvoWkAfR2F6/FOcPP X-Received: by 2002:a05:6402:1397:b0:51d:9e0c:1396 with SMTP id b23-20020a056402139700b0051d9e0c1396mr8515890edv.35.1690243302665; Mon, 24 Jul 2023 17:01:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690243302; cv=none; d=google.com; s=arc-20160816; b=zXCbwZALXcQOUaJVbbPBthYik+3YAAEvVZVbKMcRPomK8N/CqtP8ymg6rbT163jyoi RrRUVE+2AkUKA0qmrn3tZygVkmB8gbyaEPrbo9wXrsJqtd25yLCG09pQaSKL8Mjj9gqy pRcxZWnjUdkJJj5H3V8C0IIzYqnujwYNChkKGAeETqSkNuPTbnHNhg4lyDVwVVcuUKLf wqmngauE+LLCHjAIO1kBf+Gjsuo4tJKjqWHtoQ157BjiE60thhHAMDHAHV+MJHNnMKJX K7nPhTrIK/f45k8AgzyWfUVzt4C5sWmEA3y7DcQdB/jdzb3meQLamqjfM8r4n0uwgUjO 91Zg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=qvHKzEfwjiYSRKCC820i5jNjEfV4PHujY+rjfzUjGdA=; fh=THn8xhm7nbInKfZrsdxNoU1y4WW1Zw1l5a5AomvlR2A=; b=fF+OThRBk695wYs8GDvmEwk8hM+UNZjiyVVso+qORAMdxvywMid9YQpHZNekU3S0Hw fSLHN12bVnpTagtWHSFVpdoB09eGlOjHu1p8Dd0GIYPh6wd5bLDgDjJM48dbx6nq6qO7 us8y0XxaA/z4SiWYCBd/MYR8ohHMZTToXO331pL2BjDfVYWIUc3/9qGXSSGfLZaLH/EI JHIos8icSHd3PcKxtfDBMO1ChdrenhfRnFICZcS5Eil4ioHMzABtGbpVwpRWsXU7a2Yd vPvtvnWy3S75LJAHk/fSPNxDRTgwDFuT0JLG0yItMJdA/1Yarpv77wq5DnOGxBZXtP+5 /TaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=m8XQ6CDD; 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=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u6-20020a05640207c600b00521d0a2c5adsi7536061edy.379.2023.07.24.17.01.41; Mon, 24 Jul 2023 17:01:42 -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=@rothenpieler.org header.s=mail header.b=m8XQ6CDD; 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=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0142F68C6EE; Tue, 25 Jul 2023 03:01:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [136.243.74.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4804A68C702 for ; Tue, 25 Jul 2023 03:01:31 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 46459177444; Tue, 25 Jul 2023 02:01:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1690243290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=unsRwSoqEQiAsPnu8n4ei27PMpeCwJsLEIL+q+61bR8=; b=m8XQ6CDDxYnz0Lns4v4Pg63tx2o7HE4tp4O+V1pOluPi2CxEunI4exV7ah7h/vKN6+M9AA anxULuDBIY9rYtmIsbxm5mT2Kkw+Xs9lRLRCqfuqCfLQYI212hWv3KU8vc4w3qYVN48GET QQZ6R6tSt8igpoWcc8ksNIjGqpLyeiAr5LFAiIwlkcz2GbvYediO0bkcFbpzxEKCkeoUkK 9qUgxBechTyZefo2P/o/mHKMKSJGMMxi4UKkF2pE7fkqMs5GgPdqJLbGk5Z6NMapvHwEYb llB9L/rnXcG6DP3x5AVeNwWtjb5CQF55aqWN1aKGScA1slRVX61ENEzl7mFSWg== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jul 2023 02:01:22 +0200 Message-Id: <20230725000122.35732-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/flvenc: write proper timestamps when muxing hevc 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: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XyxA1WYYwY1U --- libavformat/flvenc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 335d900415..41636ba1b8 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -863,6 +863,9 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) else flags_size = 1; + if (par->codec_id == AV_CODEC_ID_HEVC && pkt->pts != pkt->dts) + flags_size += 3; + if (par->codec_id == AV_CODEC_ID_AAC || par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC || par->codec_id == AV_CODEC_ID_AV1 || par->codec_id == AV_CODEC_ID_VP9) { @@ -998,8 +1001,11 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) } else { av_assert1(flags>=0); if (par->codec_id == AV_CODEC_ID_HEVC) { - avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeCodedFramesX | frametype); // ExVideoTagHeader mode with PacketTypeCodedFramesX + int pkttype = (pkt->pts != pkt->dts) ? PacketTypeCodedFrames : PacketTypeCodedFramesX; + avio_w8(pb, FLV_IS_EX_HEADER | pkttype | frametype); // ExVideoTagHeader mode with PacketTypeCodedFramesX avio_write(pb, "hvc1", 4); + if (pkttype == PacketTypeCodedFrames) + avio_wb24(pb, pkt->pts - pkt->dts); } else if (par->codec_id == AV_CODEC_ID_AV1 || par->codec_id == AV_CODEC_ID_VP9) { avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeCodedFrames | frametype); avio_write(pb, par->codec_id == AV_CODEC_ID_AV1 ? "av01" : "vp09", 4);