From patchwork Sun Dec 10 03:05:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 44995 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp2198582pzf; Sat, 9 Dec 2023 19:06:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IH82+RevlYj1M633m6pquaM+Wc+7JBpu4nDQ19KKTsskH/+K6VnRO+aU6yyEebGVS5w7KZt X-Received: by 2002:a05:6512:3b09:b0:50b:f269:64d1 with SMTP id f9-20020a0565123b0900b0050bf26964d1mr1107479lfv.72.1702177572083; Sat, 09 Dec 2023 19:06:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702177572; cv=none; d=google.com; s=arc-20160816; b=P75U0GB15T+BEvj3vha+bQve/htlfY6K2aG7A/ASecuLgNi+AEdljzqhvYEwGlyuHy pV/6lQgcUmW4Kn/YJeGIQaDUF9K29GA1tt7j0y0y2gLVXJu7o1ZWXfb8vLt9UkfH02RC SLhYAJO5MUswIZNki+msxRv2WCVd2jvh+jPlh9/TQj9+dtk/wR26g0hAgTF3sKTDM4Ty YfIO0vS27v23eqg0c80CN10yA1NLW6xBPhGwF3g49bLhWHzfqC4yMW/sKZe/7FFlI86N jiVIC9dtq1FP1xGFXsSMf+5n8mToY0qPRBre5WUpIQ8VSLn5dHM+QZcpgtAU57oYXXGC Zlfg== 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=a2leui0NZ/aei8b+HzG5MVhWmdrbpygRU1v9bhIDZqM=; fh=PlWMzmI9LD2qGS7ipLrQl8z0iaQTLQLHzoGuXcBzpCg=; b=Azqpbme2eJ/q+fcyMw95F0Ntsc4OI84+cJQ/XR5sOg4qQ9fK/2oybBNVKOQuj2fhDH oY2wAmU5IleR5A+ZA+YhZELFQYs1KT7b/KG9nZAoes6wg4c7LMXRdSY1bNe3FK8Zfi5H Ws+ajHxUyGva0PNjec+Lolel21+uMwGMsJxemHOa4jHgMzph7T0VwcO0ww5uzHXVqD7p b+PBx+W0EQixcWnEGSg5430S21uTgSWG2YXBVkMqt6toPCep9U53pIOcz/0TD6vlwz8s aSwyn7xN/wJElvaqpGpoUHvZgPl2V1dvTTU1J3M0aZffI2cCETySm6M7VBqEGVBoxpcB qS2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=apRa47ip; 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 e19-20020a50d4d3000000b0054c94ae8d23si2364436edj.291.2023.12.09.19.06.11; Sat, 09 Dec 2023 19:06:12 -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=@proxyid.net header.s=google header.b=apRa47ip; 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 380A168D0BD; Sun, 10 Dec 2023 05:06:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f228.google.com (mail-yb1-f228.google.com [209.85.219.228]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B02868C482 for ; Sun, 10 Dec 2023 05:06:02 +0200 (EET) Received: by mail-yb1-f228.google.com with SMTP id 3f1490d57ef6-db537948ea0so3284441276.2 for ; Sat, 09 Dec 2023 19:06:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proxyid.net; s=google; t=1702177561; x=1702782361; 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=RGfR5RFunkJ7iOUJcgLIt7wdLe5QeVQwu54g1A9rBTk=; b=apRa47ipl8yg0i5UsFq5Y2B9Ia5kNmCXbAscpa27Q7m2P6DQ3kbsz1wp+EltmCeHYe fQAkjP8yjQEc46WTn9ThuHoJ8i3r4y4LKjmav+ZNinTTAIjnj6OoLisVtte210lQ0ajo fh/HWD7tmPHALf/qhVWV2lCUY0U7m9y525bLQcOeclnAStkIXfTXqy0zdkWFIyrwBGU1 A6iT/wO7if3NPijDWIFD0NtRqck8YEJbo/ITj6+PTFRyURjWG+cG2DlcCXg5wN1/MEUy qyb8asReTGu9+n6Ou8VmOAeuP2ikM1NDJM6Daqxtd9ex5lN+UW55nnXKzSBWAm2CTUPt A6uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702177561; x=1702782361; 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=RGfR5RFunkJ7iOUJcgLIt7wdLe5QeVQwu54g1A9rBTk=; b=Bk7YGUJCiTeD1erV8j3N5R/0b8NGkytUmpSYHqEpVKqhubj+aq6I4lYmPj3LH4D/rs clSS6AihZ8u3sECAESI2aNxtwohra2LmyWtjQcY6UQ08IGI0CCM8B0Tl9bhNmIlf/H1x GkETlPf7Vq2xTsksnsJTFWKro63ZmRyfm9fqrKWQsAHad9FtsorVSfdXod0MwDZADPGO YXhj0tuoEZOHhCtHj2hrmX4Roaf0DZVs34m2wZIqeY4Lgmbk/SZ+fMiXS7KXq6MhH5+N r9jDfFC+YhSwJvssr5AYoc4UaYbGRJGuTLq1lepO98ZCRyrmMc6pKB/aTnffzxeOEra2 N6Rg== X-Gm-Message-State: AOJu0Yzg3kDdW1v7Lh04DRjQ1cQTfUCYHljF5oVWN5Bd8ESBn7cOxtj4 23YK4MzFPrlz4L6rqNS7J+nbLLrXHJHYQg+Dk7ea5nnDlqcc24tWEewjAQ== X-Received: by 2002:a0d:cc87:0:b0:5cb:fd23:57e7 with SMTP id o129-20020a0dcc87000000b005cbfd2357e7mr1891090ywd.4.1702177561086; Sat, 09 Dec 2023 19:06:01 -0800 (PST) Received: from wsx-cc1-001.. (c-76-141-0-17.hsd1.il.comcast.net. [76.141.0.17]) by smtp-relay.gmail.com with ESMTPS id x185-20020a8187c2000000b005cc8c51a480sm518383ywf.11.2023.12.09.19.06.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 19:06:01 -0800 (PST) X-Relaying-Domain: proxyid.net From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2023 21:05:13 -0600 Message-Id: <20231210030512.866830-1-marth64@proxyid.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/options_table, doc/formats: clarify meaning of igndts as per definition in avformat.h 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: V+TvEuCyzQjW This confused me for a long time, hopefully this is helpful to others. The definition in avformat.h says "Ignore DTS on frames that contain both DTS & PTS" Signed-off-by: Marth64 --- doc/formats.texi | 2 +- libavformat/options_table.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/formats.texi b/doc/formats.texi index 640b23b790..2ebcef50c0 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -46,7 +46,7 @@ Enable fast, but inaccurate seeks for some formats. @item genpts Generate missing PTS if DTS is present. @item igndts -Ignore DTS if PTS is set. Inert when nofillin is set. +Ignore DTS if PTS is also set. Inert when nofillin is set. @item ignidx Ignore index. @item nobuffer diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 91708de453..4ee3fc1d81 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -45,7 +45,7 @@ static const AVOption avformat_options[] = { {"genpts", "generate pts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_GENPTS }, INT_MIN, INT_MAX, D, "fflags"}, {"nofillin", "do not fill in missing values that can be exactly calculated", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOFILLIN }, INT_MIN, INT_MAX, D, "fflags"}, {"noparse", "disable AVParsers, this needs nofillin too", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOPARSE }, INT_MIN, INT_MAX, D, "fflags"}, -{"igndts", "ignore dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNDTS }, INT_MIN, INT_MAX, D, "fflags"}, +{"igndts", "ignore dts (if pts is also set)", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNDTS }, INT_MIN, INT_MAX, D, "fflags"}, {"discardcorrupt", "discard corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_DISCARD_CORRUPT }, INT_MIN, INT_MAX, D, "fflags"}, {"sortdts", "try to interleave outputted packets by dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_SORT_DTS }, INT_MIN, INT_MAX, D, "fflags"}, {"fastseek", "fast but inaccurate seeks", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FAST_SEEK }, INT_MIN, INT_MAX, D, "fflags"},