From patchwork Mon Dec 13 07:21:32 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: 32404 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5072445iog; Sun, 12 Dec 2021 23:22:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1xHXuOogH0mHuMkBZNe6/9sqXDL/OozBnfDDqwsztWTOZoreM6faH9OQ3yH2reKMCM3cf X-Received: by 2002:aa7:ca46:: with SMTP id j6mr62393080edt.234.1639380151960; Sun, 12 Dec 2021 23:22:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639380151; cv=none; d=google.com; s=arc-20160816; b=02v/pkiTku17XtJVbWYAn38AbDQs0XAuV33+Ci8yfqi0b83i0axorNmEJxXlAFMvO3 gtKPxmqNlhQ9brx4ymT0MUBWGdisNWk8+sSUlm+/qBQpI7g9ojJ3WIPz7ucHJtIYs6Y9 to0mB1Fi5SuBL/c9xOBGiB/uJVj+s9W8T58R0v79nV0MoKKlM1rVJ3GDrnKXtrD6OsxM 7oXg+WODw7u3vq1HtYvgoFHtv+zVXi9YUmCAwhtipzkamQVIEkrg/mi+XpBn8YYQziYS TvJaXqYMER/XZYbuBpyyBObnluR2qhPNNvbWZT7C2bkfE375LsDYYrLZ6rAPnqg/3jlM yrLQ== 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=Jux1kLPShDG3lRqDj/QxDtKm1FUyLsKqWtK2HZh8Ftx7fMdMc5ExDRri1ug1tj+MrI fka/jefcLekDF5FNJQWKOoHJClYg23meDGylmKzgQ23PTjPdwvX9RyDYDybd4EpJujbl 2IDF9TdNG8S6sQhsmUMIRYlwcWlkFceAKOVGGmL28PTf4cLxnKTTJPqbRhbBvybSTa8z On9d25GMHn/zNvChDFAcXour0Ct64OU1yVKJUFiHVx6efp5ypYpxEAKwzFgD9CSf/oEW 5hDycKsFeA++7QCMovRRz+PcZdTxCfRwZoMp8m4JwwNdz0dLcZh0NYqR+GJGAJSdgAOM 5hnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l0evdDdG; 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 hu8si17979540ejc.322.2021.12.12.23.22.31; Sun, 12 Dec 2021 23:22:31 -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=l0evdDdG; 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 F32CB68AEEA; Mon, 13 Dec 2021 09:22:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECF0C68AEEA for ; Mon, 13 Dec 2021 09:22:16 +0200 (EET) Received: by mail-lf1-f52.google.com with SMTP id d10so29067581lfg.6 for ; Sun, 12 Dec 2021 23:22:16 -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=l0evdDdGc1bdYFOq6n01Ptiw1vntdBUoK55PuoEyN1x/ppAe63mi2nJxC38hip0OR6 dQxiRBcc/grR4pVjcftNudahOHbZ7wZAMEFFpkcn+daF24qD6q5BcoMdTz8CD1FPVQid rGEutzMpZjoGm71bFTBblbUB8de9Vj2mwN1MU5mCpGUmrQX9+YXipMG3eu6UeeGwQuvd iV0Bhb46XllU9/Vl9E0PFknoBnNBqx8dWrGI0D4lxH63BSwDVVsiarTOkofiaJRrkER7 9t9UbqHZ6EcaUfS2xqwfpTvtRHcNLgMjxJW/J4cN/mFPxkao4cVQX/BHJXaqMu0bUUtD qkCQ== 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=uSucDI1PVni7r7ofqy1pk1R+xt06SJIMZMrs59gJi9yuKvepUFDuWDRgAi6SEy+QAD Nrt2i2ZVDzI6Hk0aWwkm6Gxgn22Phd81z3ACIMG5mhGsR2Ov/DEChsgQIBJZc2zL6hjv loW7XR7ncI/cSjRbXnuUZpFCtnClyRFrO9Rumhca1ZCk/1q/Z/MHUlHqw4Wg25I2E3A/ eqRL9llyH+MpJEZ9FEs9YttMTDXcZBUe0iTKKZw8haA8TpVhldnXN4U9457cqmka7muz /DWM3He9l+sQm80UFol6Y68u1J8pGrvt/Gpr5xNF1zq7iuseBBfeJ/szHgP2S7RIANKT 0ufA== X-Gm-Message-State: AOAM532E6kAjzpHsJXj2nSNANTbsPXiqtv2Lp7HLY/tGBtu39QdUYx2x nutmMBfogN6XQg0jjYPyqPThb98kISDN7A== X-Received: by 2002:a05:6512:23a4:: with SMTP id c36mr27663942lfv.634.1639380135897; Sun, 12 Dec 2021 23:22:15 -0800 (PST) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id f17sm1313501lfk.145.2021.12.12.23.22.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Dec 2021 23:22:15 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 08:21:32 +0100 Message-Id: <20211213072143.993-3-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211213072143.993-1-dcnieho@gmail.com> References: <20211213072143.993-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: qPgRCvSgU+H0 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 "