From patchwork Tue Jul 2 05:41:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 50276 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp2214987vqv; Mon, 1 Jul 2024 22:45:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU66F2NUUQ/EHHqv3f4hci3HqjCZUvTOAo8QGrRgnSGrptUU1ncFpIwE7NSs8HTBU7W1vHu5L4icqvJ7shkgjtBf8XACIBX5gDXSw== X-Google-Smtp-Source: AGHT+IGDijgl17vlo2hKc9G+/L6VS5adiiPxC7U4G2p0BUMGW7CSE6K/hfGTb7ugHvXRzAR5/b1t X-Received: by 2002:a17:907:3d8f:b0:a72:4bf2:e16 with SMTP id a640c23a62f3a-a7514463114mr608032966b.16.1719899156130; Mon, 01 Jul 2024 22:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719899156; cv=none; d=google.com; s=arc-20160816; b=Bk38ZAYwew3gSJvg4qjKqn4ijBhCAeMy5P+7L91gKg1EC9sjNqDz4ytRYUNMeb+v5K iV6Yib9Ui8ak0oXhwAhtoql5BQeWazrRo16X8XqKYpEXS0uu9e4MVIWMcjfkjSMyE7yZ 3OQ53R77jFozuQNnQz6qFaYFu9BJNqENVXwbxkCxcfCR3QGJGEneDR5wnCgQWKg9vQGJ 1ssaNBSR5ZEepSR+ZLoX28o9/fz9/8S7wFgp28MOL7sbCx17v3IWc1JR6d4xzZnXKI1r apgJ5XY6dY11ESl18KB6bnB+VWGQbTh/8ezwRkOmkH0mLNBsGxK9BJV8LWVDvtOLODGP TRNw== 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=qP0oPq2cBjJIAbxRFrDGAiChVL0/RShmrRbJY/MT+j8=; fh=PlWMzmI9LD2qGS7ipLrQl8z0iaQTLQLHzoGuXcBzpCg=; b=MYYfPcU6LLlPOFtyXs2zvi7HLxx+yyZ6aqQheVhHrMu8chwphEieG1Ghz/Z6GxqODV kOR4iJkXLp58U/nsYiVAKvD8WDkPFIYQpgLpW1uyVD6CAYLMIPvj13/uFjhsejaztc4u wOYuO2zZLW6c6NRCXlYid+oR+VpOshuzk93h+sZoE2jm9nwqbf4AUQnsg3n8IZsa6pm1 orIznPmaGQYB7d1x9zDJ0KRp9T1OPfRMWxDCFTIEUQhH1jDfylVfhEPi+pYFQ8/CBQTb 4itNbKd3vqULBYKZ+zfVrLqpJvmqOrcZxyzOVzCCbgb/W+KxZfZdldKX/MUNP6Gl91NH 8Lrg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=M4N3r0E0; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a72ab04b87dsi438774866b.393.2024.07.01.22.45.55; Mon, 01 Jul 2024 22:45:56 -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=@proxyid.net header.s=google header.b=M4N3r0E0; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A38668D50D; Tue, 2 Jul 2024 08:45:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f98.google.com (mail-qv1-f98.google.com [209.85.219.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC59D68D50D for ; Tue, 2 Jul 2024 08:45:45 +0300 (EEST) Received: by mail-qv1-f98.google.com with SMTP id 6a1803df08f44-6b4fc5c2f08so16163336d6.0 for ; Mon, 01 Jul 2024 22:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proxyid.net; s=google; t=1719899144; x=1720503944; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y51k0o7SYNAOjGAwm1ehazCwYnRIkbAvqIYOgCvr88I=; b=M4N3r0E0wHLFbj1/hY+flqXOi9GeJqhC4mrQyTFM2rJoII6L0VHdIEuV3IpxQJd46o /FOupeGJ1Nz4ufTfBTFSyXRMEmls/ghbfTE/Jk3bgUoUq4DqTUPTBQmj17j7Rr2MLkrv MH75caCTm3Iw804i+deR9yrCXvKMgw4WQU44QXVhduP7p4F3j+NWtRrTacRo092XXrx0 d2PGUEJXpqKNqZ9Ta4E3WarOV73dEz+rRTaydWst51YM5GDUx6vq+OI9VpNv1rcw+dSv X4Cr/Af+wEXPpPUeDAeVgbg3tvHQoXUvYkbAqbB8Gy6Uvu28A4eBnvumKIqSBlRvaLtX Ub9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719899144; x=1720503944; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Y51k0o7SYNAOjGAwm1ehazCwYnRIkbAvqIYOgCvr88I=; b=a6zBaaKeJvu8wp+8gXy6+tTZfiJJvpPv4aIEM/H3azbV1fKBAEqAtyQ9UVXNIsau2o LS9YC5ku67Lig64A2upQRrk/wxlCNNf0EPbtQJxN/+Pi3s3n/AMB5v3lhw9O5uJfZlhK sp/eNkeZmRapJnDM5Tyrn5NTYxwu+7eubsljdLQHU+8vuanZGC6cCO3Jqf05g0qokI1f 1x+69BI0ufOg7JawkJvuUMuiwO3I6yZqUC4vDNtNKpUlfk+RS+KVaDD7pvq1yxpKNNXZ /l3Fl0xkGN3oSuUukqLZ5mDX7gznZwIsO1yAE80ZEWhC+qI/Ds9VMnW2qy7oOwcSpXDL moCQ== X-Gm-Message-State: AOJu0YyNWxctCmtI6vOqStmeBZxXT78mvVHropZs4DHITmB5Fj34+znX y8fgx8zeOavqwz0xobJOK46QMOVh25SaPl4m1aZozTagNdzcE2vixcJwr4jKIsC487NR4zn64Ts ohsJeYOq17Zfl3TcMi2cNTDnTXUf7niAVyaonip/T X-Received: by 2002:a05:6214:501d:b0:6b0:774b:38c2 with SMTP id 6a1803df08f44-6b5b7059b3dmr78650086d6.6.1719899144369; Mon, 01 Jul 2024 22:45:44 -0700 (PDT) Received: from wsx-cc1-001.. (c-76-136-218-80.hsd1.il.comcast.net. [76.136.218.80]) by smtp-relay.gmail.com with ESMTPS id d75a77b69052e-446512c7b58sm1543181cf.1.2024.07.01.22.45.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 22:45:44 -0700 (PDT) X-Relaying-Domain: proxyid.net From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jul 2024 00:41:39 -0500 Message-Id: <20240702054139.1308221-1-marth64@proxyid.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/dvdvideodec: Don't add chapter markers for empty/dummy PTTs 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: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GETR+wFusRyh Some discs (usually same ones with padding cells), also have empty padding PTTs / chapters to accompany them. This results, for example, in an extra chapter marker that starts and ends at 0 (no duration). Don't add these empty chapter markers. Signed-off-by: Marth64 --- libavformat/dvdvideodec.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index f5b7dd33e5..0bf1a82ef9 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -874,6 +874,9 @@ static int dvdvideo_chapters_setup_simple(AVFormatContext *s) for (int i = chapter_start - 1; i < chapter_end; i++) { uint64_t time_effective = c->play_state.pgc_pg_times_est[i] - c->play_state.nav_pts; + if (time_effective - time_prev == 0) + continue; + if (chapter_start != chapter_end && !avpriv_new_chapter(s, i, DVDVIDEO_TIME_BASE_Q, time_prev, time_effective, NULL)) { @@ -934,13 +937,16 @@ static int dvdvideo_chapters_setup_preindex(AVFormatContext *s) continue; } - if (!avpriv_new_chapter(s, nb_chapters, DVDVIDEO_TIME_BASE_Q, cur_chapter_offset, - cur_chapter_offset + cur_chapter_duration, NULL)) { - ret = AVERROR(ENOMEM); - goto end_close; + if (cur_chapter_duration > 0) { + if (!avpriv_new_chapter(s, nb_chapters, DVDVIDEO_TIME_BASE_Q, cur_chapter_offset, + cur_chapter_offset + cur_chapter_duration, NULL)) { + ret = AVERROR(ENOMEM); + goto end_close; + } + + nb_chapters++; } - nb_chapters++; cur_chapter_offset += cur_chapter_duration; cur_chapter_duration = state.vobu_duration; last_ptt = state.ptt;