From patchwork Tue Nov 22 00:08:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 39382 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2628305pzb; Mon, 21 Nov 2022 16:08:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf40ffdY07/AMj4z5v41YhOg2v9259qyiPD3IuOdNO2GygdcQV9TNPE8W8hycKnNvSXDzaGQ X-Received: by 2002:aa7:dbc7:0:b0:45f:b80f:1fe8 with SMTP id v7-20020aa7dbc7000000b0045fb80f1fe8mr17922582edt.118.1669075719547; Mon, 21 Nov 2022 16:08:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669075719; cv=none; d=google.com; s=arc-20160816; b=ey5FTfVaT6JSHwS120y0OFsRx6mqIpeJJc9gJaC6XYZ/ofIs4NiSk413OuSjFSFUCO Zu0MK6puvUcHXTmRFCuapOOOAsXLB2gtOmlrxcmaOGD1pHXerKkSzuBQWdvyIQodYXTH KZw+O5R7emYL97f9eAtjVkr0kB+5Iti/XaD/ptGKrc9gXwt27fJqxI1Ik5cLiU/NUf/N Jwku7u3s8OtVZdu8YLwPNAa3w4uNvdLOgiBOVzrpVx8zzuFaTgfHPgyLS/LtntfWr5hF Zfsm4OBrQ9svKLo1ss1YEluyUw2glOEcnUE5xf5hF2V7Fu8d+suu/mwnDjRXeIVTVNUf dULw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=FSKLqdiyyWDZNwBaduGG/wdTcV2T8nOmSGX3wVC+ZNc=; b=uYJtqJobhj9kcwZz4p+PPK7+JuRQFohAOicJDq69kgyThY6/WyakDtjWURGzb1Nrji bpQ7URTOrmuG5yPxa0t37tmzpT6wAiBO0q/wmqgEpC4UzlaeZnFGGPDEfrC/u80jh3qS spozTRrHVH43NE8FcH22LvczvtyRmtM1pT/jIvjMLLE55tGnYD5HEpDlODLpxexjCkwb CSBj3yLLl1s2MfJjwQNMsi2wlCN/sHfiVYEVSDHQwFSt7fyr5BfrSMYYjTJ9h/qXibpe COGEB0VnEG1hhMTAG9el08PPWGkwpBw2PB8yKjQ9y3HuhdvpKex1PwHuqZW73/tx/GG4 Etsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=HOgzd+tF; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nb11-20020a1709071c8b00b007a953d421bbsi113420ejc.322.2022.11.21.16.08.38; Mon, 21 Nov 2022 16:08:39 -0800 (PST) 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=@rcombs.me header.s=google header.b=HOgzd+tF; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6EEC168BB61; Tue, 22 Nov 2022 02:08:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A800368BAA0 for ; Tue, 22 Nov 2022 02:08:30 +0200 (EET) Received: by mail-il1-f175.google.com with SMTP id z15so6404054ilp.4 for ; Mon, 21 Nov 2022 16:08:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=WXATgxm/oelOiGtHAqe72lK/uc7ZsIgw92SzVDHseak=; b=HOgzd+tFySUEuAaXAOnMeKTwFE6h4+CgOC85NRgLFUt5/bOA3PZSOvzuwq99zZAov+ BdNXYjNijqI796q3DQMc0Zz8LPBOypdkGwz5vOioCj0ZS5AFib3WlMayrHbuph2hdRjM 7DDH7ne6idtEWnaMkVLo2cS8QYGBiuTdTqk9SjMGhkh+O0uGRhQIDXgCPgwfRpzkUGAw /RRUSrj32Wz3zf5aH3xbClSlYBXV4JjjRjkydvoTFIJZMRsTqNmvtRBrd6+T/iKPB0k8 mcmssKR9+1kQejJ5JtwAipru0swWqg6L9tzhzSPt5CkGDHkUEG8qfH5wtclHviUbACcw Pwfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WXATgxm/oelOiGtHAqe72lK/uc7ZsIgw92SzVDHseak=; b=xBQSlPnJxVYIL53uF68Z7OVhp86URe5tZMXclT3nSvTaE4eVxhgfM83TuRnx3BScrd IVUyiF9yUg6kG4KQ3GeGcsQu7nwYcNVHJZaL66UOzja/1K7hKI+CJEbziVM8tjix4pw3 fXg6atq17/qbtp100VouIPB0uXGAgVZiCOuh8P0Mw36D6ru+UtbBVxxrZmzFy5utFSUJ hQeE5bGI/Fx7w1psY7+QpLonKwJkJg/8PsZQti5DiU/2PnJK6bOYmHVH4gOrICSNiJvP FKoxWuyApXWINGhZ3KBdzcqmzY9jDdNCHUdy63eb9OlolVVV69iAgMqPsIerxbbac71Q Xmrw== X-Gm-Message-State: ANoB5pnEtqxrIX20GiM/K0N1Wr5peapUTY/LdJ8kwJGJ2HaJpWewPzZK xHo3Zkr4azb38pSEubxPbLGmIOR6KZ2j X-Received: by 2002:a92:c691:0:b0:302:75c9:5d55 with SMTP id o17-20020a92c691000000b0030275c95d55mr559996ilg.34.1669075708904; Mon, 21 Nov 2022 16:08:28 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:70f8:2e08:d9b6:caa2]) by smtp.gmail.com with ESMTPSA id d8-20020a92d788000000b00300e8df48f9sm4306780iln.9.2022.11.21.16.08.16 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 21 Nov 2022 16:08:19 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Nov 2022 18:08:10 -0600 Message-Id: <20221122000810.42699-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/mux: ignore nonmonotonic timestamps for timestampless muxers 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kB9HQUuU8qCf --- libavformat/mux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 37fe19358d..7b13dd8012 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -538,7 +538,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * } if (sti->cur_dts && sti->cur_dts != AV_NOPTS_VALUE && - ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && + ((!(s->oformat->flags & (AVFMT_TS_NONSTRICT | AVFMT_NOTIMESTAMPS)) && st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE && st->codecpar->codec_type != AVMEDIA_TYPE_DATA && sti->cur_dts >= pkt->dts) || sti->cur_dts > pkt->dts)) { @@ -783,7 +783,8 @@ static int prepare_input_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt) /* check that the dts are increasing (or at least non-decreasing, * if the format allows it */ if (sti->cur_dts != AV_NOPTS_VALUE && - ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && sti->cur_dts >= pkt->dts) || + ((!(s->oformat->flags & (AVFMT_TS_NONSTRICT | AVFMT_NOTIMESTAMPS)) && + sti->cur_dts >= pkt->dts) || sti->cur_dts > pkt->dts)) { av_log(s, AV_LOG_ERROR, "Application provided invalid, non monotonically increasing "