From patchwork Sun Dec 19 19:21:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 32727 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3695292iog; Sun, 19 Dec 2021 11:22:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzkNczqp2MRoevyJMuhYuAo/F+p+QSJRen4CG7kCalsx2j6nUsIHJthxOlfaUgs44EQfimv X-Received: by 2002:a17:906:7217:: with SMTP id m23mr10103456ejk.735.1639941742777; Sun, 19 Dec 2021 11:22:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639941742; cv=none; d=google.com; s=arc-20160816; b=keOa+nExW3jgXXHxe9TNid359cR51k7Em9Rs+nnhZ0KkgRm3WrohMwaXzSsjzzVlKT 5CVKxMiXeFrNnoHuyiC4BFKifp5YZLBl3hzjnTjZB8ZD1ptZ/c+3LcGMGf3RmPelr4in lIyofnHysbwa11oZG0TJTmR2M+ESpAlwOMPy742mKIWFcFayEPOsuvraMNL++9kiNFD4 1cPJ3fOvEjI47JCZSbwHjNb4KE3o8WCIKteB0L1BB2OnWpNrezW0X9kwUpxkwNSBJiWt 6LD/j94aGo8Leu0AttKW0OFwDRDI5SFk+yNrwnwnk7+R3T4WhQrggHxqvWwpzHNlriWx dFzQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=cb6qFZCRmw9uKI83TutOZzOW3dr94jHYFbzqbF3Z6KM=; b=bHd09EJDqr4aPFr4toG5DwnhPhMCY2HyKaqhngiE9B92Gq3GRyga3mahSAlZ0pxSbB Zn/z582cFwqm3ZsChiPVSMCQOzIQniCatNyD3JPyFxIAOpLMnk7H5qheDWIUfHqyVPjv RYllHHJQh13m6rcdgsQiJ38ON7UFB8ILSMHB4fI+FIPJLf36i9DCF+GXoyKi2gyfDt+z OT0WcJ2NVqGDeFN5gLzZyjKxz2YbfgEQuFAipBgC+5PzFyzJp/Pd2CMUSOHeMgsw2oIY hoRpgqxLdFI48wOHSTz1q/NKBq1CYvG8TaiEZz9dji6OKgyBu859yeeo+VRQjawQFUMW hrVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EZcKdD9d; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r3si8764798edo.571.2021.12.19.11.22.22; Sun, 19 Dec 2021 11:22:22 -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=@gmail.com header.s=20210112 header.b=EZcKdD9d; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98C9D68AEC8; Sun, 19 Dec 2021 21:22:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5DB368AEC8 for ; Sun, 19 Dec 2021 21:22:06 +0200 (EET) Received: by mail-lj1-f174.google.com with SMTP id i63so12478620lji.3 for ; Sun, 19 Dec 2021 11:22:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5pFUjJjSlGSp8OHwT/JcqzdN1IRZqm+bZ2QkppFpUzM=; b=EZcKdD9dqYNFZjl/tn+iKEuAkE6TmQv1bXq9v+o8eC6tA0m/53A3QTVQSIizb/sZ12 Oh1shBwpjE34ZE9Cmsz2tJ+NRNzOdT9T6LGYRD208x1FrZEtpK6k9jQuE+yuUk1ZcRkX bLhFYioGlHW0ZMrqc4HU1DFeZUM0e6Rq0xutWDN8Qf24wiKKpdhyLBJjLqfvTXl6TN7Z aeVcbLTc3J+cWyTps561piVaDztqXQ+9rTYiCxpyOEkP19rLyUZvGdcYjSllmXhF5wEv PYXXCMw5NOeH+C4lZ+/1YRpLHRx4j+2tV+W4geyEuvUl2ts1jNsV8UvgGx98Elm7IS/9 APCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5pFUjJjSlGSp8OHwT/JcqzdN1IRZqm+bZ2QkppFpUzM=; b=hUl0pApN/NBWhzLf3iPMgdubtdC8HjQ7o4JWHLKpeed7FzERy7xqaB7UiSeN6fiWDv drODMVYd/il8/5uptUSRZ0zMtXXyvM/oqiBDmGDeefw532+JtYIVRrPFs5IHe/36WTLR RysS3baWXi8SxKjrX6lV16rZx8UAZZmYdcI1nqWrKODyVOjHu7rAK6pFI6NWnvKCaIGg aaerjjbgcynf/c1cSTX79fv1Hcy1cDoFYx6zJnTkz2Sla5UK7DoVtCgIXZKxxO5faMkk Ga+63yZR3ayTgqfLQwAdwmJRTkkxr26doplBHa+ewa//0CQoC8fepFMSWtxPnUmwSwVw dBaw== X-Gm-Message-State: AOAM5303TSJfFL4iTPbTiNTdgqE6JYfSnNhX1i9HOzYRm2Neu8rq10mt v4Ics80fv7detfpn5ztJPMw4/s2s40LPmtKn X-Received: by 2002:a05:651c:10e:: with SMTP id a14mr12089974ljb.519.1639941725969; Sun, 19 Dec 2021 11:22:05 -0800 (PST) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id i17sm2123315lfe.281.2021.12.19.11.22.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 11:22:05 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Dec 2021 20:21:23 +0100 Message-Id: <20211219192134.1296-3-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211219192134.1296-1-dcnieho@gmail.com> References: <20211219192134.1296-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 02/13] avdevice/dshow: implement option to use device video timestamps 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: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8lgApM9F+3cT The dshow avdevice ignores timestamps for video frames provided by the DirectShow device, instead using wallclock time, apparently because the implementer of this code had a device that provided unreliable timestamps. Me (and others) would like to use the device's timestamps. The new use_video_device_timestamps option for dshow device enables them to do so. Since the majority of video devices out there probably provide fine timestamps, this patch sets the default to using the device timestamps, which means best fidelity timestamps are used by default. Using the new option, the user can switch this off and revert to the old behavior, so a fall back remains available in case the device provides broken timestamps. Closes: #8620 Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 1 + libavdevice/dshow_capture.h | 1 + libavdevice/dshow_pin.c | 11 ++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index cc0bef0474..5e6eb9c85d 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -1310,6 +1310,7 @@ static const AVOption options[] = { { "audio_device_save", "save audio capture filter device (and properties) to file", OFFSET(audio_filter_save_file), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "video_device_load", "load video capture filter device (and properties) from file", OFFSET(video_filter_load_file), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "video_device_save", "save video capture filter device (and properties) to file", OFFSET(video_filter_save_file), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, + { "use_video_device_timestamps", "use device instead of wallclock timestamps for video frames", OFFSET(use_video_device_timestamps), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC }, { NULL }, }; diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h index 06ded2ba96..5a2691518c 100644 --- a/libavdevice/dshow_capture.h +++ b/libavdevice/dshow_capture.h @@ -312,6 +312,7 @@ struct dshow_ctx { char *audio_filter_save_file; char *video_filter_load_file; char *video_filter_save_file; + int use_video_device_timestamps; IBaseFilter *device_filter[2]; IPin *device_pin[2]; diff --git a/libavdevice/dshow_pin.c b/libavdevice/dshow_pin.c index 3dae405e65..8e56dccbfe 100644 --- a/libavdevice/dshow_pin.c +++ b/libavdevice/dshow_pin.c @@ -309,10 +309,14 @@ long ff_dshow_meminputpin_Receive(DShowMemInputPin *this, IMediaSample *sample) if (!sample) return E_POINTER; + priv_data = pin->filter->priv_data; + s = priv_data; + ctx = s->priv_data; + IMediaSample_GetTime(sample, &orig_curtime, &dummy); orig_curtime += pin->filter->start_time; IReferenceClock_GetTime(clock, &graphtime); - if (devtype == VideoDevice) { + if (devtype == VideoDevice && !ctx->use_video_device_timestamps) { /* PTS from video devices is unreliable. */ IReferenceClock_GetTime(clock, &curtime); } else { @@ -322,7 +326,7 @@ long ff_dshow_meminputpin_Receive(DShowMemInputPin *this, IMediaSample *sample) like 437650244077016960 which FFmpeg doesn't like. TODO figure out math. For now just drop them. */ av_log(NULL, AV_LOG_DEBUG, - "dshow dropping initial (or ending) audio frame with odd PTS too high %"PRId64"\n", curtime); + "dshow dropping initial (or ending) frame with odd PTS too high %"PRId64"\n", curtime); return S_OK; } curtime += pin->filter->start_time; @@ -330,9 +334,6 @@ long ff_dshow_meminputpin_Receive(DShowMemInputPin *this, IMediaSample *sample) buf_size = IMediaSample_GetActualDataLength(sample); IMediaSample_GetPointer(sample, &buf); - priv_data = pin->filter->priv_data; - s = priv_data; - ctx = s->priv_data; index = pin->filter->stream_index; av_log(NULL, AV_LOG_VERBOSE, "dshow passing through packet of type %s size %8d "